Consolidate BaseTestAESCipherInputStreamExceptions and BaseTestAESGCMCICOWithGCMAndAAD tests (#1228)

This change consolidates the tests previously associated with BaseTestAESCipherInputStreamExceptions into the parameterized TestAESCipherInputStreamExceptions class, and the tests from BaseTestAESGCMCICOWithGCMAndAAD into the parameterized TestAESGCMCICOWithGCMAndAAD class.

Fixes: https://github.ibm.com/runtimes/jit-crypto/issues/1083

Signed-off-by: Mohit Rajbhar <mohit.rajbhar@ibm.com>

Author: Mohit-Rajbhar100698

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

@@ -31,8 +31,6 @@ public class TestMultithread {
     private final int numThreads = 10;
     private final int timeoutSec = 4500;
     private final String[] testList = {
-            "ibm.jceplus.junit.openjceplus.multithread.TestAESGCMCICOWithGCMAndAAD",
-            "ibm.jceplus.junit.openjceplus.multithread.TestAESCipherInputStreamExceptions",
             "ibm.jceplus.junit.openjceplus.multithread.TestAESCopySafe",
             "ibm.jceplus.junit.openjceplus.multithread.TestAESGCMLong",
             "ibm.jceplus.junit.openjceplus.multithread.TestAESGCMNonExpanding",

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

@@ -31,8 +31,6 @@ public class TestMultithreadFIPS {
     private final int numThreads = 10;
     private final int timeoutSec = 4500;
     private final String[] testList = {
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMCICOWithGCMAndAAD",
-            "ibm.jceplus.junit.openjceplusfips.multithread.TestAESCipherInputStreamExceptions",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestAESCopySafe",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMLong",
             "ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMNonExpanding",

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

@@ -17,12 +17,10 @@
     TestAESCCM2.class,
     TestAESCCMInteropBC.class,
     TestAESCCMParameters.class,
-    TestAESCipherInputStreamExceptions.class,
     TestAESCopySafe.class,
     TestAESGCM_ExtIV.class,
     TestAESGCM_IntIV.class,
     TestAESGCMBufferIV.class,
-    TestAESGCMCICOWithGCMAndAAD.class,
     TestAESGCMLong.class,
     TestAESGCMNonExpanding.class,
     TestAESGCMSameBuffer.class,

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

@@ -17,12 +17,10 @@
     TestAESCCM2.class,
     TestAESCCMInteropBC.class,
     TestAESCCMParameters.class,
-    TestAESCipherInputStreamExceptions.class,
     TestAESCopySafe.class,
     TestAESGCM_ExtIV.class,
     TestAESGCM_IntIV.class,
     TestAESGCMBufferIV.class,
-    TestAESGCMCICOWithGCMAndAAD.class,
     TestAESGCMLong.class,
     TestAESGCMNonExpanding.class,
     TestAESGCMSameBuffer.class,