Repository: qpid-broker-j Updated Branches: refs/heads/master cec889db6 -> 073f27ee7
QPID-8123: [Broker-J] [System Tests] Remove remaining compile time references from test code to the Qpid JMS AMQP 0-x client (mainly Strings and FileUtils) Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/073f27ee Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/073f27ee Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/073f27ee Branch: refs/heads/master Commit: 073f27ee7bf88847efa1062273b1b7d63b8c0bcf Parents: cec889d Author: Keith Wall <kw...@apache.org> Authored: Mon Mar 12 17:18:14 2018 +0000 Committer: Keith Wall <kw...@apache.org> Committed: Mon Mar 12 17:18:14 2018 +0000 ---------------------------------------------------------------------- bdbstore/pom.xml | 6 -- .../StandardEnvironmentFacadeFactoryTest.java | 7 +- .../berkeleydb/BDBAMQP10V0UpgradeTest.java | 2 +- .../server/store/berkeleydb/BDBBackupTest.java | 4 +- .../server/store/berkeleydb/BDBUpgradeTest.java | 4 +- .../replication/BDBHAVirtualHostRestTest.java | 2 +- systests/pom.xml | 10 +-- .../qpid/systest/rest/RestTestHelper.java | 90 -------------------- .../qpid/test/utils/AbstractBrokerHolder.java | 2 +- .../qpid/test/utils/SpawnedBrokerHolder.java | 2 +- .../test/utils/TestBrokerConfiguration.java | 2 +- 11 files changed, 17 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/pom.xml ---------------------------------------------------------------------- diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 14d17c2..92d5250 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -76,12 +76,6 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java index b59088b..3521f0b 100644 --- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java +++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java @@ -29,13 +29,14 @@ import java.io.File; import java.util.Collections; import com.sleepycat.je.EnvironmentConfig; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.store.FileBasedSettings; +import org.apache.qpid.server.util.FileUtils; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.test.utils.TestFileUtils; -import org.apache.qpid.util.FileUtils; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; public class StandardEnvironmentFacadeFactoryTest extends QpidTestCase { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java index d064cec..4d3d9bd 100644 --- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java +++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java @@ -36,7 +36,7 @@ import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.apache.qpid.util.FileUtils; +import org.apache.qpid.server.util.FileUtils; /** * http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index 3bb82c4..aac33c4 100644 --- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java @@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode; import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.util.FileUtils; -import org.apache.qpid.util.Strings; +import org.apache.qpid.server.util.FileUtils; +import org.apache.qpid.server.util.Strings; /** * Tests the BDB backup can successfully perform a backup and that http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java index 7f4f92c..92bfce1 100644 --- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java +++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java @@ -50,11 +50,11 @@ import org.apache.qpid.server.model.AlternateBinding; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.ExclusivityPolicy; import org.apache.qpid.server.model.VirtualHostNode; +import org.apache.qpid.server.util.FileUtils; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode; import org.apache.qpid.systest.rest.RestTestHelper; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.apache.qpid.util.FileUtils; /** * Tests upgrading a BDB store on broker startup. @@ -419,7 +419,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase return _restTestHelper.getJsonAsMap(queueUrl); } - private long getQueueDepth(final String queueName) throws org.apache.qpid.QpidException, IOException + private long getQueueDepth(final String queueName) throws IOException { Map<String, Object> queueAttributes = getQueueAttributes(queueName); Map<String, Object> statistics = (Map<String, Object>) queueAttributes.get("statistics"); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java index a1516f3..9cb5da6 100644 --- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java +++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java @@ -41,7 +41,7 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; import org.apache.qpid.systest.rest.Asserts; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.apache.qpid.util.FileUtils; +import org.apache.qpid.server.util.FileUtils; public class BDBHAVirtualHostRestTest extends QpidRestTestCase { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/systests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/pom.xml b/systests/pom.xml index 85041f8..6e132d2 100644 --- a/systests/pom.xml +++ b/systests/pom.xml @@ -41,12 +41,6 @@ <artifactId>qpid-systests-jms-core</artifactId> </dependency> - <!-- Many systests have a compile/runtime dependency on qpid-client --> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - </dependency> - <!-- broker deps --> <dependency> <groupId>org.apache.qpid</groupId> @@ -199,6 +193,10 @@ </activation> <dependencies> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-client</artifactId> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java ---------------------------------------------------------------------- diff --git a/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java index 4ba8687..368f116 100644 --- a/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java +++ b/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java @@ -31,8 +31,6 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; -import java.security.GeneralSecurityException; -import java.security.KeyStore; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; @@ -40,13 +38,6 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; import javax.servlet.http.HttpServletResponse; import javax.xml.bind.DatatypeConverter; @@ -58,10 +49,8 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.SystemConfig; -import org.apache.qpid.ssl.SSLContextFactory; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.apache.qpid.transport.network.security.ssl.SSLUtil; public class RestTestHelper { @@ -158,80 +147,6 @@ public class RestTestHelper HttpURLConnection httpCon = (HttpURLConnection) url.openConnection(); httpCon.setConnectTimeout(_connectTimeout); - if(_useSslAuth) - { - try - { - // We have to use a SSLSocketFactory from a new SSLContext so that we don't re-use - // the JVM's defaults that may have been initialised in previous tests. - - final TrustManager[] trustManagers; - final KeyManager[] keyManagers; - - trustManagers = - SSLContextFactory.getTrustManagers(_truststore, - _truststorePassword, - KeyStore.getDefaultType(), - TrustManagerFactory.getDefaultAlgorithm()); - - if (_keystore == null) - { - throw new IllegalStateException("Cannot use SSL client auth without providing a keystore"); - } - - keyManagers = - SSLContextFactory.getKeyManagers(_keystore, - _keystorePassword, - KeyStore.getDefaultType(), - KeyManagerFactory.getDefaultAlgorithm(), - _clientAuthAlias); - - final SSLContext sslContext = SSLUtil.tryGetSSLContext(); - - sslContext.init(keyManagers, trustManagers, null); - - SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); - - ((HttpsURLConnection) httpCon).setSSLSocketFactory(sslSocketFactory); - } - catch (GeneralSecurityException e) - { - throw new RuntimeException(e); - } - } - else if (_useSsl) - { - try - { - // We have to use a SSLSocketFactory from a new SSLContext so that we don't re-use - // the JVM's defaults that may have been initialised in previous tests. - - final TrustManager[] trustManagers; - final KeyManager[] keyManagers; - - trustManagers = - SSLContextFactory.getTrustManagers(_truststore, - _truststorePassword, - KeyStore.getDefaultType(), - TrustManagerFactory.getDefaultAlgorithm()); - - keyManagers = - SSLContextFactory.getKeyManagers(null, null, null, null, null); - - final SSLContext sslContext = SSLUtil.tryGetSSLContext(); - - sslContext.init(keyManagers, trustManagers, null); - - SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); - - ((HttpsURLConnection) httpCon).setSSLSocketFactory(sslSocketFactory); - } - catch (GeneralSecurityException e) - { - throw new RuntimeException(e); - } - } - if(_username != null) { String encoded = DatatypeConverter.printBase64Binary((_username + ":" + _password).getBytes(UTF_8)); @@ -531,11 +446,6 @@ public class RestTestHelper Assert.assertEquals("Unexpected number of groups", expectedNumberOfGroups, groups.size()); } - public void setUseSsl(boolean useSsl) - { - _useSsl = useSsl; - } - public void setUsernameAndPassword(String username, String password) { _username = username; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java ---------------------------------------------------------------------- diff --git a/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java b/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java index a834aca..4c447f7 100644 --- a/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java +++ b/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java @@ -34,7 +34,7 @@ import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.util.FileUtils; +import org.apache.qpid.server.util.FileUtils; public abstract class AbstractBrokerHolder implements BrokerHolder { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java ---------------------------------------------------------------------- diff --git a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java index 788f10f..6156f36 100644 --- a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java +++ b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java @@ -42,7 +42,7 @@ import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.model.BrokerLogInclusionRule; import org.apache.qpid.server.model.BrokerLogger; -import org.apache.qpid.util.SystemUtils; +import org.apache.qpid.server.util.SystemUtils; public class SpawnedBrokerHolder extends AbstractBrokerHolder { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/073f27ee/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java ---------------------------------------------------------------------- diff --git a/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java index d42e7fc..526efaa 100644 --- a/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java +++ b/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java @@ -76,7 +76,7 @@ import org.apache.qpid.server.store.ConfiguredObjectRecordImpl; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; -import org.apache.qpid.util.Strings; +import org.apache.qpid.server.util.Strings; public class TestBrokerConfiguration { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org