This commit is contained in:
Justin Bertram 2021-03-31 09:22:38 -05:00
commit d895f383fd
1 changed files with 13 additions and 6 deletions

View File

@ -35,6 +35,12 @@ public class SSLSupportTest extends ActiveMQTestBase {
@Parameterized.Parameters(name = "storeProvider={0}, storeType={1}") @Parameterized.Parameters(name = "storeProvider={0}, storeType={1}")
public static Collection getParameters() { public static Collection getParameters() {
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[][]{ return Arrays.asList(new Object[][]{
{TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE}, {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE},
{"SunJCE", "JCEKS"}, {"SunJCE", "JCEKS"},
@ -42,6 +48,7 @@ public class SSLSupportTest extends ActiveMQTestBase {
{"SunJSSE", "PKCS12"} {"SunJSSE", "PKCS12"}
}); });
} }
}
public SSLSupportTest(String storeProvider, String storeType) { public SSLSupportTest(String storeProvider, String storeType) {
this.storeProvider = storeProvider; this.storeProvider = storeProvider;