Author: kwall
Date: Mon Jul 13 11:32:31 2015
New Revision: 1690639
URL: http://svn.apache.org/r1690639
Log:
QPID-6620: [Java Broker] Remove memory logger from config-systests.json (not
required for testing, and the turbo filter was finding it, reducing the logger
level during the tests).
Modified:
qpid/java/trunk/systests/etc/config-systests.json
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Modified: qpid/java/trunk/systests/etc/config-systests.json
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/etc/config-systests.json?rev=1690639&r1=1690638&r2=1690639&view=diff
==============================================================================
--- qpid/java/trunk/systests/etc/config-systests.json (original)
+++ qpid/java/trunk/systests/etc/config-systests.json Mon Jul 13 11:32:31 2015
@@ -26,17 +26,6 @@
"type" : "PlainPasswordFile",
"path" : "${QPID_HOME}${file.separator}etc${file.separator}passwd"
} ],
- "brokerloggers" : [ {
- "name" : "memory",
- "type" : "Memory",
- "maxRecords" : 4096,
- "brokerloggerfilters" : [ {
- "name" : "1",
- "type" : "NameAndLevel",
- "level" : "INFO",
- "loggerName" : ""
- } ]
- } ],
"keystores" : [ {
"name" : "systestsKeyStore",
"storeUrl" :
"${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_keystore.jks",
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1690639&r1=1690638&r2=1690639&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Mon Jul 13 11:32:31 2015
@@ -842,8 +842,6 @@ public class BrokerACLTest extends QpidR
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- getRestTestHelper().submitRequest("brokerlogger/memory", "GET",
HttpServletResponse.SC_OK);
-
Map<String, Object> attributes = new HashMap<>();
attributes.put(BrokerLogger.NAME, "testLogger1");
attributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
@@ -859,13 +857,22 @@ public class BrokerACLTest extends QpidR
public void testDeleteBrokerLoggerAllowedDenied() throws Exception
{
+ getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
+
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put(BrokerLogger.NAME, "testLogger1");
+ attributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
+
+ getRestTestHelper().submitRequest("brokerlogger", "PUT", attributes,
HttpServletResponse.SC_CREATED);
+ getRestTestHelper().submitRequest("brokerlogger/testLogger1", "GET",
HttpServletResponse.SC_OK);
+
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- getRestTestHelper().submitRequest("brokerlogger/memory", "DELETE",
null, HttpServletResponse.SC_FORBIDDEN);
- getRestTestHelper().submitRequest("brokerlogger/memory", "GET",
HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerlogger/testLogger1",
"DELETE", null, HttpServletResponse.SC_FORBIDDEN);
+ getRestTestHelper().submitRequest("brokerlogger/testLogger1", "GET",
HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- getRestTestHelper().submitRequest("brokerlogger/memory", "DELETE",
null, HttpServletResponse.SC_OK);
- getRestTestHelper().submitRequest("brokerlogger/memory", "GET",
HttpServletResponse.SC_NOT_FOUND);
+ getRestTestHelper().submitRequest("brokerlogger/testLogger1",
"DELETE", null, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerlogger/testLogger1", "GET",
HttpServletResponse.SC_NOT_FOUND);
}
public void testDownloadBrokerLoggerFileAllowedDenied() throws Exception
@@ -914,44 +921,55 @@ public class BrokerACLTest extends QpidR
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/1",
"GET", HttpServletResponse.SC_OK);
+ Map<String, Object> loggerAttributes = new HashMap<>();
+ loggerAttributes.put(BrokerLogger.NAME, "testLogger1");
+ loggerAttributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
+ getRestTestHelper().submitRequest("brokerlogger", "PUT",
loggerAttributes, HttpServletResponse.SC_CREATED);
+
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "2");
+ attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/memory", "PUT",
attributes, HttpServletResponse.SC_CREATED);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1",
"PUT", attributes, HttpServletResponse.SC_CREATED);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- attributes.put(BrokerNameAndLevelFilter.NAME, "3");
- getRestTestHelper().submitRequest("brokerloggerfilter/memory", "PUT",
attributes, HttpServletResponse.SC_FORBIDDEN);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/3",
"GET", HttpServletResponse.SC_NOT_FOUND);
+ attributes.put(BrokerNameAndLevelFilter.NAME, "filter2");
+ getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1",
"PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter2",
"GET", HttpServletResponse.SC_NOT_FOUND);
}
public void testUpdateBrokerLoggerFilterAllowedDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- Map<String,Object> result =
getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/memory/1");
- assertEquals("Log level was not as expected", "INFO",
result.get(BrokerNameAndLevelFilter.LEVEL));
+ Map<String, Object> loggerAttributes = new HashMap<>();
+ loggerAttributes.put(BrokerLogger.NAME, "testLogger1");
+ loggerAttributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
+ getRestTestHelper().submitRequest("brokerlogger", "PUT",
loggerAttributes, HttpServletResponse.SC_CREATED);
+
+ Map<String, Object> filterAttributes = new HashMap<>();
+ filterAttributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
+ filterAttributes.put(ConfiguredObject.TYPE,
BrokerNameAndLevelFilter.TYPE);
+ filterAttributes.put(BrokerNameAndLevelFilter.LEVEL, "INFO");
+ getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1",
"PUT", filterAttributes, HttpServletResponse.SC_CREATED);
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "1");
+ attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/1",
"PUT", attributes, HttpServletResponse.SC_OK);
- Map<String,Object> resultAfterUpdate =
getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/memory/1");
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"PUT", attributes, HttpServletResponse.SC_OK);
+ Map<String,Object> resultAfterUpdate =
getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/testLogger1/filter1");
assertEquals("Log level was not changed", "DEBUG",
resultAfterUpdate.get(BrokerNameAndLevelFilter.LEVEL));
-
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
attributes.put(BrokerNameAndLevelFilter.LEVEL, "INFO");
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/1",
"PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
- Map<String,Object> resultAfterDeniedUpdate =
getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/memory/1");
+ Map<String,Object> resultAfterDeniedUpdate =
getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/testLogger1/filter1");
assertEquals("Log level was changed by not allowed user", "DEBUG",
resultAfterDeniedUpdate.get(BrokerNameAndLevelFilter.LEVEL));
}
@@ -959,21 +977,27 @@ public class BrokerACLTest extends QpidR
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
+ Map<String, Object> loggerAttributes = new HashMap<>();
+ loggerAttributes.put(BrokerLogger.NAME, "testLogger1");
+ loggerAttributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
+ getRestTestHelper().submitRequest("brokerlogger", "PUT",
loggerAttributes, HttpServletResponse.SC_CREATED);
+
+
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "2");
+ attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/memory", "PUT",
attributes, HttpServletResponse.SC_CREATED);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1",
"PUT", attributes, HttpServletResponse.SC_CREATED);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"DELETE", null, HttpServletResponse.SC_FORBIDDEN);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"GET", HttpServletResponse.SC_OK);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"DELETE", null, HttpServletResponse.SC_FORBIDDEN);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"DELETE", null, HttpServletResponse.SC_OK);
- getRestTestHelper().submitRequest("brokerloggerfilter/memory/2",
"GET", HttpServletResponse.SC_NOT_FOUND);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"DELETE", null, HttpServletResponse.SC_OK);
+
getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1",
"GET", HttpServletResponse.SC_NOT_FOUND);
}
/* === Utility Methods === */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
