Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java Thu Dec 17 12:59:43 2015 @@ -18,19 +18,6 @@ */ package org.apache.qpid.server.security.acl; -import org.apache.qpid.AMQException; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQConnectionURL; -import org.apache.qpid.jms.ConnectionListener; -import org.apache.qpid.protocol.AMQConstant; -import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.url.URLSyntaxException; - -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.naming.NamingException; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -40,6 +27,19 @@ import java.lang.reflect.Method; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.jms.Connection; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.naming.NamingException; + +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQConnectionURL; +import org.apache.qpid.jms.ConnectionListener; +import org.apache.qpid.protocol.AMQConstant; +import org.apache.qpid.test.utils.QpidBrokerTestCase; +import org.apache.qpid.url.URLSyntaxException; + /** * Abstract test case for ACLs. * @@ -57,7 +57,7 @@ public abstract class AbstractACLTestCas @Override public void setUp() throws Exception { - getBrokerConfiguration().addGroupFileConfiguration(QPID_HOME + "/etc/groups-systests"); + getDefaultBrokerConfiguration().addGroupFileConfiguration(QPID_HOME + "/etc/groups-systests"); // run test specific setup String testSetup = getName().replace("test", "setUp"); @@ -102,7 +102,7 @@ public abstract class AbstractACLTestCas File aclFile = File.createTempFile(testcase.getClass().getSimpleName(), testcase.getName()); aclFile.deleteOnExit(); - testcase.getBrokerConfiguration().addAclFileConfiguration(aclFile.getAbsolutePath()); + testcase.getDefaultBrokerConfiguration().addAclFileConfiguration(aclFile.getAbsolutePath()); PrintWriter out = new PrintWriter(new FileWriter(aclFile)); out.println(String.format("# %s", testcase.getName())); @@ -170,7 +170,7 @@ public abstract class AbstractACLTestCas */ public AMQConnectionURL createConnectionURL(String vhost, String username, String password) throws URLSyntaxException { - String url = "amqp://" + username + ":" + password + "@clientid/" + vhost + "?brokerlist='" + getBroker() + "?retries='0''"; + String url = "amqp://" + username + ":" + password + "@clientid/" + vhost + "?brokerlist='" + getBrokerDetailsFromDefaultConnectionUrl() + "?retries='0''"; return new AMQConnectionURL(url); }
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java Thu Dec 17 12:59:43 2015 @@ -56,10 +56,16 @@ public class ExternalAuthenticationTest @Override protected void setUp() throws Exception { - // not calling super.setUp() to avoid broker start-up + super.setUp(); setSystemProperty("javax.net.debug", "ssl"); } + @Override + public void startDefaultBroker() + { + // each test start the broker in its own way + } + /** * Tests that when EXTERNAL authentication is used on the SSL port, clients presenting certificates are able to connect. * Also, checks that default authentication manager PrincipalDatabaseAuthenticationManager is used on non SSL port. @@ -67,7 +73,7 @@ public class ExternalAuthenticationTest public void testExternalAuthenticationManagerOnSSLPort() throws Exception { setCommonBrokerSSLProperties(true); - super.setUp(); + super.startDefaultBroker(); setClientKeystoreProperties(); setClientTrustoreProperties(); @@ -99,8 +105,8 @@ public class ExternalAuthenticationTest public void testExternalAuthenticationManagerOnNonSslPort() throws Exception { setCommonBrokerSSLProperties(true); - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_EXTERNAL_PROVIDER); - super.setUp(); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_EXTERNAL_PROVIDER); + super.startDefaultBroker(); setClientKeystoreProperties(); setClientTrustoreProperties(); @@ -123,7 +129,7 @@ public class ExternalAuthenticationTest public void testExternalAuthenticationManagerWithoutClientKeyStore() throws Exception { setCommonBrokerSSLProperties(false); - super.setUp(); + super.startDefaultBroker(); setClientTrustoreProperties(); @@ -145,7 +151,7 @@ public class ExternalAuthenticationTest public void testExternalAuthenticationDeniesUntrustedClientCert() throws Exception { setCommonBrokerSSLProperties(true); - super.setUp(); + super.startDefaultBroker(); setUntrustedClientKeystoreProperties(); setClientTrustoreProperties(); @@ -205,9 +211,9 @@ public class ExternalAuthenticationTest sslTrustStoreAttributes.put(FileTrustStore.STORE_URL, BROKER_PEERSTORE); sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, BROKER_PEERSTORE_PASSWORD); sslTrustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true); - getBrokerConfiguration().addObjectConfiguration(TrustStore.class, sslTrustStoreAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(TrustStore.class, sslTrustStoreAttributes); - super.setUp(); + super.startDefaultBroker(); setClientKeystoreProperties(); setClientTrustoreProperties(); @@ -250,11 +256,10 @@ public class ExternalAuthenticationTest */ public void testExternalAuthenticationManagerUsernameAsCN() throws Exception { - RestTestHelper restTestHelper = new RestTestHelper(findFreePort()); - restTestHelper.enableHttpManagement(getBrokerConfiguration()); + getDefaultBrokerConfiguration().addHttpManagementConfiguration(); setCommonBrokerSSLProperties(true); - super.setUp(); + super.startDefaultBroker(); setClientKeystoreProperties(); setClientTrustoreProperties(); @@ -268,6 +273,7 @@ public class ExternalAuthenticationTest fail("Should be able to create a connection to the SSL port: " + e.getMessage()); } + RestTestHelper restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort()); try { // Getting the used username using REST @@ -286,17 +292,15 @@ public class ExternalAuthenticationTest */ public void testExternalAuthenticationManagerUsernameAsDN() throws Exception { - RestTestHelper restTestHelper = new RestTestHelper(findFreePort()); - TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration(); - restTestHelper.enableHttpManagement(brokerConfiguration); - + TestBrokerConfiguration brokerConfiguration = getDefaultBrokerConfiguration(); + brokerConfiguration.addHttpManagementConfiguration(); setCommonBrokerSSLProperties(true); brokerConfiguration.setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_EXTERNAL_PROVIDER, ExternalAuthenticationManager.ATTRIBUTE_USE_FULL_DN, "true"); - super.setUp(); + super.startDefaultBroker(); setClientKeystoreProperties(); setClientTrustoreProperties(); @@ -310,6 +314,7 @@ public class ExternalAuthenticationTest fail("Should be able to create a connection to the SSL port: " + e.getMessage()); } + RestTestHelper restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort()); try { // Getting the used username using REST @@ -330,14 +335,15 @@ public class ExternalAuthenticationTest private Connection getExternalSSLConnection(boolean includeUserNameAndPassword, String optionString) throws Exception { + int amqpTlsPort = getDefaultBroker().getAmqpTlsPort(); String url = "amqp://%s@test/?brokerlist='tcp://localhost:%s?ssl='true'&sasl_mechs='EXTERNAL'%s'"; if (includeUserNameAndPassword) { - url = String.format(url, "guest:guest", String.valueOf(QpidBrokerTestCase.DEFAULT_SSL_PORT), optionString); + url = String.format(url, "guest:guest", String.valueOf(amqpTlsPort), optionString); } else { - url = String.format(url, ":", String.valueOf(QpidBrokerTestCase.DEFAULT_SSL_PORT), optionString); + url = String.format(url, ":", String.valueOf(amqpTlsPort), optionString); } return getConnection(new AMQConnectionURL(url)); } @@ -349,7 +355,7 @@ public class ExternalAuthenticationTest private void setCommonBrokerSSLProperties(boolean needClientAuth, Collection<String> trustStoreNames) { - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); Map<String, Object> sslPortAttributes = new HashMap<String, Object>(); sslPortAttributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); @@ -365,12 +371,12 @@ public class ExternalAuthenticationTest Map<String, Object> aliasAttributes = new HashMap<>(); aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias"); aliasAttributes.put(VirtualHostAlias.TYPE, DefaultVirtualHostAlias.TYPE_NAME); - getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); aliasAttributes = new HashMap<>(); aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias"); aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME); - getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); Map<String, Object> externalAuthProviderAttributes = new HashMap<String, Object>(); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java Thu Dec 17 12:59:43 2015 @@ -48,14 +48,14 @@ public class MultipleAuthenticationManag @Override protected void setUp() throws Exception { - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); - Map<String, Object> externalAuthProviderAttributes = new HashMap<String, Object>(); + Map<String, Object> externalAuthProviderAttributes = new HashMap<>(); externalAuthProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); externalAuthProviderAttributes.put(AuthenticationProvider.NAME, TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER); config.addObjectConfiguration(AuthenticationProvider.class, externalAuthProviderAttributes); - Map<String, Object> sslPortAttributes = new HashMap<String, Object>(); + Map<String, Object> sslPortAttributes = new HashMap<>(); sslPortAttributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); sslPortAttributes.put(Port.PORT, DEFAULT_SSL_PORT); sslPortAttributes.put(Port.NAME, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT); @@ -74,7 +74,7 @@ public class MultipleAuthenticationManag aliasAttributes = new HashMap<>(); aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias"); aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME); - getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes); // set the ssl system properties @@ -90,7 +90,7 @@ public class MultipleAuthenticationManag { String url = "amqp://:@test/?brokerlist='tcp://localhost:%s?ssl='true''"; - url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT); + url = String.format(url, getDefaultBroker().getAmqpTlsPort()); return new AMQConnection(url); @@ -100,7 +100,7 @@ public class MultipleAuthenticationManag { String url = "amqp://:@test/?brokerlist='tcp://localhost:%s'"; - url = String.format(url,QpidBrokerTestCase.DEFAULT_PORT); + url = String.format(url, getDefaultBroker().getAmqpPort()); return new AMQConnection(url); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java Thu Dec 17 12:59:43 2015 @@ -35,6 +35,7 @@ import org.apache.qpid.client.AMQConnect import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.BrokerDetails; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.VirtualHostNode; @@ -65,13 +66,13 @@ public class StatisticsReportingTest ext @Override public void setUp() throws Exception { - createTestVirtualHostNode(0, VHOST_NAME1); - createTestVirtualHostNode(0, VHOST_NAME2); - createTestVirtualHostNode(0, VHOST_NAME3); + createTestVirtualHostNode(VHOST_NAME1); + createTestVirtualHostNode(VHOST_NAME2); + createTestVirtualHostNode(VHOST_NAME3); if (getName().equals("testEnabledStatisticsReporting")) { - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); config.removeObjectConfiguration(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST); config.setBrokerAttribute(Broker.STATISTICS_REPORTING_PERIOD, STATISTICS_REPORTING_PERIOD_IN_SECONDS); } @@ -81,7 +82,10 @@ public class StatisticsReportingTest ext super.setUp(); _monitor = new LogMonitor(getOutputFile()); - _brokerUrl = getBroker().toString(); + BrokerDetails brokerDetails = getBrokerDetailsFromDefaultConnectionUrl(); + brokerDetails.setPort(getDefaultBroker().getAmqpPort()); + + _brokerUrl = brokerDetails.toString(); _conToVhost1 = new AMQConnection(_brokerUrl, USER, USER, "clientid", VHOST_NAME1); _conToVhost2 = new AMQConnection(_brokerUrl, USER, USER, "clientid", VHOST_NAME2); _conToVhost3 = new AMQConnection(_brokerUrl, USER, USER, "clientid", VHOST_NAME3); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java Thu Dec 17 12:59:43 2015 @@ -52,8 +52,8 @@ public class PersistentStoreTest extends public void testCommittedMessagesSurviveBrokerNormalShutdown() throws Exception { sendAndCommitMessages(); - stopBroker(); - startBroker(); + stopDefaultBroker(); + startDefaultBroker(); confirmBrokerStillHasCommittedMessages(); } @@ -65,8 +65,8 @@ public class PersistentStoreTest extends } sendAndCommitMessages(); - killBroker(); - startBroker(); + killDefaultBroker(); + startDefaultBroker(); confirmBrokerStillHasCommittedMessages(); } @@ -74,8 +74,8 @@ public class PersistentStoreTest extends { sendAndCommitMessages(); sendMoreMessagesWithoutCommitting(); - stopBroker(); - startBroker(); + stopDefaultBroker(); + startDefaultBroker(); confirmBrokerStillHasCommittedMessages(); } @@ -87,8 +87,8 @@ public class PersistentStoreTest extends } sendAndCommitMessages(); sendMoreMessagesWithoutCommitting(); - killBroker(); - startBroker(); + killDefaultBroker(); + startDefaultBroker(); confirmBrokerStillHasCommittedMessages(); } @@ -126,8 +126,8 @@ public class PersistentStoreTest extends assertEquals("Unexpected user property", propertyValue, receivedMessage.getStringProperty(propertyKey)); // Do not commit message so we can re-receive after Broker restart - stopBroker(); - startBroker(); + stopDefaultBroker(); + startDefaultBroker(); _con = getConnection(); _con.start(); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java Thu Dec 17 12:59:43 2015 @@ -47,13 +47,13 @@ public class SplitStoreTest extends Qpid { super.setUp(); - String virtualHostWorkDir = "${json:QPID_WORK}${json:file.separator}${this:name}${json:file.separator}"; + String virtualHostWorkDir = "${json:qpid.work_dir}${json:file.separator}${this:name}${json:file.separator}"; _messageStorePath = virtualHostWorkDir + "messageStore"; _configStorePath = virtualHostWorkDir + "configStore"; } @Override - public void startBroker() throws Exception + public void startDefaultBroker() throws Exception { // Overridden to prevent QBTC starting the Broker. } @@ -75,12 +75,12 @@ public class SplitStoreTest extends Qpid final Map<String, String> contextMap = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.TYPE, virtualHostNodeType); config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.CONTEXT, contextMap); config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, JsonVirtualHostNode.STORE_PATH, _configStorePath); - super.startBroker(); + super.startDefaultBroker(); } private void doTest(String nodeType, String path) throws Exception @@ -94,7 +94,7 @@ public class SplitStoreTest extends Qpid sendMessage(session, queue, 1); connection.close(); - restartBroker(); + restartDefaultBroker(); setTestSystemProperty(ClientProperties.QPID_DECLARE_QUEUES_PROP_NAME, "false"); connection = getConnection(); @@ -107,7 +107,7 @@ public class SplitStoreTest extends Qpid assertNotNull("Message was not received after first restart", message); assertEquals("Unexpected message received after first restart", 0, message.getIntProperty(INDEX)); - stopBroker(); + stopDefaultBroker(); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Thu Dec 17 12:59:43 2015 @@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.File; +import java.nio.file.Files; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collection; @@ -124,7 +125,7 @@ public class VirtualHostMessageStoreTest String nodeName = "node" + getName(); String hostName = "host" + getName(); - _storePath = System.getProperty("QPID_WORK", TMP_FOLDER + File.separator + getTestName()) + File.separator + nodeName; + _storePath = Files.createTempDirectory("qpid-work-" + getClassQualifiedTestName() + "-").toString(); cleanup(new File(_storePath)); Broker<?> broker = BrokerTestHelper.createBrokerMock(); @@ -149,7 +150,7 @@ public class VirtualHostMessageStoreTest String bluePrint = getTestProfileVirtualHostNodeBlueprint(); if (bluePrint == null) { - bluePrint = "{type=\"" + TestMemoryVirtualHost.VIRTUAL_HOST_TYPE + "\"}"; + bluePrint = "{\"type\":\"" + TestMemoryVirtualHost.VIRTUAL_HOST_TYPE + "\"}"; } ObjectMapper objectMapper = new ObjectMapper(); Map<String, Object> attrs = objectMapper.readValue(bluePrint, Map.class); @@ -175,6 +176,7 @@ public class VirtualHostMessageStoreTest { _taskExecutor.stopImmediately(); super.tearDown(); + FileUtils.delete(new File(_storePath), true); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java Thu Dec 17 12:59:43 2015 @@ -35,12 +35,7 @@ import javax.naming.NamingException; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.AMQSession; import org.apache.qpid.jms.ConnectionURL; -import org.apache.qpid.server.management.plugin.HttpManagement; -import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.Exchange; -import org.apache.qpid.server.model.Plugin; -import org.apache.qpid.server.model.Port; import org.apache.qpid.systest.rest.RestTestHelper; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; @@ -48,36 +43,21 @@ import org.apache.qpid.url.URLSyntaxExce public class MessageCompressionTest extends QpidBrokerTestCase { - private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort()); + private RestTestHelper _restTestHelper; @Override - public void setUp() throws Exception + public void startDefaultBroker() { - // do nothing - only call setup after props set + // tests are starting the broker } public void doActualSetUp() throws Exception { - // use webadmin account to perform tests - _restTestHelper.setUsernameAndPassword("webadmin", "webadmin"); - - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); config.addHttpManagementConfiguration(); - config.setObjectAttribute(Port.class, - TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, - Port.PORT, - _restTestHelper.getHttpPort()); - - config.setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, - "secureOnlyMechanisms", - "{}"); - - // set password authentication provider on http port for the tests - config.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, - TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); - config.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); + super.startDefaultBroker(); - super.setUp(); + _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort()); } @Override Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java Thu Dec 17 12:59:43 2015 @@ -37,7 +37,6 @@ import org.apache.qpid.client.message.JM import org.apache.qpid.client.message.JMSTextMessage; import org.apache.qpid.server.model.TrustStore; import org.apache.qpid.test.utils.QpidBrokerTestCase; - import org.apache.qpid.test.utils.TestSSLConstants; public class MessageEncryptionTest extends QpidBrokerTestCase implements TestSSLConstants @@ -304,7 +303,7 @@ public class MessageEncryptionTest exten peerStoreAttributes.put("password" , "password"); peerStoreAttributes.put("type", "FileTrustStore"); peerStoreAttributes.put("exposedAsMessageSource", true); - getBrokerConfiguration().addObjectConfiguration(TrustStore.class,peerStoreAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(TrustStore.class, peerStoreAttributes); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java Thu Dec 17 12:59:43 2015 @@ -21,7 +21,6 @@ package org.apache.qpid.systest.rest; import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -29,10 +28,8 @@ import java.util.UUID; import javax.servlet.http.HttpServletResponse; import org.apache.qpid.server.BrokerOptions; -import org.apache.qpid.server.management.plugin.HttpManagement; import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.apache.qpid.server.model.AccessControlProvider; -import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.State; import org.apache.qpid.server.security.access.FileAccessControlProviderConstants; import org.apache.qpid.test.utils.TestBrokerConfiguration; @@ -56,13 +53,11 @@ public class AccessControlProviderRestTe "ACL DENY-LOG ALL ALL"; @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER, OTHER_USER); - - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, - HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); + final TestBrokerConfiguration defaultBrokerConfiguration = getDefaultBrokerConfiguration(); + defaultBrokerConfiguration.configureTemporaryPasswordFile(ALLOWED_USER, DENIED_USER, OTHER_USER); } public void testCreateAccessControlProvider() throws Exception @@ -163,7 +158,7 @@ public class AccessControlProviderRestTe public void testRemovalOfAccessControlProviderInErrorStateUsingManagementMode() throws Exception { - stopBroker(); + stopDefaultBroker(); File file = new File(TMP_FOLDER, getTestName()); if (file.exists()) @@ -171,9 +166,10 @@ public class AccessControlProviderRestTe file.delete(); } assertFalse("ACL file should not exist", file.exists()); - UUID id = getBrokerConfiguration().addAclFileConfiguration(file.getAbsolutePath()); - getBrokerConfiguration().setSaved(false); - startBroker(0, true); + TestBrokerConfiguration configuration = getDefaultBrokerConfiguration(); + UUID id = configuration.addAclFileConfiguration(file.getAbsolutePath()); + configuration.setSaved(false); + startDefaultBroker(true); getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java Thu Dec 17 12:59:43 2015 @@ -20,7 +20,6 @@ */ package org.apache.qpid.systest.rest; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -37,21 +36,24 @@ import org.apache.qpid.test.utils.TestBr public class AnonymousAccessRestTest extends QpidRestTestCase { @Override - public void startBroker() + public void startDefaultBroker() { // prevent broker from starting in setUp } public void startBrokerNow() throws Exception { - super.startBroker(); + super.startDefaultBroker(); + + // reset credentials + getRestTestHelper().setUsernameAndPassword(null, null); } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); Map<String, Object> anonymousAuthProviderAttributes = new HashMap<String, Object>(); anonymousAuthProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); @@ -63,8 +65,6 @@ public class AnonymousAccessRestTest ext TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER); config.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); - // reset credentials - getRestTestHelper().setUsernameAndPassword(null, null); } public void testGetWithAnonymousProvider() throws Exception @@ -94,8 +94,8 @@ public class AnonymousAccessRestTest ext public void testGetWithPasswordAuthProvider() throws Exception { - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, - TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); startBrokerNow(); getRestTestHelper().submitRequest("broker", "GET", HttpServletResponse.SC_UNAUTHORIZED); @@ -104,8 +104,8 @@ public class AnonymousAccessRestTest ext public void testPutWithPasswordAuthProvider() throws Exception { String newBrokerName = getName(); - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, - TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); startBrokerNow(); Map<String, Object> brokerAttributes = new HashMap<String, Object>(); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Thu Dec 17 12:59:43 2015 @@ -26,12 +26,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.jms.Connection; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQConnectionURL; -import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.apache.qpid.server.model.AuthenticationProvider; @@ -69,7 +65,7 @@ public class AuthenticationProviderRestT public void testPutCreateSecondPlainPrincipalDatabaseProviderSucceeds() throws Exception { - File principalDatabase = getRestTestHelper().createTemporaryPasswdFile(new String[]{"admin2", "guest2", "test2"}); + File principalDatabase = getDefaultBrokerConfiguration().createTemporaryPasswordFile(new String[]{"admin2", "guest2", "test2"}); try { @@ -114,63 +110,6 @@ public class AuthenticationProviderRestT principalDatabase.delete(); } } - - public void testCreatePlainPrincipalDatabaseProviderAddUserAndAuthenticateWithNewUser() throws Exception - { - File principalDatabase = TestFileUtils.createTempFile(this, ".user.passwords"); - try - { - String providerName = "test-provider"; - Map<String, Object> attributes = new HashMap<>(); - attributes.put(AuthenticationProvider.NAME, providerName); - attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); - attributes.put(ExternalFileBasedAuthenticationManager.PATH, principalDatabase.getAbsolutePath()); - - int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); - assertEquals("failed to create authentication provider", 201, responseCode); - - String userName = getName(); - String userPassword = "password"; - - Map<String,Object> userAttributes = new HashMap<>(); - userAttributes.put("password", userPassword); - userAttributes.put("name", userName); - - String url = "user/" + providerName; - getRestTestHelper().submitRequest(url, "POST", userAttributes, HttpServletResponse.SC_CREATED); - - Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList(url + "/" + userName); - assertEquals("Unexpected user name", userName, userDetails.get(User.NAME)); - - String portName = "test-port"; - Map<String, Object> portAttributes = new HashMap<String, Object>(); - portAttributes.put(Port.NAME, portName); - portAttributes.put(Port.PORT, getFailingPort()); - portAttributes.put(Port.AUTHENTICATION_PROVIDER, providerName); - - responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", portAttributes); - assertEquals("Unexpected response code", 201, responseCode); - - getRestTestHelper().setUsernameAndPassword(userName, userPassword); - - ConnectionURL connectionURL = new AMQConnectionURL("amqp://"+ userName + ":" + userPassword + - "@/" + TEST1_VIRTUALHOST + "?brokerlist='tcp://localhost:"+getFailingPort()+"'"); - Connection connection = getConnection(connectionURL); - try - { - assertTrue("Connection should be successfully established", ((AMQConnection) connection).isConnected()); - } - finally - { - connection.close(); - } - } - finally - { - principalDatabase.delete(); - } - } - public void testPutCreateNewAnonymousProvider() throws Exception { String providerName = "test-provider"; @@ -220,7 +159,7 @@ public class AuthenticationProviderRestT Map<String, Object> portAttributes = new HashMap<String, Object>(); portAttributes.put(Port.NAME, portName); portAttributes.put(Port.AUTHENTICATION_PROVIDER, providerName); - portAttributes.put(Port.PORT, findFreePort()); + portAttributes.put(Port.PORT, 0); responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", portAttributes); assertEquals("Unexpected response code for port creation", 201, responseCode); @@ -253,7 +192,7 @@ public class AuthenticationProviderRestT public void testRemovalOfAuthenticationProviderInErrorStateUsingManagementMode() throws Exception { - stopBroker(); + stopDefaultBroker(); File file = new File(TMP_FOLDER, getTestName()); if (file.exists()) @@ -262,17 +201,17 @@ public class AuthenticationProviderRestT } assertFalse("Group file should not exist", file.exists()); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); String providerName = getTestName(); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(ExternalFileBasedAuthenticationManager.PATH, file.getAbsoluteFile()); UUID id = config.addObjectConfiguration(AuthenticationProvider.class, attributes); config.setSaved(false); - startBroker(0, true); + startDefaultBroker(true); getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); @@ -290,7 +229,7 @@ public class AuthenticationProviderRestT public void testUpdateOfAuthenticationProviderInErrorStateUsingManagementMode() throws Exception { - stopBroker(); + stopDefaultBroker(); File file = new File(TMP_FOLDER, getTestName()); if (file.exists()) @@ -299,7 +238,7 @@ public class AuthenticationProviderRestT } assertFalse("Group file should not exist", file.exists()); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); String providerName = getTestName(); Map<String, Object> attributes = new HashMap<String, Object>(); @@ -309,7 +248,7 @@ public class AuthenticationProviderRestT UUID id = config.addObjectConfiguration(AuthenticationProvider.class, attributes); config.setSaved(false); - startBroker(0, true); + startDefaultBroker(true); getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); @@ -322,7 +261,7 @@ public class AuthenticationProviderRestT File principalDatabase = null; try { - principalDatabase = getRestTestHelper().createTemporaryPasswdFile(new String[]{"admin2", "guest2", "test2"}); + principalDatabase = getDefaultBrokerConfiguration().createTemporaryPasswordFile(new String[]{"admin2", "guest2", "test2"}); attributes = new HashMap<String, Object>(); attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(AuthenticationProvider.ID, id); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java Thu Dec 17 12:59:43 2015 @@ -39,26 +39,24 @@ public class BasicAuthRestTest extends Q private static final String USERNAME = "admin"; @Override - public void setUp() throws Exception + public void startDefaultBroker() throws Exception { - setSystemProperty("javax.net.debug", "ssl"); - //don't call super method, we will configure the broker in the test before doing so } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { //do nothing, we will configure this locally } - private void configure(boolean useSsl) throws IOException + private void configure(boolean useSsl) throws Exception { - getRestTestHelper().setUseSsl(useSsl); + setSystemProperty("javax.net.debug", "ssl"); if (useSsl) { - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.TRANSPORTS, Collections.singleton(Transport.SSL)); - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.TRANSPORTS, Collections.singleton(Transport.SSL)); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); } super.customizeConfiguration(); } @@ -71,22 +69,24 @@ public class BasicAuthRestTest extends Q public void testBasicAuthWhenEnabledWithHttps() throws Exception { configure(true); - super.setUp(); + super.startDefaultBroker(); + _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpsPort()); + _restTestHelper.setUseSsl(true); setSystemProperty("javax.net.ssl.trustStore", TRUSTSTORE); setSystemProperty("javax.net.ssl.trustStorePassword", TRUSTSTORE_PASSWORD); // Try the attempt with authentication, it should succeed because // BASIC auth is enabled by default on secure connections. - getRestTestHelper().setUsernameAndPassword(USERNAME, USERNAME); + _restTestHelper.setUsernameAndPassword(USERNAME, USERNAME); verifyGetBrokerAttempt(HttpServletResponse.SC_OK); } public void testBasicAuthWhenDisabledWithHttp() throws Exception { configure(false); - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); - super.setUp(); - + getDefaultBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); + super.startDefaultBroker(); + getRestTestHelper().setUseSsl(false); // Try the attempt with authentication, it should fail because // BASIC auth is disabled by default on non-secure connections. getRestTestHelper().setUsernameAndPassword(USERNAME, USERNAME); @@ -97,8 +97,9 @@ public class BasicAuthRestTest extends Q { configure(false); - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); - super.setUp(); + getDefaultBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); + super.startDefaultBroker(); + getRestTestHelper().setUseSsl(false); // Try the attempt with authentication, it should succeed because // BASIC auth is now enabled on non-secure connections. @@ -109,14 +110,16 @@ public class BasicAuthRestTest extends Q public void testDisablingForHttps() throws Exception { configure(true); - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "httpsBasicAuthenticationEnabled", false); - super.setUp(); + getDefaultBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "httpsBasicAuthenticationEnabled", false); + super.startDefaultBroker(); + _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpsPort()); + _restTestHelper.setUseSsl(true); setSystemProperty("javax.net.ssl.trustStore", TRUSTSTORE); setSystemProperty("javax.net.ssl.trustStorePassword", TRUSTSTORE_PASSWORD); // Try the attempt with authentication, it should fail because // BASIC auth is now disabled on secure connections. - getRestTestHelper().setUsernameAndPassword(USERNAME, USERNAME); + _restTestHelper.setUsernameAndPassword(USERNAME, USERNAME); verifyGetBrokerAttempt(HttpServletResponse.SC_UNAUTHORIZED); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java Thu Dec 17 12:59:43 2015 @@ -48,17 +48,17 @@ public class BrokerRestHttpAndHttpsTest } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP)); newAttributes.put(Port.TRANSPORTS, Arrays.asList(Transport.SSL, Transport.TCP)); newAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); - getBrokerConfiguration().setObjectAttributes(Port.class,TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT,newAttributes); - getBrokerConfiguration().setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, - "secureOnlyMechanisms", - "[\"PLAIN\"]"); + getDefaultBrokerConfiguration().setObjectAttributes(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, newAttributes); + getDefaultBrokerConfiguration().setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, + "secureOnlyMechanisms", + "[\"PLAIN\"]"); } @@ -78,8 +78,9 @@ public class BrokerRestHttpAndHttpsTest private Collection<String> getMechanisms(final boolean useSsl) throws IOException { - getRestTestHelper().setUseSsl(useSsl); - Map<String, Object> mechanisms = getRestTestHelper().getJsonAsMap("/service/sasl"); + _restTestHelper = new RestTestHelper(useSsl? getDefaultBroker().getHttpsPort() : getDefaultBroker().getHttpPort()); + _restTestHelper.setUseSsl(useSsl); + Map<String, Object> mechanisms = _restTestHelper.getJsonAsMap("/service/sasl"); return (Collection<String>) mechanisms.get("mechanisms"); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java Thu Dec 17 12:59:43 2015 @@ -25,7 +25,6 @@ import static org.apache.qpid.test.utils import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE; import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD; -import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -53,10 +52,10 @@ public class BrokerRestHttpsClientCertAu } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getRestTestHelper().setUseSslAuth(true); + Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP)); newAttributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); @@ -68,17 +67,19 @@ public class BrokerRestHttpsClientCertAu Map<String, Object> externalProviderAttributes = new HashMap<String, Object>(); externalProviderAttributes.put(AuthenticationProvider.TYPE, ExternalAuthenticationManager.PROVIDER_TYPE); externalProviderAttributes.put(AuthenticationProvider.NAME, EXTERNAL_AUTHENTICATION_PROVIDER); - getBrokerConfiguration().addObjectConfiguration(AuthenticationProvider.class, externalProviderAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(AuthenticationProvider.class, externalProviderAttributes); // set password authentication provider on http port for the tests - getBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, - EXTERNAL_AUTHENTICATION_PROVIDER); + getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, + EXTERNAL_AUTHENTICATION_PROVIDER); - getBrokerConfiguration().setObjectAttributes(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, newAttributes); + getDefaultBrokerConfiguration().setObjectAttributes(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, newAttributes); } public void testGetWithHttps() throws Exception { + _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpsPort()); + _restTestHelper.setUseSslAuth(true); Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/service/sasl"); Asserts.assertAttributesPresent(saslData, "user"); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Thu Dec 17 12:59:43 2015 @@ -23,7 +23,6 @@ package org.apache.qpid.systest.rest; import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE; import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD; -import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -43,20 +42,21 @@ public class BrokerRestHttpsTest extends { setSystemProperty("javax.net.debug", "ssl"); super.setUp(); + _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpsPort()); + _restTestHelper.setUseSsl(true); setSystemProperty("javax.net.ssl.trustStore", TRUSTSTORE); setSystemProperty("javax.net.ssl.trustStorePassword", TRUSTSTORE_PASSWORD); } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getRestTestHelper().setUseSsl(true); Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP)); newAttributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); newAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); - getBrokerConfiguration().setObjectAttributes(Port.class,TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT,newAttributes); + getDefaultBrokerConfiguration().setObjectAttributes(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, newAttributes); } public void testGetWithHttps() throws Exception Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java Thu Dec 17 12:59:43 2015 @@ -105,7 +105,7 @@ public class BrokerRestTest extends Qpid int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Unexpected update response", 200, response); - restartBroker(); + restartDefaultBroker(); Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertBrokerAttributes(brokerAttributes, brokerDetails); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java Thu Dec 17 12:59:43 2015 @@ -22,7 +22,6 @@ package org.apache.qpid.systest.rest; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.util.LinkedHashMap; @@ -46,13 +45,13 @@ public class CompressedResponsesRestTest } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getBrokerConfiguration().setObjectAttribute(Plugin.class, - TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, - "compressResponses", - _compress); + getDefaultBrokerConfiguration().setObjectAttribute(Plugin.class, + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, + "compressResponses", + _compress); } public void testCompressionOffAcceptOff() throws Exception Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Thu Dec 17 12:59:43 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.systest.rest; -import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY; +import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY; import java.io.File; import java.io.FileOutputStream; @@ -54,7 +54,7 @@ public class GroupProviderRestTest exten { _groupFile = createTemporaryGroupFile(); - getBrokerConfiguration().addGroupFileConfiguration(_groupFile.getAbsolutePath()); + getDefaultBrokerConfiguration().addGroupFileConfiguration(_groupFile.getAbsolutePath()); super.setUp(); } @@ -300,7 +300,7 @@ public class GroupProviderRestTest exten public void testRemovalOfGroupProviderInErrorStateUsingManagementMode() throws Exception { - stopBroker(); + stopDefaultBroker(); File file = new File(TMP_FOLDER, getTestName()); if (file.exists()) @@ -309,11 +309,11 @@ public class GroupProviderRestTest exten } assertFalse("Group file should not exist", file.exists()); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); config.removeObjectConfiguration(GroupProvider.class, TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE); UUID id = config.addGroupFileConfiguration(file.getAbsolutePath()); config.setSaved(false); - startBroker(0, true); + startDefaultBroker(true); getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java Thu Dec 17 12:59:43 2015 @@ -20,7 +20,6 @@ */ package org.apache.qpid.systest.rest; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileOutputStream; import java.util.Collections; @@ -28,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.servlet.http.HttpServletResponse; + import org.apache.qpid.server.model.GroupMember; import org.apache.qpid.test.utils.TestBrokerConfiguration; @@ -45,7 +46,7 @@ public class GroupRestTest extends QpidR { _groupFile = createTemporaryGroupFile(); - getBrokerConfiguration().addGroupFileConfiguration(_groupFile.getAbsolutePath()); + getDefaultBrokerConfiguration().addGroupFileConfiguration(_groupFile.getAbsolutePath()); super.setUp(); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java Thu Dec 17 12:59:43 2015 @@ -82,7 +82,7 @@ public class PortRestTest extends QpidRe String portName = "test-port"; Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); - attributes.put(Port.PORT, findFreePort()); + attributes.put(Port.PORT, 0); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); @@ -95,7 +95,7 @@ public class PortRestTest extends QpidRe Asserts.assertPortAttributes(port); // make sure that port is there after broker restart - restartBroker(); + restartDefaultBroker(); portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); @@ -107,7 +107,7 @@ public class PortRestTest extends QpidRe String portName = "test-port"; Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); - attributes.put(Port.PORT, findFreePort()); + attributes.put(Port.PORT, 0); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); @@ -126,7 +126,7 @@ public class PortRestTest extends QpidRe responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER, "PUT", authProviderAttributes); assertEquals("Unexpected response code for authentication provider creation", 201, responseCode); - attributes = new HashMap<String, Object>(port); + attributes = new HashMap<>(port); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER); attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.AMQP_0_9_1)); @@ -261,8 +261,8 @@ public class PortRestTest extends QpidRe public void testDefaultAmqpPortIsQuiescedWhenInManagementMode() throws Exception { // restart Broker in management port - stopBroker(); - startBroker(0, true); + stopDefaultBroker(); + startDefaultBroker(true); getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT; Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java Thu Dec 17 12:59:43 2015 @@ -22,7 +22,6 @@ package org.apache.qpid.systest.rest; import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -73,14 +72,14 @@ public class PreferencesProviderRestTest } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); Map<String, Object> anonymousAuthProviderAttributes = new HashMap<String, Object>(); anonymousAuthProviderAttributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); anonymousAuthProviderAttributes.put(AuthenticationProvider.NAME, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "-2"); anonymousAuthProviderAttributes.put(ExternalFileBasedAuthenticationManager.PATH, _authenticationProviderFile.getAbsolutePath()); - getBrokerConfiguration().addObjectConfiguration(AuthenticationProvider.class,anonymousAuthProviderAttributes); + getDefaultBrokerConfiguration().addObjectConfiguration(AuthenticationProvider.class, anonymousAuthProviderAttributes); } public void testCreateAndGetProvider() throws Exception Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java Thu Dec 17 12:59:43 2015 @@ -21,7 +21,6 @@ package org.apache.qpid.systest.rest; import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -57,11 +56,11 @@ public class PreferencesRestTest extends } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration(); + TestBrokerConfiguration brokerConfiguration = getDefaultBrokerConfiguration(); Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(PreferencesProvider.NAME, "test"); attributes.put(PreferencesProvider.TYPE, FileSystemPreferencesProvider.PROVIDER_TYPE); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java Thu Dec 17 12:59:43 2015 @@ -44,15 +44,14 @@ import org.apache.qpid.test.utils.TestBr public class SaslRestTest extends QpidRestTestCase { @Override - public void startBroker() + public void startDefaultBroker() { // prevent broker from starting in setUp } public void startBrokerNow() throws Exception { - super.startBroker(); - + super.startDefaultBroker(); getRestTestHelper().setUsernameAndPassword(null,null); } @@ -382,6 +381,6 @@ public class SaslRestTest extends QpidRe Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put("path", passwordFile.getAbsolutePath()); newAttributes.put(AuthenticationProvider.TYPE, Base64MD5PasswordDatabaseAuthenticationManager.PROVIDER_TYPE); - getBrokerConfiguration().setObjectAttributes(AuthenticationProvider.class,TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, newAttributes); + getDefaultBrokerConfiguration().setObjectAttributes(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, newAttributes); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java Thu Dec 17 12:59:43 2015 @@ -22,7 +22,6 @@ package org.apache.qpid.systest.rest; import java.io.File; -import java.io.IOException; import java.net.URLEncoder; import java.util.HashMap; import java.util.List; @@ -62,11 +61,11 @@ public class UserPreferencesRestTest ext } @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration(); + TestBrokerConfiguration brokerConfiguration = getDefaultBrokerConfiguration(); Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(PreferencesProvider.NAME, "test"); attributes.put(PreferencesProvider.TYPE, FileSystemPreferencesProvider.PROVIDER_TYPE); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java Thu Dec 17 12:59:43 2015 @@ -20,11 +20,12 @@ */ package org.apache.qpid.systest.rest; -import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + import org.apache.qpid.server.model.User; import org.apache.qpid.test.utils.TestBrokerConfiguration; @@ -33,12 +34,18 @@ public class UserRestTest extends QpidRe @Override public void setUp() throws Exception { - getRestTestHelper().configureTemporaryPasswordFile(this, "user1", "user2"); - - super.setUp(); // do this last because it starts the broker, using the modified config + super.setUp(); getRestTestHelper().setUsernameAndPassword("user1", "user1"); } + @Override + protected void customizeConfiguration() throws Exception + { + super.customizeConfiguration(); + final TestBrokerConfiguration defaultBrokerConfiguration = getDefaultBrokerConfiguration(); + defaultBrokerConfiguration.configureTemporaryPasswordFile("user1", "user2"); + } + public void testGet() throws Exception { List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("user"); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java Thu Dec 17 12:59:43 2015 @@ -105,13 +105,13 @@ public class VirtualHostNodeRestTest ex public void testRecoverVirtualHostNodeWithDesiredStateStopped() throws Exception { - stopBroker(); + stopDefaultBroker(); - TestBrokerConfiguration config = getBrokerConfiguration(); + TestBrokerConfiguration config = getDefaultBrokerConfiguration(); config.setObjectAttribute(VirtualHostNode.class, TEST3_VIRTUALHOST, ConfiguredObject.DESIRED_STATE, "STOPPED"); config.setSaved(false); - startBroker(); + startDefaultBroker(); String restUrl = "virtualhostnode/" + TEST3_VIRTUALHOST; assertActualAndDesireStates(restUrl, "STOPPED", "STOPPED"); @@ -149,28 +149,23 @@ public class VirtualHostNodeRestTest ex public void testCreateVirtualHostNodeByPostUsingParentURI() throws Exception { - String nodeName = getTestName(); - Map<String, Object> nodeData = new HashMap<>(); - nodeData.put(VirtualHostNode.NAME, nodeName); - nodeData.put(VirtualHostNode.TYPE, getTestProfileVirtualHostNodeType()); - - String url = "virtualhostnode"; - getRestTestHelper().submitRequest(url, "POST", nodeData, HttpServletResponse.SC_CREATED); - - Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(url + "/" + nodeName); - Asserts.assertVirtualHostNode(nodeName, virtualhostNode); - + createVirtualHostNodeByUsingParentURI("POST"); } public void testCreateVirtualHostNodeByPutUsingParentURI() throws Exception { + createVirtualHostNodeByUsingParentURI("PUT"); + } + + private void createVirtualHostNodeByUsingParentURI(final String method) throws IOException + { String nodeName = getTestName(); Map<String, Object> nodeData = new HashMap<>(); nodeData.put(VirtualHostNode.NAME, nodeName); nodeData.put(VirtualHostNode.TYPE, getTestProfileVirtualHostNodeType()); String url = "virtualhostnode"; - getRestTestHelper().submitRequest(url, "PUT", nodeData, HttpServletResponse.SC_CREATED); + getRestTestHelper().submitRequest(url, method, nodeData, HttpServletResponse.SC_CREATED); Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(url + "/" + nodeName); Asserts.assertVirtualHostNode(nodeName, virtualhostNode); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Thu Dec 17 12:59:43 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.systest.rest; -import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY; +import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY; import java.io.IOException; import java.net.URLEncoder; @@ -34,6 +34,8 @@ import javax.jms.Destination; import javax.jms.Session; import javax.servlet.http.HttpServletResponse; +import org.junit.Assert; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; @@ -42,11 +44,8 @@ import org.apache.qpid.server.queue.Last import org.apache.qpid.server.queue.PriorityQueue; import org.apache.qpid.server.queue.SortedQueue; import org.apache.qpid.server.virtualhost.AbstractVirtualHost; - import org.apache.qpid.server.virtualhost.derby.DerbyVirtualHostImpl; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl; -import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.junit.Assert; public class VirtualHostRestTest extends QpidRestTestCase { @@ -58,12 +57,10 @@ public class VirtualHostRestTest extends private AMQConnection _connection; @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - - TestBrokerConfiguration config = getBrokerConfiguration(); - createTestVirtualHostNode(0, EMPTY_VIRTUALHOSTNODE_NAME, false); + createTestVirtualHostNode(getDefaultBroker(), EMPTY_VIRTUALHOSTNODE_NAME, false); } public void testGet() throws Exception @@ -276,7 +273,7 @@ public class VirtualHostRestTest extends assertActualAndDesireStates(restUrl, "STOPPED", "STOPPED"); - restartBroker(); + restartDefaultBroker(); Map<String, Object> rereadVirtualhost = getRestTestHelper().getJsonAsSingletonList(restUrl); Asserts.assertActualAndDesiredState("STOPPED", "STOPPED", rereadVirtualhost); 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=1720539&r1=1720538&r2=1720539&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 Thu Dec 17 12:59:43 2015 @@ -31,17 +31,16 @@ import javax.servlet.http.HttpServletRes import org.apache.qpid.server.logging.BrokerFileLogger; import org.apache.qpid.server.logging.BrokerMemoryLogger; import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule; -import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; -import org.apache.qpid.server.model.BrokerLogger; -import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.management.plugin.HttpManagement; +import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.apache.qpid.server.model.AccessControlProvider; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.BrokerLogger; +import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ExternalFileBasedAuthenticationManager; import org.apache.qpid.server.model.GroupProvider; import org.apache.qpid.server.model.KeyStore; -import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.model.TrustStore; @@ -65,10 +64,11 @@ public class BrokerACLTest extends QpidR private String _secondaryAclFileContent = ""; @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER); + final TestBrokerConfiguration defaultBrokerConfiguration = getDefaultBrokerConfiguration(); + defaultBrokerConfiguration.configureTemporaryPasswordFile(ALLOWED_USER, DENIED_USER); AbstractACLTestCase.writeACLFileUtil(this, "ACL ALLOW-LOG ALL ACCESS MANAGEMENT", "ACL ALLOW-LOG " + ALLOWED_USER + " CONFIGURE BROKER", @@ -82,9 +82,6 @@ public class BrokerACLTest extends QpidR "ACL ALLOW-LOG " + ALLOWED_USER + " CONFIGURE BROKER\n" + "ACL DENY-LOG " + DENIED_USER + " CONFIGURE BROKER\n" + "ACL DENY-LOG ALL ALL"; - - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, - HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); } /* === AuthenticationProvider === */ @@ -1006,7 +1003,7 @@ public class BrokerACLTest extends QpidR { Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); - attributes.put(Port.PORT, findFreePort()); + attributes.put(Port.PORT, 0); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); return getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java Thu Dec 17 12:59:43 2015 @@ -20,22 +20,20 @@ */ package org.apache.qpid.systest.rest.acl; -import org.apache.qpid.server.management.plugin.HttpManagement; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.apache.qpid.server.model.Binding; import org.apache.qpid.server.model.Exchange; -import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.security.acl.AbstractACLTestCase; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - public class ExchangeRestACLTest extends QpidRestTestCase { private static final String ALLOWED_USER = "user1"; @@ -45,10 +43,11 @@ public class ExchangeRestACLTest extends private String _exchangeUrl; @Override - protected void customizeConfiguration() throws IOException + protected void customizeConfiguration() throws Exception { super.customizeConfiguration(); - getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER); + final TestBrokerConfiguration defaultBrokerConfiguration = getDefaultBrokerConfiguration(); + defaultBrokerConfiguration.configureTemporaryPasswordFile(ALLOWED_USER, DENIED_USER); AbstractACLTestCase.writeACLFileUtil(this, "ACL ALLOW-LOG ALL ACCESS MANAGEMENT", "ACL ALLOW-LOG " + ALLOWED_USER + " CREATE QUEUE", @@ -63,9 +62,6 @@ public class ExchangeRestACLTest extends "ACL ALLOW-LOG " + ALLOWED_USER + " UNBIND EXCHANGE", "ACL DENY-LOG " + DENIED_USER + " UNBIND EXCHANGE", "ACL DENY-LOG ALL ALL"); - - getBrokerConfiguration().setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, - HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
