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,12 +35,19 @@ 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() {
return Arrays.asList(new Object[][]{ if (System.getProperty("java.vendor").contains("IBM")) {
{TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE}, return Arrays.asList(new Object[][]{
{"SunJCE", "JCEKS"}, {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE},
{"SUN", "JKS"}, {"IBMJCE", "JCEKS"}
{"SunJSSE", "PKCS12"} });
}); } 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) { public SSLSupportTest(String storeProvider, String storeType) {