Added: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java?rev=1685599&view=auto ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java (added) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java Mon Jun 15 15:43:53 2015 @@ -0,0 +1,82 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.systest.rest; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + +import org.apache.qpid.server.logging.VirtualHostFileLogger; +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.VirtualHostLogger; + +public class VirtualHostLoggerRestTest extends QpidRestTestCase +{ + + public void testCreateVirtualHostLoggerAndFilter() throws Exception + { + String loggerName = "testLogger1"; + String loggerRestUrlBase = "virtualhostlogger/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST; + String loggerRestUrl = loggerRestUrlBase + "/" + loggerName; + + + Map<String, Object> virtualHostLoggerAttributes = new HashMap<>(); + virtualHostLoggerAttributes.put(VirtualHostLogger.NAME, loggerName); + virtualHostLoggerAttributes.put(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE); + + getRestTestHelper().submitRequest(loggerRestUrlBase, "PUT", virtualHostLoggerAttributes, HttpServletResponse.SC_CREATED); + Map<String, Object> loggerData = getRestTestHelper().getJsonAsSingletonList(loggerRestUrl); + + String loggerFilterName = "testFilter"; + Map<String, Object> virtualHostFilterAttributes = new HashMap<>(); + virtualHostFilterAttributes.put("name", loggerFilterName); + virtualHostFilterAttributes.put("level", "DEBUG"); + + String loggerFilterRestUrlBase = "virtualhostloggerfilter/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST + "/" + loggerName; + String loggerFilterRestUrl = loggerFilterRestUrlBase + "/" + loggerFilterName; + + getRestTestHelper().submitRequest(loggerFilterRestUrlBase, "PUT", virtualHostFilterAttributes, HttpServletResponse.SC_CREATED); + getRestTestHelper().submitRequest(loggerFilterRestUrl, "GET", HttpServletResponse.SC_OK); + + String logFileLocation = String.valueOf(loggerData.get(VirtualHostFileLogger.FILE_NAME)); + assertNotNull("Log file attribute is not set ", logFileLocation); + assertTrue(String.format("Log file '%s' does not exists", logFileLocation), new File(logFileLocation).exists()); + } + + public void testDeleteVirtualHostLoggerAndFilter() throws Exception + { + String loggerName = "testLogger1"; + Map<String, Object> attributes = new HashMap<>(); + attributes.put(VirtualHostLogger.NAME, loggerName); + attributes.put(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE); + String loggerRestUrlBase = "virtualhostlogger/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST; + String loggerRestUrl = loggerRestUrlBase + "/" + loggerName; + + getRestTestHelper().submitRequest(loggerRestUrlBase, "PUT", attributes, HttpServletResponse.SC_CREATED); + getRestTestHelper().submitRequest(loggerRestUrl, "GET", HttpServletResponse.SC_OK); + + getRestTestHelper().submitRequest(loggerRestUrl, "DELETE", null, HttpServletResponse.SC_OK); + getRestTestHelper().submitRequest(loggerRestUrl, "GET", HttpServletResponse.SC_NOT_FOUND); + } + +}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java?rev=1685599&r1=1685598&r2=1685599&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java Mon Jun 15 15:43:53 2015 @@ -27,9 +27,12 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; +import org.apache.qpid.server.logging.VirtualHostFileLogger; import org.apache.qpid.server.management.plugin.HttpManagement; +import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.VirtualHostLogger; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.security.acl.AbstractACLTestCase; import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
