Merge pull request #1568 from Ashpan/ELY-2070

[ELY-2070] CredentialStore is not able to get data from credential storage in file on IBM JDK 8
wildfly-security · Sep 24, 2021 · 649f2cd · 649f2cd
2 parents 2a172e3 + c38523d
commit 649f2cd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tool/src/test/java/org/wildfly/security/tool/CredentialStoreCommandTest.java b/tool/src/test/java/org/wildfly/security/tool/CredentialStoreCommandTest.java
@@ -52,7 +52,7 @@
  * @author Hynek Švábek <hsvabek@redhat.com>
  */
 public class CredentialStoreCommandTest extends AbstractCommandTest {
-
+    private static final boolean IS_IBM = System.getProperty("java.vendor").contains("IBM");
     public static final String RSA_ALGORITHM = "RSA";
     public static final String DSA_ALGORITHM = "DSA";
     public static final String EC_ALGORITHM = "EC";
@@ -316,6 +316,7 @@ public void testGenerateKeyPairDSA() throws CredentialStoreException {
 
     @Test
     public void testGenerateKeyPairECDSA() throws CredentialStoreException {
+        Assume.assumeFalse(IS_IBM); //Don't run if using IBM JDK https://issues.redhat.com/browse/ELY-2214
         String storageLocation = getStoragePathForNewFile();
         String storagePassword = "cspassword";
         String aliasName = "testalias";
@@ -353,6 +354,7 @@ public void testExportPublicKey() {
 
     @Test
     public void testImportOpenSSHKeyPairFromFile() throws CredentialStoreException {
+        Assume.assumeFalse(IS_IBM); //Don't run if using IBM JDK https://issues.redhat.com/browse/ELY-2214
         String storageLocation = getStoragePathForNewFile();
         String storagePassword = "cspassword";
         String aliasName = "testalias";
@@ -372,9 +374,9 @@ public void testImportOpenSSHKeyPairFromFile() throws CredentialStoreException {
         Assert.assertEquals(EC_ALGORITHM, keyPair.getPrivate().getAlgorithm());
         Assert.assertEquals(EC_ALGORITHM, keyPair.getPublic().getAlgorithm());
     }
-
     @Test
     public void testImportPKCSKeyPairFromFile() throws CredentialStoreException {
+        Assume.assumeFalse(IS_IBM); //Don't run if using IBM JDK https://issues.redhat.com/browse/ELY-2214
         String storageLocation = getStoragePathForNewFile();
         String storagePassword = "cspassword";
         String aliasName = "testalias";
@@ -399,6 +401,7 @@ public void testImportPKCSKeyPairFromFile() throws CredentialStoreException {
 
     @Test
     public void testImportOpenSSHKeyPairFromString() throws CredentialStoreException {
+        Assume.assumeFalse(IS_IBM); //Don't run if using IBM JDK https://issues.redhat.com/browse/ELY-2214
         String storageLocation = getStoragePathForNewFile();
         String storagePassword = "cspassword";
         String aliasName = "testalias";
@@ -429,6 +432,7 @@ public void testImportOpenSSHKeyPairFromString() throws CredentialStoreException
 
     @Test
     public void testImportPKCSKeyPairFromString() throws CredentialStoreException {
+        Assume.assumeFalse(IS_IBM); //Don't run if using IBM JDK https://issues.redhat.com/browse/ELY-2214
         String storageLocation = getStoragePathForNewFile();
         String storagePassword = "cspassword";
         String aliasName = "testalias";