Skip to content

Commit fd6caf6

Browse files
Refactor JUnit 5 tests consolidate BaseTestAESGCM
This change consolidates various tests associated with the former BaseTestAESGCM into a single parameterized test. Fixes https://github.ibm.com/runtimes/jit-crypto/issues/1061 Signed-off-by: Mohit Rajbhar <mohit.rajbhar@ibm.com>
1 parent 9759b2a commit fd6caf6

27 files changed

+109
-394
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright IBM Corp. 2023, 2025
2+
* Copyright IBM Corp. 2023, 2026
33
*
44
* This code is free software; you can redistribute it and/or modify it
55
* under the terms provided by IBM in the LICENSE file that accompanied
@@ -31,9 +31,6 @@ public class TestMultithread {
3131
private final int numThreads = 10;
3232
private final int timeoutSec = 4500;
3333
private final String[] testList = {
34-
"ibm.jceplus.junit.openjceplus.multithread.TestAESGCM_128",
35-
"ibm.jceplus.junit.openjceplus.multithread.TestAESGCM_192",
36-
"ibm.jceplus.junit.openjceplus.multithread.TestAESGCM_256",
3734
"ibm.jceplus.junit.openjceplus.multithread.TestAESGCMCICOWithGCM",
3835
"ibm.jceplus.junit.openjceplus.multithread.TestAESGCMCICOWithGCMAndAAD",
3936
"ibm.jceplus.junit.openjceplus.multithread.TestAESCipherInputStreamExceptions",

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright IBM Corp. 2023, 2025
2+
* Copyright IBM Corp. 2023, 2026
33
*
44
* This code is free software; you can redistribute it and/or modify it
55
* under the terms provided by IBM in the LICENSE file that accompanied
@@ -31,9 +31,6 @@ public class TestMultithreadFIPS {
3131
private final int numThreads = 10;
3232
private final int timeoutSec = 4500;
3333
private final String[] testList = {
34-
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCM_128",
35-
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCM_192",
36-
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCM_256",
3734
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMCICOWithGCM",
3835
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESGCMCICOWithGCMAndAAD",
3936
"ibm.jceplus.junit.openjceplusfips.multithread.TestAESCipherInputStreamExceptions",

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright IBM Corp. 2023, 2025
2+
* Copyright IBM Corp. 2023, 2026
33
*
44
* This code is free software; you can redistribute it and/or modify it
55
* under the terms provided by IBM in the LICENSE file that accompanied
@@ -19,12 +19,8 @@
1919
TestAESCCMParameters.class,
2020
TestAESCipherInputStreamExceptions.class,
2121
TestAESCopySafe.class,
22-
TestAESGCM_128.class,
23-
TestAESGCM_192.class,
24-
TestAESGCM_256.class,
2522
TestAESGCM_ExtIV.class,
2623
TestAESGCM_IntIV.class,
27-
TestAESGCM.class,
2824
TestAESGCMBufferIV.class,
2925
TestAESGCMCICOWithGCM.class,
3026
TestAESGCMCICOWithGCMAndAAD.class,

src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestAESGCM_128.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestAESGCM_192.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestAESGCM_256.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)