NO-JIRA Fix SSLSupportTest for IBM JVM

apache · Mar 31, 2021 · a70b21c · a70b21c
1 parent 0ca4130
commit a70b21c
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/...st/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/...st/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) {