Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-7056 - modify tests to take account of changes from AMQ-7047

This commit is contained in:
gtully 2018-09-20 10:25:51 +01:00
parent b92aaa2f58
commit 2f5e5efec5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java
View File

@ -94,7 +94,7 @@ public class AMQ3625Test {
Logger.getRootLogger().addAppender(appender); Logger.getRootLogger().addAppender(appender);
String connectURI = broker1.getConnectorByName("openwire").getConnectUri().toString(); String connectURI = broker1.getConnectorByName("openwire").getConnectUri().toString();
connectURI = connectURI.replace("?needClientAuth=true", ""); connectURI = connectURI.replace("?needClientAuth=true", "?verifyHostName=false");
broker2.addNetworkConnector("static:(" + connectURI + ")").start(); broker2.addNetworkConnector("static:(" + connectURI + ")").start();
Thread.sleep(10 * 1000); Thread.sleep(10 * 1000);

4
activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasNetworkTest.java
View File

@ -64,7 +64,7 @@ public class JaasNetworkTest extends TestCase {
System.setProperty("javax.net.ssl.keyStorePassword", "password"); System.setProperty("javax.net.ssl.keyStorePassword", "password");
System.setProperty("javax.net.ssl.keyStoreType", "jks"); 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(); Connection producerConn = producerFactory.createConnection();
Session producerSess = producerConn.createSession(false, Session.AUTO_ACKNOWLEDGE); Session producerSess = producerConn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(new ActiveMQQueue("test")); MessageProducer producer = producerSess.createProducer(new ActiveMQQueue("test"));
@ -72,7 +72,7 @@ public class JaasNetworkTest extends TestCase {
TextMessage sentMessage = producerSess.createTextMessage("test"); TextMessage sentMessage = producerSess.createTextMessage("test");
producer.send(sentMessage); producer.send(sentMessage);
ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("ssl://localhost:61618"); ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("ssl://localhost:61618?verifyHostName=false");
Connection consumerConn = consumerFactory.createConnection(); Connection consumerConn = consumerFactory.createConnection();
Session consumerSess = consumerConn.createSession(false, Session.AUTO_ACKNOWLEDGE); Session consumerSess = consumerConn.createSession(false, Session.AUTO_ACKNOWLEDGE);
consumerConn.start(); consumerConn.start();

2
activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml
View File

@ -32,7 +32,7 @@
</sslContext> </sslContext>
<transportConnectors> <transportConnectors>
<transportConnector name="openwire" uri="ssl://localhost:0?needClientAuth=true" /> <transportConnector name="openwire" uri="ssl://localhost:0?needClientAuth=true&amp;" />
</transportConnectors> </transportConnectors>
</broker> </broker>

2
activemq-unit-tests/src/test/resources/org/apache/activemq/security/broker1.xml
View File

@ -26,7 +26,7 @@
<networkConnectors> <networkConnectors>
<networkConnector uri="static://(ssl://localhost:61618)" <networkConnector uri="static://(ssl://localhost:61618?verifyHostName=false)"
name="tobackbone" name="tobackbone"
duplex="true" duplex="true"
prefetchSize="1" prefetchSize="1"