Update EdDSA tests

Author: peterdettman

core/src/test/java/org/bouncycastle/crypto/test/Ed25519Test.java

@@ -34,6 +34,8 @@ public static void main(String[] args)
 
     public void performTest() throws Exception
     {
+        basicSigTest();
+
         for (int i = 0; i < 10; ++i)
         {
             testConsistency(Ed25519.Algorithm.Ed25519, null);
@@ -43,7 +45,6 @@ public void performTest() throws Exception
             testConsistency(Ed25519.Algorithm.Ed25519ph, context);
         }
 
-        basicSigTest();
         testRegressionInfiniteLoop();
     }
 
@@ -837,9 +838,9 @@ private void testRegressionInfiniteLoop() throws Exception
 
             signer.init(false, pub);
             signer.update(msg, 0, msg.length);
-            if (!signer.verifySignature(sig)) {
-                fail("signature verification failed for test vector: " + error);
-            }
+            boolean shouldVerify = signer.verifySignature(sig);
+
+            isTrue("signature verification failed for test vector: " + error, shouldVerify);
         }
     }
 }

core/src/test/java/org/bouncycastle/crypto/test/Ed448Test.java

@@ -41,6 +41,8 @@ public void performTest() throws Exception
             testConsistency(Ed448.Algorithm.Ed448, context);
             testConsistency(Ed448.Algorithm.Ed448ph, context);
         }
+
+        testRegressionInfiniteLoop();
     }
 
     private void basicSigTest()
@@ -1234,9 +1236,9 @@ private void testRegressionInfiniteLoop() throws Exception
 
             signer.init(false, pub);
             signer.update(msg, 0, msg.length);
-            if (!signer.verifySignature(sig)) {
-                fail("signature verification failed for test vector: " + error);
-            }
+            boolean shouldVerify = signer.verifySignature(sig);
+
+            isTrue("signature verification failed for test vector: " + error, shouldVerify);
         }
     }
 }