diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-05 18:09:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-05 18:09:17 +0000 |
commit | a677775743d19f3b8f08212bcb439d6b0704fcd2 (patch) | |
tree | 9b6be45dad86a9557ffed89a2f8d03a988f152da | |
parent | 927070677af6b27ad5e9507bea028b7827c58011 (diff) | |
parent | 8a9652c1ef0baff8aff34835c85506d5e1717fc9 (diff) | |
download | bouncycastle-a677775743d19f3b8f08212bcb439d6b0704fcd2.tar.gz |
Merge "Parameterize ECAlgorithmsTest" into main am: 8a9652c1ef
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/2735630
Change-Id: Ibd2984b62cf565ea4554c51e29986074591c1dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 111 insertions, 27 deletions
diff --git a/bcprov/src/test/java/org/bouncycastle/math/ec/test/AllTests.java b/bcprov/src/test/java/org/bouncycastle/math/ec/test/AllTests.java index 4b8ffdee..7d5751c7 100644 --- a/bcprov/src/test/java/org/bouncycastle/math/ec/test/AllTests.java +++ b/bcprov/src/test/java/org/bouncycastle/math/ec/test/AllTests.java @@ -24,7 +24,8 @@ public class AllTests { TestSuite suite = new TestSuite("EC Math tests"); - suite.addTestSuite(ECAlgorithmsTest.class); + // Android-changed: parameterized the test. + // suite.addTestSuite(ECAlgorithmsTest.class); suite.addTestSuite(ECPointTest.class); suite.addTestSuite(FixedPointTest.class); diff --git a/bcprov/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java b/bcprov/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java index 27e89f00..0c43b5a1 100644 --- a/bcprov/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java +++ b/bcprov/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java @@ -1,5 +1,8 @@ package org.bouncycastle.math.ec.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.math.BigInteger; import java.security.SecureRandom; import java.util.ArrayList; @@ -14,18 +17,49 @@ import org.bouncycastle.crypto.ec.CustomNamedCurves; import org.bouncycastle.math.ec.ECAlgorithms; import org.bouncycastle.math.ec.ECCurve; import org.bouncycastle.math.ec.ECPoint; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import android.platform.test.annotations.LargeTest; - -public class ECAlgorithmsTest extends TestCase +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +// Android-changed: parameterized the test. +@RunWith(Parameterized.class) +public class ECAlgorithmsTest { private static final int SCALE = 4; private static final SecureRandom RND = new SecureRandom(); + + // BEGIN Android-added: parameterized the test. + @Parameterized.Parameters(name = "{0}") + public static String[] getAllX9ECParameters() { + Set<String> names = new HashSet<>(AllTests.enumToList(ECNamedCurveTable.getNames())); + names.addAll(AllTests.enumToList(CustomNamedCurves.getNames())); + return names.toArray(new String[0]); + } + + @Parameterized.Parameter(0) + public String name; + + private ArrayList getX9s(String name) { + ArrayList<X9ECParameters> x9s = new ArrayList<>(); + + X9ECParameters x9 = ECNamedCurveTable.getByName(name); + if (x9 != null) + { + addTestCurves(x9s, x9); + } + + x9 = CustomNamedCurves.getByName(name); + if (x9 != null) + { + addTestCurves(x9s, x9); + } + return x9s; + } + // END Android-added: parameterized the test. + + @Ignore("secp256r1 is covered by testSumOfMultipliesComplete") public void testSumOfMultiplies() { X9ECParameters x9 = CustomNamedCurves.getByName("secp256r1"); @@ -34,10 +68,12 @@ public class ECAlgorithmsTest extends TestCase } // TODO Ideally, mark this test not to run by default - @LargeTest + @Test public void testSumOfMultipliesComplete() { - ArrayList x9s = getTestCurves(); + // Android-changed: parameterized the test. + // ArrayList x9s = getTestCurves(); + ArrayList<X9ECParameters> x9s = getX9s(name); Iterator it = x9s.iterator(); while (it.hasNext()) { @@ -46,6 +82,7 @@ public class ECAlgorithmsTest extends TestCase } } + @Ignore("secp256r1 is covered by testSumOfTwoMultipliesComplete") public void testSumOfTwoMultiplies() { X9ECParameters x9 = CustomNamedCurves.getByName("secp256r1"); @@ -54,10 +91,12 @@ public class ECAlgorithmsTest extends TestCase } // TODO Ideally, mark this test not to run by default - @LargeTest + @Test public void testSumOfTwoMultipliesComplete() { - ArrayList x9s = getTestCurves(); + // Android-changed: parameterized the test. + // ArrayList x9s = getTestCurves(); + ArrayList<X9ECParameters> x9s = getX9s(name); Iterator it = x9s.iterator(); while (it.hasNext()) { @@ -190,9 +229,11 @@ public class ECAlgorithmsTest extends TestCase } } + // Android-changed: Use JUnit4. + /* public static Test suite() { return new TestSuite(ECAlgorithmsTest.class); } - + */ } diff --git a/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/AllTests.java b/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/AllTests.java index 9ee6c7f7..95dfdc82 100644 --- a/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/AllTests.java +++ b/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/AllTests.java @@ -28,7 +28,8 @@ public class AllTests { TestSuite suite = new TestSuite("EC Math tests"); - suite.addTestSuite(ECAlgorithmsTest.class); + // Android-changed: parameterized the test. + // suite.addTestSuite(ECAlgorithmsTest.class); suite.addTestSuite(ECPointTest.class); suite.addTestSuite(FixedPointTest.class); diff --git a/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java b/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java index ba944d77..63f9221c 100644 --- a/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java +++ b/repackaged/bcprov/src/test/java/com/android/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java @@ -1,6 +1,9 @@ /* GENERATED SOURCE. DO NOT MODIFY. */ package com.android.org.bouncycastle.math.ec.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.math.BigInteger; import java.security.SecureRandom; import java.util.ArrayList; @@ -15,21 +18,52 @@ import com.android.org.bouncycastle.crypto.ec.CustomNamedCurves; import com.android.org.bouncycastle.math.ec.ECAlgorithms; import com.android.org.bouncycastle.math.ec.ECCurve; import com.android.org.bouncycastle.math.ec.ECPoint; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import android.platform.test.annotations.LargeTest; - +// Android-changed: parameterized the test. /** * @hide This class is not part of the Android public SDK API */ -public class ECAlgorithmsTest extends TestCase +@RunWith(Parameterized.class) +public class ECAlgorithmsTest { private static final int SCALE = 4; private static final SecureRandom RND = new SecureRandom(); + + // BEGIN Android-added: parameterized the test. + @Parameterized.Parameters(name = "{0}") + public static String[] getAllX9ECParameters() { + Set<String> names = new HashSet<>(AllTests.enumToList(ECNamedCurveTable.getNames())); + names.addAll(AllTests.enumToList(CustomNamedCurves.getNames())); + return names.toArray(new String[0]); + } + + @Parameterized.Parameter(0) + public String name; + + private ArrayList getX9s(String name) { + ArrayList<X9ECParameters> x9s = new ArrayList<>(); + + X9ECParameters x9 = ECNamedCurveTable.getByName(name); + if (x9 != null) + { + addTestCurves(x9s, x9); + } + + x9 = CustomNamedCurves.getByName(name); + if (x9 != null) + { + addTestCurves(x9s, x9); + } + return x9s; + } + // END Android-added: parameterized the test. + + @Ignore("secp256r1 is covered by testSumOfMultipliesComplete") public void testSumOfMultiplies() { X9ECParameters x9 = CustomNamedCurves.getByName("secp256r1"); @@ -38,10 +72,12 @@ public class ECAlgorithmsTest extends TestCase } // TODO Ideally, mark this test not to run by default - @LargeTest + @Test public void testSumOfMultipliesComplete() { - ArrayList x9s = getTestCurves(); + // Android-changed: parameterized the test. + // ArrayList x9s = getTestCurves(); + ArrayList<X9ECParameters> x9s = getX9s(name); Iterator it = x9s.iterator(); while (it.hasNext()) { @@ -50,6 +86,7 @@ public class ECAlgorithmsTest extends TestCase } } + @Ignore("secp256r1 is covered by testSumOfTwoMultipliesComplete") public void testSumOfTwoMultiplies() { X9ECParameters x9 = CustomNamedCurves.getByName("secp256r1"); @@ -58,10 +95,12 @@ public class ECAlgorithmsTest extends TestCase } // TODO Ideally, mark this test not to run by default - @LargeTest + @Test public void testSumOfTwoMultipliesComplete() { - ArrayList x9s = getTestCurves(); + // Android-changed: parameterized the test. + // ArrayList x9s = getTestCurves(); + ArrayList<X9ECParameters> x9s = getX9s(name); Iterator it = x9s.iterator(); while (it.hasNext()) { @@ -194,9 +233,11 @@ public class ECAlgorithmsTest extends TestCase } } + // Android-changed: Use JUnit4. + /* public static Test suite() { return new TestSuite(ECAlgorithmsTest.class); } - + */ } |