Refactor JUnit 5 Tests for BaseTestDSASignatureInterop

Mohit-Rajbhar100698 · Mohit-Rajbhar100698 · commit 4966270c774a · 2026-06-04T16:23:32.000+05:30
Replace multiple test classes extending BaseTestDSASignatureInterop with a single JUnit 5 parameterized test class

Signed-off-by: Mohit Rajbhar &lt;mohit.rajbhar@ibm.com&gt;
diff --git a/src/test/java/ibm/jceplus/junit/TestMultithread.java b/src/test/java/ibm/jceplus/junit/TestMultithread.java
@@ -35,7 +35,6 @@ public class TestMultithread {
             "ibm.jceplus.junit.openjceplus.multithread.TestAliases",
             "ibm.jceplus.junit.openjceplus.multithread.TestDH",
             "ibm.jceplus.junit.openjceplus.multithread.TestDSAKey",
-            "ibm.jceplus.junit.openjceplus.multithread.TestDSASignatureInteropSUN",
             "ibm.jceplus.junit.openjceplus.multithread.TestECDH",
             "ibm.jceplus.junit.openjceplus.multithread.TestECDHInteropSunEC",
             "ibm.jceplus.junit.openjceplus.multithread.TestEdDSASignature",
diff --git a/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java b/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java
@@ -35,7 +35,6 @@ public class TestMultithreadFIPS {
             "ibm.jceplus.junit.openjceplusfips.multithread.TestAliases",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestDH",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestDSAKey",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestDSASignatureInteropSUN",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestECDH",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestECDHInteropSunEC",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestHKDF",
diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java b/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java
@@ -39,7 +39,6 @@
     TestDSAKey.class,
     TestDSASignature.class,
     TestDSASignatureInteropBC.class,
-    TestDSASignatureInteropSUN.class,
     TestECDH.class,
     TestECDHInteropBC.class,
     TestECDHInteropSunEC.class,
diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/TestDSASignatureInteropSUN.java b/src/test/java/ibm/jceplus/junit/openjceplus/TestDSASignatureInteropSUN.java
diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestDSASignatureInteropSUN.java b/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestDSASignatureInteropSUN.java
diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestDSASignatureInteropSUN.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/TestDSASignatureInteropSUN.java
diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestDSASignatureInteropSUN.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestDSASignatureInteropSUN.java
diff --git a/src/test/java/ibm/jceplus/junit/tests/BaseTest.java b/src/test/java/ibm/jceplus/junit/tests/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2025
+ * Copyright IBM Corp. 2025, 2026
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms provided by IBM in the LICENSE file that accompanied
@@ -30,6 +30,19 @@ public void setProviderName(String providerName) {
     public void setAndInsertProvider(TestProvider provider) throws Exception {
         this.providerName = provider.getProviderName();
         switch (provider) {
+            case OpenJCEPlus:
+                loadProvider(TestProvider.OpenJCEPlus);
+                break;
+            case OpenJCEPlusFIPS:
+                loadProvider(TestProvider.OpenJCEPlusFIPS);
+                break;
+            default:
+                throw new Exception("Provider not supported: " + provider.getProviderName());
+        }
+    }
+
+    public void setAndInsertInteropProvider(TestProvider interopProvider) throws Exception {
+        switch (interopProvider) {
             case BC:
                 loadProvider(TestProvider.BC);
                 break;
@@ -45,14 +58,8 @@ public void setAndInsertProvider(TestProvider provider) throws Exception {
             case SunEC:
                 loadProvider(TestProvider.SunEC);
                 break;
-            case OpenJCEPlus:
-                loadProvider(TestProvider.OpenJCEPlus);
-                break;
-            case OpenJCEPlusFIPS:
-                loadProvider(TestProvider.OpenJCEPlusFIPS);
-                break;
             default:
-                throw new Exception("Provider not supported: " + provider.getProviderName());
+                throw new Exception("Provider not supported: " + interopProvider.getProviderName());
         }
     }
 
diff --git a/src/test/java/ibm/jceplus/junit/tests/BaseTestInterop.java b/src/test/java/ibm/jceplus/junit/tests/BaseTestInterop.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright IBM Corp. 2023, 2026
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms provided by IBM in the LICENSE file that accompanied
+ * this code, including the "Classpath" Exception described therein.
+ */
+
+package ibm.jceplus.junit.tests;
+
+public class BaseTestInterop extends BaseTest {
+
+    public String interopProviderName;
+    public String interopProviderName2;
+
+    /**
+     * Sets the provider name to interop with.
+     *
+     * @param providerName the provider name associated with this test case for use.
+     */
+    public void setInteropProviderName(String providerName) {
+        this.interopProviderName = providerName;
+    }
+
+    /**
+     * Gets the provider name that is to be used for interop.
+     *
+     * @return The provider name associated with the interop provider name.
+     */
+    public String getInteropProviderName() {
+        return this.interopProviderName;
+    }
+
+    /**
+     * Sets the provider name to interop with.
+     *
+     * @param providerName the provider name associated with this test case for use.
+     */
+    public void setInteropProviderName2(String providerName) {
+        this.interopProviderName2 = providerName;
+    }
+
+    /**
+     * Gets the provider name that is to be used for interop.
+     *
+     * @return The provider name associated with the interop provider name.
+     */
+    public String getInteropProviderName2() {
+        return this.interopProviderName2;
+    }
+}
diff --git a/src/test/java/ibm/jceplus/junit/tests/BaseTestSignatureInterop.java b/src/test/java/ibm/jceplus/junit/tests/BaseTestSignatureInterop.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright IBM Corp. 2023, 2026
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms provided by IBM in the LICENSE file that accompanied
+ * this code, including the "Classpath" Exception described therein.
+ */
+
+package ibm.jceplus.junit.tests;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BaseTestSignatureInterop extends BaseTestInterop {
+
+    protected void doSignVerify(String sigAlgo, byte[] message, PrivateKey privateKey,
+            PublicKey publicKey) throws Exception {
+        doSignVerify(sigAlgo, message, privateKey, publicKey, getProviderName(), getInteropProviderName());
+        doSignVerify(sigAlgo, message, privateKey, publicKey, getInteropProviderName(), getProviderName());
+    }
+
+
+    protected static void doSignVerify(String sigAlgo, byte[] message, PrivateKey privateKey,
+            PublicKey publicKey, String signProvider, String verifyProvider) throws Exception {
+        Signature signing = Signature.getInstance(sigAlgo, signProvider);
+        signing.initSign(privateKey);
+        signing.update(message);
+        byte[] signedBytes = signing.sign();
+
+        Signature verifying = Signature.getInstance(sigAlgo, verifyProvider);
+        verifying.initVerify(publicKey);
+        verifying.update(message);
+
+        assertTrue(verifying.verify(signedBytes), "Signature verification failed");
+    }
+}
+
diff --git a/src/test/java/ibm/jceplus/junit/tests/TestArguments.java b/src/test/java/ibm/jceplus/junit/tests/TestArguments.java
@@ -48,6 +48,15 @@ public static Stream<Arguments> rsaMultithreadKeySizesAndProviders() {
         return keySizesAndJCEPlusProviders(rsaKeySizes);
     }
 
+    /**
+     * Generates combinations of OpenJCEPlus* providers with the SUN provider for interoperability testing.
+     *
+     * @return Stream of Arguments containing (JCEProviders, SUN) pairs
+     */
+    public static Stream<Arguments> getOpenJCEPlusWithSUNInteropProvider() {
+        return getOpenJCEPlusWithInteropProviders(TestProvider.SUN);
+    }
+
     /**
      * Generates combinations of all key sizes and OpenJCEPlus* providers under test.
      * 
@@ -101,5 +110,23 @@ protected static Stream<TestProvider> getEnabledProviders() {
             }
         }
         return enabledProviders.stream();
-    }     
+    }
+
+    /**
+     * Generates combinations of OpenJCEPlus* providers with a specified interoperability provider for testing.
+     *
+     * @param interopProvider The interoperability provider to combine with OpenJCEPlus* providers
+     * @return Stream of Arguments containing (JCEProviders, interopProvider) pairs
+     */
+    protected static Stream<Arguments> getOpenJCEPlusWithInteropProviders(TestProvider interopProvider) {
+        List<TestProvider> enabledProviders = getEnabledProviders().toList();
+
+        List<Arguments> arguments = new ArrayList<>();
+        for (TestProvider jceProvider : enabledProviders) {
+            arguments.add(Arguments.of(jceProvider, interopProvider));
+        }
+
+        return arguments.stream();
+    }
+
 }
diff --git a/src/test/java/ibm/jceplus/junit/tests/TestDSASignatureInterop.java b/src/test/java/ibm/jceplus/junit/tests/TestDSASignatureInterop.java
@@ -1,12 +1,12 @@
 /*
- * Copyright IBM Corp. 2023, 2024
+ * Copyright IBM Corp. 2023, 2026
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms provided by IBM in the LICENSE file that accompanied
  * this code, including the "Classpath" Exception described therein.
  */
 
-package ibm.jceplus.junit.base;
+package ibm.jceplus.junit.tests;
 
 import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
@@ -21,16 +21,41 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class BaseTestDSASignatureInterop extends BaseTestSignatureInterop {
+@Tag(Tags.OPENJCEPLUS_NAME)
+@Tag(Tags.OPENJCEPLUS_FIPS_NAME)
+@Tag(Tags.OPENJCEPLUS_MULTITHREAD_NAME)
+@Tag(Tags.OPENJCEPLUS_FIPS_MULTITHREAD_NAME)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@ParameterizedClass
+@MethodSource("ibm.jceplus.junit.tests.TestArguments#getOpenJCEPlusWithSUNInteropProvider")
+public class TestDSASignatureInterop extends BaseTestSignatureInterop {
 
+    @Parameter(0)
+    TestProvider provider;
+
+    @Parameter(1)
+    TestProvider interopProvider;
 
     static final byte[] origMsg = "this is the original message to be signed".getBytes();
 
+    @BeforeEach
+    public void setUp() throws Exception {
+        setAndInsertProvider(provider);
+        setAndInsertInteropProvider(interopProvider);
+        setInteropProviderName(interopProvider.getProviderName());
+    }
+
     @Test
     public void testSHA1withDSA_1024() throws Exception {
         KeyPair keyPair = null;
