From a70b21cf8906dd23e0efea41bea913f9fb917ba3 Mon Sep 17 00:00:00 2001 From: Domenico Francesco Bruscino Date: Wed, 31 Mar 2021 15:46:19 +0200 Subject: [PATCH] NO-JIRA Fix SSLSupportTest for IBM JVM --- .../remoting/impl/ssl/SSLSupportTest.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java index 663139abf6..7539b55475 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java @@ -35,12 +35,19 @@ public class SSLSupportTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "storeProvider={0}, storeType={1}") public static Collection getParameters() { - return Arrays.asList(new Object[][]{ - {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE}, - {"SunJCE", "JCEKS"}, - {"SUN", "JKS"}, - {"SunJSSE", "PKCS12"} - }); + if (System.getProperty("java.vendor").contains("IBM")) { + return Arrays.asList(new Object[][]{ + {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE}, + {"IBMJCE", "JCEKS"} + }); + } else { + return Arrays.asList(new Object[][]{ + {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE}, + {"SunJCE", "JCEKS"}, + {"SUN", "JKS"}, + {"SunJSSE", "PKCS12"} + }); + } } public SSLSupportTest(String storeProvider, String storeType) {