Refactor JUnit 5 tests consolidate BaseTestRSA

src/test/java/ibm/jceplus/junit/TestMultithread.java

@@ -63,7 +63,6 @@ public class TestMultithread {
             "ibm.jceplus.junit.openjceplus.multithread.TestPQCKEM",
             "ibm.jceplus.junit.openjceplus.multithread.TestPQCSignatures",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSASignature",
-            "ibm.jceplus.junit.openjceplus.multithread.TestRSA_2048",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSAKey",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSAPSS",
             "ibm.jceplus.junit.openjceplus.multithread.TestRSAPSS2",

src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java

@@ -58,7 +58,6 @@ public class TestMultithreadFIPS {
             "ibm.jceplus.junit.openjceplusfips.multithread.TestPBKDF2",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestPBKDF2Interop",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSASignature",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestRSA_2048",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAKey",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSS",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSS2",

src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java

@@ -105,11 +105,6 @@
     TestPQCSignatures.class,
     TestPublicMethodsToMakeNonPublic.class,
     TestResetByteBuffer.class,
-    TestRSA_1024.class,
-    TestRSA_2048.class,
-    TestRSA_4096.class,
-    TestRSA_512.class,
-    TestRSA.class,
     TestRSAKey.class,
     TestRSAKeyInterop.class,
     TestRSAKeyInteropBC.class,

src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java

@@ -72,9 +72,6 @@
     TestPBKDF2Interop.class,
     TestPublicMethodsToMakeNonPublic.class,
     TestResetByteBuffer.class,
-    TestRSA_2048.class,
-    TestRSA_4096.class,
-    TestRSA.class,
     TestRSAKey.class,
     TestRSAKeyInterop.class,
     TestRSAKeyInteropBC.class,

src/test/java/ibm/jceplus/junit/tests/TestArguments.java

@@ -28,6 +28,26 @@ public static Stream<Arguments> aesKeySizesAndJCEPlusProviders() {
         return keySizesAndJCEPlusProviders(aesKeySizes);
     }
 
+    /**
+     * Generates test combinations for each RSA key size with the active OpenJCEPlus* providers.
+     * 
+     * @return Stream of Arguments containing RSA key sizes and OpenJCEPlus* providers
+     */
+    public static Stream<Arguments> rsaKeySizesAndJCEPlusProviders() {
+        int[] rsaKeySizes = {512, 1024, 3072, 4096};
+        return keySizesAndJCEPlusProviders(rsaKeySizes);
+    }
+
+    /**
+     * Generates test combinations for RSA key size 2048 with the active OpenJCEPlus* providers.
+     * 
+     * @return Stream of Arguments containing RSA key size 2048 and OpenJCEPlus* providers
+     */
+    public static Stream<Arguments> rsaKeySize2048AndJCEPlusProviders() {
+        int[] rsaKeySizes = {2048};
+        return keySizesAndJCEPlusProviders(rsaKeySizes);
+    }    
+
     /**
      * Generates combinations of all key sizes and OpenJCEPlus* providers under test.
      *