ARTEMIS-1882 fix failing SecurityTest (cherry picked from commit 6211fb7ad603d8020f59ea8a68172a072b9a55ba)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/000a2781 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/000a2781 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/000a2781 Branch: refs/heads/2.6.x Commit: 000a2781d0f9f95bda885719dda696d04a66945b Parents: f011ea6 Author: Justin Bertram <[email protected]> Authored: Thu May 24 21:48:04 2018 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu May 31 19:18:13 2018 -0400 ---------------------------------------------------------------------- .../tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/000a2781/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java index 6217dbd..b9b9bc8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java @@ -55,6 +55,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { + String suffix = ""; @Parameterized.Parameters(name = "storeType={0}") public static Collection getParameters() { @@ -63,7 +64,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { public CoreClientOverOneWaySSLTest(String storeType) { this.storeType = storeType; - String suffix = storeType.toLowerCase(); + suffix = storeType.toLowerCase(); // keytool expects PKCS12 stores to use the extension "p12" if (storeType.equals("PKCS12")) { suffix = "p12"; @@ -327,7 +328,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { // create an invalid SSL connection tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, true); tc.getParams().put(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME, storeType); - tc.getParams().put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "other-client-side-truststore." + storeType.toLowerCase()); + tc.getParams().put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "other-client-side-truststore." + suffix); tc.getParams().put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, PASSWORD); ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(tc)).setCallTimeout(3000); @@ -340,7 +341,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { // reload the acceptor to reload the SSL stores NettyAcceptor acceptor = (NettyAcceptor) server.getRemotingService().getAcceptor("nettySSL"); - acceptor.setKeyStorePath("other-server-side-keystore." + storeType.toLowerCase()); + acceptor.setKeyStorePath("other-server-side-keystore." + suffix); acceptor.reload(); // create a session with the locator which failed previously proving that the SSL stores have been reloaded
