Skip to content

Refactor Junit5 for BaseTestAESCCM and BaseTestAESCCM2 tests #1476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonkatonica merged 1 commit into from
May 19, 2026
Merged

Refactor Junit5 for BaseTestAESCCM and BaseTestAESCCM2 tests #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions src/test/java/ibm/jceplus/junit/openjceplus/TestAESCCM.java
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/test/java/ibm/jceplus/junit/openjceplus/TestAESCCM2.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

@SelectClasses({
TestAES256Interop.class,
TestAESCCM.class,
TestAESCCM2.class,
TestAESCCMInteropBC.class,
TestAESCCMParameters.class,
TestAESGCM_ExtIV.class,
Expand Down
24 changes: 0 additions & 24 deletions src/test/java/ibm/jceplus/junit/openjceplusfips/TestAESCCM.java
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/test/java/ibm/jceplus/junit/openjceplusfips/TestAESCCM2.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

@SelectClasses({
TestAES256Interop.class,
TestAESCCM.class,
TestAESCCM2.class,
TestAESCCMInteropBC.class,
TestAESCCMParameters.class,
TestAESGCM_ExtIV.class,
Expand Down
25 changes: 22 additions & 3 deletions ...bm/jceplus/junit/base/BaseTestAESCCM.java → ...a/ibm/jceplus/junit/tests/TestAESCCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ibm.security.internal.spec.CCMParameterSpec;
import java.nio.ByteBuffer;
Expand All @@ -19,11 +19,25 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import org.junit.jupiter.api.Assertions;
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;

// This test case exercises the AES/CCM cipher using a CCMParameterSpec object

public class BaseTestAESCCM extends BaseTestJunit5 {
@Tag(Tags.OPENJCEPLUS_NAME)
@Tag(Tags.OPENJCEPLUS_FIPS_NAME)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@ParameterizedClass
@MethodSource("ibm.jceplus.junit.tests.TestArguments#getEnabledProviders")
public class TestAESCCM extends BaseTest {

@Parameter(0)
TestProvider provider;

public static int iterationLimit = 100;
public static int iterationCounter = 0;
Expand Down Expand Up @@ -52,6 +66,11 @@ public class BaseTestAESCCM extends BaseTestJunit5 {

public static boolean printJunitTrace = Boolean.valueOf(System.getProperty("com.ibm.jceplus.junit.printJunitTrace"));

@BeforeEach
public void setUp() throws Exception {
setAndInsertProvider(provider);
}

@Test
public void testAESCCM() throws Exception {
while (iterationCounter < iterationLimit) {
Expand Down
25 changes: 22 additions & 3 deletions ...m/jceplus/junit/base/BaseTestAESCCM2.java → .../ibm/jceplus/junit/tests/TestAESCCM2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ibm.security.internal.spec.CCMParameterSpec;
import java.nio.ByteBuffer;
Expand All @@ -20,11 +20,25 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import org.junit.jupiter.api.Assertions;
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;

// This test case exercises the AES/CCM cipher using a CCMParameters object

public class BaseTestAESCCM2 extends BaseTestJunit5 {
@Tag(Tags.OPENJCEPLUS_NAME)
@Tag(Tags.OPENJCEPLUS_FIPS_NAME)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@ParameterizedClass
@MethodSource("ibm.jceplus.junit.tests.TestArguments#getEnabledProviders")
public class TestAESCCM2 extends BaseTest {

@Parameter(0)
TestProvider provider;

public int iterationLimit = 100;
public int iterationCounter = 0;
Expand Down Expand Up @@ -53,6 +67,11 @@ public class BaseTestAESCCM2 extends BaseTestJunit5 {

public boolean printJunitTrace = Boolean.valueOf(System.getProperty("com.ibm.jceplus.junit.printJunitTrace"));

@BeforeEach
public void setUp() throws Exception {
setAndInsertProvider(provider);
}

@Test
public void testAESCCM() throws Exception {
while (iterationCounter < iterationLimit) {
Expand Down
Loading