Repository: activemq Updated Branches: refs/heads/master b92aaa2f5 -> 2f5e5efec
AMQ-7056 - modify tests to take account of changes from AMQ-7047 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2f5e5efe Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2f5e5efe Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2f5e5efe Branch: refs/heads/master Commit: 2f5e5efec5685b192c28d2f1d0edaa688691801a Parents: b92aaa2 Author: gtully <[email protected]> Authored: Thu Sep 20 10:25:51 2018 +0100 Committer: gtully <[email protected]> Committed: Thu Sep 20 10:25:51 2018 +0100 ---------------------------------------------------------------------- .../src/test/java/org/apache/activemq/bugs/AMQ3625Test.java | 2 +- .../test/java/org/apache/activemq/security/JaasNetworkTest.java | 4 ++-- .../apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml | 2 +- .../src/test/resources/org/apache/activemq/security/broker1.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/2f5e5efe/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java index 90a8833..a9506c3 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java @@ -94,7 +94,7 @@ public class AMQ3625Test { Logger.getRootLogger().addAppender(appender); String connectURI = broker1.getConnectorByName("openwire").getConnectUri().toString(); - connectURI = connectURI.replace("?needClientAuth=true", ""); + connectURI = connectURI.replace("?needClientAuth=true", "?verifyHostName=false"); broker2.addNetworkConnector("static:(" + connectURI + ")").start(); Thread.sleep(10 * 1000); http://git-wip-us.apache.org/repos/asf/activemq/blob/2f5e5efe/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java index 5c85cb6..dfa3ec8 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java @@ -64,7 +64,7 @@ public class JaasNetworkTest extends TestCase { System.setProperty("javax.net.ssl.keyStorePassword", "password"); System.setProperty("javax.net.ssl.keyStoreType", "jks"); - ActiveMQConnectionFactory producerFactory = new ActiveMQConnectionFactory("ssl://localhost:61617"); + ActiveMQConnectionFactory producerFactory = new ActiveMQConnectionFactory("ssl://localhost:61617?verifyHostName=false"); Connection producerConn = producerFactory.createConnection(); Session producerSess = producerConn.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = producerSess.createProducer(new ActiveMQQueue("test")); @@ -72,7 +72,7 @@ public class JaasNetworkTest extends TestCase { TextMessage sentMessage = producerSess.createTextMessage("test"); producer.send(sentMessage); - ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("ssl://localhost:61618"); + ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("ssl://localhost:61618?verifyHostName=false"); Connection consumerConn = consumerFactory.createConnection(); Session consumerSess = consumerConn.createSession(false, Session.AUTO_ACKNOWLEDGE); consumerConn.start(); http://git-wip-us.apache.org/repos/asf/activemq/blob/2f5e5efe/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml index 0b68aed..d798e8f 100644 --- a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml +++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml @@ -32,7 +32,7 @@ </sslContext> <transportConnectors> - <transportConnector name="openwire" uri="ssl://localhost:0?needClientAuth=true" /> + <transportConnector name="openwire" uri="ssl://localhost:0?needClientAuth=true&" /> </transportConnectors> </broker> http://git-wip-us.apache.org/repos/asf/activemq/blob/2f5e5efe/activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml index 190f701..d305749 100644 --- a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml +++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml @@ -26,7 +26,7 @@ <networkConnectors> - <networkConnector uri="static://(ssl://localhost:61618)" + <networkConnector uri="static://(ssl://localhost:61618?verifyHostName=false)" name="tobackbone" duplex="true" prefetchSize="1"
