diff --git a/src/test/java/ibm/jceplus/junit/TestMultithread.java b/src/test/java/ibm/jceplus/junit/TestMultithread.java index 2dfffdb4a..eddeb1174 100644 --- a/src/test/java/ibm/jceplus/junit/TestMultithread.java +++ b/src/test/java/ibm/jceplus/junit/TestMultithread.java @@ -56,8 +56,6 @@ public class TestMultithread { "ibm.jceplus.junit.openjceplus.multithread.TestRSAPSSInterop3", "ibm.jceplus.junit.openjceplus.multithread.TestRSASignatureInteropSunRsaSign", "ibm.jceplus.junit.openjceplus.multithread.TestSHA256Clone_SharedMD", - "ibm.jceplus.junit.openjceplus.multithread.TestSHA3_224", - "ibm.jceplus.junit.openjceplus.multithread.TestSHA3_256", "ibm.jceplus.junit.openjceplus.multithread.TestSHA512", "ibm.jceplus.junit.openjceplus.multithread.TestSHA512_224", "ibm.jceplus.junit.openjceplus.multithread.TestSHA512_256", diff --git a/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java b/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java index a38e3390d..ff34db07a 100644 --- a/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java +++ b/src/test/java/ibm/jceplus/junit/TestMultithreadFIPS.java @@ -51,8 +51,6 @@ public class TestMultithreadFIPS { "ibm.jceplus.junit.openjceplusfips.multithread.TestRSAPSSInterop3", "ibm.jceplus.junit.openjceplusfips.multithread.TestRSASignatureInteropSunRsaSign", "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA256Clone_SharedMD", - "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA3_224", - "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA3_256", "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA512", "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA512_224", "ibm.jceplus.junit.openjceplusfips.multithread.TestSHA512_256", diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java b/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java index 0947dcbf6..a6aad09bb 100644 --- a/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java +++ b/src/test/java/ibm/jceplus/junit/openjceplus/TestAll.java @@ -108,8 +108,6 @@ TestSHA1.class, TestSHA224.class, TestSHA256.class, - TestSHA3_224.class, - TestSHA3_256.class, TestSHA384.class, TestSHA512_224.class, TestSHA512_256.class, diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_224.java b/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_224.java deleted file mode 100644 index 0d89f852a..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_224.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplus; - -import ibm.jceplus.junit.base.BaseTestSHA3_224KAT; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_224 extends BaseTestSHA3_224KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_256.java b/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_256.java deleted file mode 100644 index 83c5e953b..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplus/TestSHA3_256.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplus; - -import ibm.jceplus.junit.base.BaseTestSHA3_256KAT; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_256 extends BaseTestSHA3_256KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_224.java b/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_224.java deleted file mode 100644 index 9fb1c422f..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_224.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplus.multithread; - -import ibm.jceplus.junit.base.BaseTestSHA3_224KAT; -import ibm.jceplus.junit.openjceplus.Utils; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_224 extends BaseTestSHA3_224KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_256.java b/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_256.java deleted file mode 100644 index 155eeb414..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplus/multithread/TestSHA3_256.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplus.multithread; - -import ibm.jceplus.junit.base.BaseTestSHA3_256KAT; -import ibm.jceplus.junit.openjceplus.Utils; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_256 extends BaseTestSHA3_256KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java index beb621026..173341255 100644 --- a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java +++ b/src/test/java/ibm/jceplus/junit/openjceplusfips/TestAll.java @@ -75,8 +75,6 @@ TestSHA1.class, TestSHA224.class, TestSHA256.class, - TestSHA3_224.class, - TestSHA3_256.class, TestSHA384.class, TestSHA512.class }) diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_224.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_224.java deleted file mode 100644 index 03c294445..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_224.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplusfips; - -import ibm.jceplus.junit.base.BaseTestSHA3_224KAT; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_224 extends BaseTestSHA3_224KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_256.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_256.java deleted file mode 100644 index 09598b1c3..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplusfips/TestSHA3_256.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplusfips; - -import ibm.jceplus.junit.base.BaseTestSHA3_256KAT; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_256 extends BaseTestSHA3_256KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_224.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_224.java deleted file mode 100644 index 38d0ce4c7..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_224.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplusfips.multithread; - -import ibm.jceplus.junit.base.BaseTestSHA3_224KAT; -import ibm.jceplus.junit.openjceplusfips.Utils; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_224 extends BaseTestSHA3_224KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_256.java b/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_256.java deleted file mode 100644 index 3e8272af4..000000000 --- a/src/test/java/ibm/jceplus/junit/openjceplusfips/multithread/TestSHA3_256.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright IBM Corp. 2023, 2024 - * - * 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.openjceplusfips.multithread; - -import ibm.jceplus.junit.base.BaseTestSHA3_256KAT; -import ibm.jceplus.junit.openjceplusfips.Utils; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestSHA3_256 extends BaseTestSHA3_256KAT { - - @BeforeAll - public void beforeAll() { - Utils.loadProviderTestSuite(); - setProviderName(Utils.TEST_SUITE_PROVIDER_NAME); - } -} diff --git a/src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_224KAT.java b/src/test/java/ibm/jceplus/junit/tests/TestSHA3_224KAT.java similarity index 99% rename from src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_224KAT.java rename to src/test/java/ibm/jceplus/junit/tests/TestSHA3_224KAT.java index 0f7c7bc65..38d54d3e2 100644 --- a/src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_224KAT.java +++ b/src/test/java/ibm/jceplus/junit/tests/TestSHA3_224KAT.java @@ -1,20 +1,35 @@ /* - * 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.security.MessageDigest; import java.util.Arrays; -import org.junit.jupiter.api.BeforeAll; +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 BaseTestSHA3_224KAT extends BaseTestMessageDigest { +@Tag(Tags.OPENJCEPLUS_NAME) +@Tag(Tags.OPENJCEPLUS_FIPS_NAME) +@Tag(Tags.OPENJCEPLUS_MULTITHREAD_NAME) +@Tag(Tags.OPENJCEPLUS_FIPS_MULTITHREAD_NAME) +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@ParameterizedClass +@MethodSource("ibm.jceplus.junit.tests.TestArguments#getEnabledProviders") +public class TestSHA3_224KAT extends BaseTestMessageDigest { + + @Parameter(0) + TestProvider provider; final String[][] tests = {{ "31c82d71785b7ca6b651cb6c8c9ad5e2aceb0b0633c088d33aa247ada7a594ff4936c023251319820a9b19fc6c48de8a6f7ada214176ccdaadaeef51ed43714ac0c8269bbd497e46e78bb5e58196494b2471b1680e2d4c6dbd249831bd83a4d3be06c8a2e903933974aa05ee748bfe6ef359f7a143edf0d4918da916bd6f15e26a790cff514b40a5da7f72e1ed2fe63a05b8149587bea05653718cc8980eadbfeca85b7c9c286dd040936585938be7f98219700c83a9443c2856a80ff46852b26d1b1edf72a30203cf6c44a10fa6eaf1920173cedfb5c4cf3ac665b37a86ed02155bbbf17dc2e786af9478fe0889d86c5bfa85a242eb0854b1482b7bd16f67f80bef9c7a628f05a107936a64273a97b0088b0e515451f916b5656230a12ba6dc78", @@ -495,8 +510,9 @@ public class BaseTestSHA3_224KAT extends BaseTestMessageDigest { {"e65de91fdcb7606f14dbcfc94c9c94a57240a6b2c31ed410346c4dc011526559e44296fc988cc589de2dc713d0e82492d4991bd8c4c5e6c74c753fc09345225e1db8d565f0ce26f5f5d9f404a28cf00bd655a5fe04edb682942d675b86235f235965ad422ba5081a21865b8209ae81763e1c4c0cccbccdaad539cf773413a50f5ff1267b9238f5602adc06764f775d3c", "26ec9df54d9afe11710772bfbeccc83d9d0439d3530777c81b8ae6a3"}}; - @BeforeAll - public void setUp() { + @BeforeEach + public void setUp() throws Exception { + setAndInsertProvider(provider); setAlgorithm("SHA3-224"); } diff --git a/src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_256KAT.java b/src/test/java/ibm/jceplus/junit/tests/TestSHA3_256KAT.java similarity index 99% rename from src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_256KAT.java rename to src/test/java/ibm/jceplus/junit/tests/TestSHA3_256KAT.java index 7c845e5dc..44cba3a59 100644 --- a/src/test/java/ibm/jceplus/junit/base/BaseTestSHA3_256KAT.java +++ b/src/test/java/ibm/jceplus/junit/tests/TestSHA3_256KAT.java @@ -1,20 +1,35 @@ /* - * 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.security.MessageDigest; import java.util.Arrays; -import org.junit.jupiter.api.BeforeAll; +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 BaseTestSHA3_256KAT extends BaseTestMessageDigest { +@Tag(Tags.OPENJCEPLUS_NAME) +@Tag(Tags.OPENJCEPLUS_FIPS_NAME) +@Tag(Tags.OPENJCEPLUS_MULTITHREAD_NAME) +@Tag(Tags.OPENJCEPLUS_FIPS_MULTITHREAD_NAME) +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@ParameterizedClass +@MethodSource("ibm.jceplus.junit.tests.TestArguments#getEnabledProviders") +public class TestSHA3_256KAT extends BaseTestMessageDigest { + + @Parameter(0) + TestProvider provider; final String[][] tests = {{ "b1caa396771a09a1db9bc20543e988e359d47c2a616417bbca1b62cb02796a888fc6eeff5c0b5c3d5062fcb4256f6ae1782f492c1cf03610b4a1fb7b814c057878e1190b9835425c7a4a0e182ad1f91535ed2a35033a5d8c670e21c575ff43c194a58a82d4a1a44881dd61f9f8161fc6b998860cbe4975780be93b6f87980bad0a99aa2cb7556b478ca35d1f3746c33e2bb7c47af426641cc7bbb3425e2144820345e1d0ea5b7da2c3236a52906acdc3b4d34e474dd714c0c40bf006a3a1d889a632983814bbc4a14fe5f159aa89249e7c738b3b73666bac2a615a83fd21ae0a1ce7352ade7b278b587158fd2fabb217aa1fe31d0bda53272045598015a8ae4d8cec226fefa58daa05500906c4d85e7567", @@ -483,8 +498,9 @@ public class BaseTestSHA3_256KAT extends BaseTestMessageDigest { {"56ea14d7fcb0db748ff649aaa5d0afdc2357528a9aad6076d73b2805b53d89e73681abfad26bee6c0f3d20215295f354f538ae80990d2281be6de0f6919aa9eb048c26b524f4d91ca87b54c0c54aa9b54ad02171e8bf31e8d158a9f586e92ffce994ecce9a5185cc80364d50a6f7b94849a914242fcb73f33a86ecc83c3403630d20650ddb8cd9c4", "4beae3515ba35ec8cbd1d94567e22b0d7809c466abfbafe9610349597ba15b45"}}; - @BeforeAll - public void setUp() { + @BeforeEach + public void setUp() throws Exception { + setAndInsertProvider(provider); setAlgorithm("SHA3-256"); }