Use test sampling with SNOVA

Author: peterdettman

core/src/test/java/org/bouncycastle/pqc/crypto/test/MayoTest.java

@@ -46,10 +46,10 @@ public void testTestVectors()
         throws Exception
     {
         long start = System.currentTimeMillis();
-        TestUtils.testTestVector(true, false, "pqc/crypto/mayo", files, new TestUtils.KeyGenerationOperation()
+        TestUtils.testTestVector(false, true, false, "pqc/crypto/mayo", files, new TestUtils.KeyGenerationOperation()
         {
             @Override
-            public SecureRandom getSecureRanom(byte[] seed)
+            public SecureRandom getSecureRandom(byte[] seed)
             {
                 return new NISTSecureRandom(seed, null);
             }

core/src/test/java/org/bouncycastle/pqc/crypto/test/SnovaTest.java

@@ -126,10 +126,10 @@ public void testTestVectors()
         throws Exception
     {
         long start = System.currentTimeMillis();
-        TestUtils.testTestVector(true, false, "pqc/crypto/snova", files, new TestUtils.KeyGenerationOperation()
+        TestUtils.testTestVector(true, true, false, "pqc/crypto/snova", files, new TestUtils.KeyGenerationOperation()
         {
             @Override
-            public SecureRandom getSecureRanom(byte[] seed)
+            public SecureRandom getSecureRandom(byte[] seed)
             {
                 return new NISTSecureRandom(seed, null);
             }

core/src/test/java/org/bouncycastle/pqc/crypto/test/TestUtils.java

@@ -32,7 +32,7 @@ static boolean parseBoolean(String value)
 
     public interface KeyGenerationOperation
     {
-        SecureRandom getSecureRanom(byte[] seed);
+        SecureRandom getSecureRandom(byte[] seed);
 
         AsymmetricCipherKeyPairGenerator getAsymmetricCipherKeyPairGenerator(int fileIndex, SecureRandom random);
 
@@ -45,17 +45,19 @@ public interface KeyGenerationOperation
         MessageSigner getMessageSigner();
     }
 
-    public static void testTestVector(boolean enableFactory, boolean isSigner, String homeDir, String[] files, KeyGenerationOperation operation)
+    public static void testTestVector(boolean sampleOnly, boolean enableFactory, boolean isSigner, String homeDir, String[] files, KeyGenerationOperation operation)
         throws Exception
     {
         for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
         {
             String name = files[fileIndex];
+
             InputStream src = TestResourceFinder.findTestResource(homeDir, name);
             BufferedReader bin = new BufferedReader(new InputStreamReader(src));
-            //System.out.println(files[fileIndex]);
+
             String line;
             HashMap<String, String> buf = new HashMap<String, String>();
+            TestSampler sampler = sampleOnly ? new TestSampler() : null;
             while ((line = bin.readLine()) != null)
             {
                 line = line.trim();
@@ -68,18 +70,19 @@ public static void testTestVector(boolean enableFactory, boolean isSigner, Strin
                 {
                     if (buf.size() > 0)
                     {
-                        int count = Integer.parseInt(buf.get("count"));
-//                        if (count == 99)
-//                        {
-//                            System.out.println("break");
-//                        }
+                        String count = (String)buf.get("count");
+                        if (sampler != null && sampler.skipTest(count))
+                        {
+                            continue;
+                        }
+
                         byte[] seed = Hex.decode((String)buf.get("seed"));
                         byte[] pk = Hex.decode((String)buf.get("pk"));
                         byte[] sk = Hex.decode((String)buf.get("sk"));
                         byte[] message = Hex.decode((String)buf.get("msg"));
                         byte[] signature = Hex.decode((String)buf.get("sm"));
 
-                        SecureRandom random = operation.getSecureRanom(seed);
+                        SecureRandom random = operation.getSecureRandom(seed);
 
                         AsymmetricCipherKeyPairGenerator kpGen = operation.getAsymmetricCipherKeyPairGenerator(fileIndex, random);