Refactor JUnit 5 for BaseTestAESCCMInteropBC and BaseTestAESGCMUpdateInteropBC tests

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

@@ -13,13 +13,11 @@
 
 @SelectClasses({
     TestAES256Interop.class,
-    TestAESCCMInteropBC.class,
     TestAESCCMParameters.class,
     TestAESGCM_ExtIV.class,
     TestAESGCM_IntIV.class,
     TestAESGCMBufferIV.class,
     TestAESGCMUpdate.class,
-    TestAESGCMUpdateInteropBC.class,
     TestAESKeyWrap.class,
     TestAliases.class,
     TestAttributes.class,

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

@@ -13,7 +13,6 @@
 
 @SelectClasses({
     TestAES256Interop.class,
-    TestAESCCMInteropBC.class,
     TestAESCCMParameters.class,
     TestAESGCM_ExtIV.class,
     TestAESGCM_IntIV.class,

src/test/java/ibm/jceplus/junit/base/BaseTestAESGCMUpdateInteropBC.java → src/test/java/ibm/jceplus/junit/tests/TestAESGCMUpdateInteropBC.java

@@ -1,12 +1,12 @@
 /*
- * Copyright IBM Corp. 2023, 2025
+ * 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.lang.reflect.Method;
 import java.security.AlgorithmParameters;
@@ -17,10 +17,28 @@
 import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+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.assertTrue;
 
-public class BaseTestAESGCMUpdateInteropBC extends BaseTestJunit5Interop {
+@Tag(Tags.OPENJCEPLUS_NAME)
+@Tag(Tags.OPENJCEPLUS_FIPS_NAME)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@ParameterizedClass
+@MethodSource("ibm.jceplus.junit.tests.TestArguments#getOpenJCEPlusWithBCInteropProvider")
+public class TestAESGCMUpdateInteropBC extends BaseTestInterop {
+
+    @Parameter(0)
+    TestProvider provider;
+
+    @Parameter(1)
+    TestProvider interopProvider;
+
     private final static int GCM_IV_LENGTH = 12;
     private final static int GCM_TAG_LENGTH = 16;
     private static int ARRAY_OFFSET = 16;
@@ -68,6 +86,12 @@ private static String compressString(String original) {
         return original;
     }
 
+    @BeforeEach
+    public void setUp() throws Exception {
+        setAndInsertProvider(provider);
+        setAndInsertInteropProvider(interopProvider);
+    }
+
     @Test
     public void testWithOneDataUpdate() throws Exception {
         byte[] iv = new byte[GCM_IV_LENGTH];