Implement Twist, Invalid, Cofactor and Degenerate standalone suites. (#7)

* add empty StandaloneTwistSuite

* implemented StandaloneTwistSuite

* add expectError method to KeyAgreementTest and KeyGeneratorTest

* utilize new expectError methods, general cleanup of StandaloneTwistSuite

* changed KeyAgreement to ECDH in the description

* Add StandaloneCofactorSuite class.

* Implement StandaloneCofactorSuite.

* Add StandaloneDegenerateSuite.

* Add StandaloneInvalidSuite.

* Implement StandaloneInvalidSuite.

* Implement StandaloneDegenerateSuite.

* Small cosmetic change to some constructors.

* More small cosmetic changes.

Co-authored-by: davidhofman <davidhofman@github.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java b/src/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
index bfd39fc..fd48212 100644
--- a/src/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
+++ b/src/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
@@ -37,6 +37,16 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
         });
     }
 
+    public static KeyAgreementTest expectError(KeyAgreementTestable ka, Result.ExpectedValue expected) {
+        return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() {
+            @Override
+            public Result apply(KeyAgreementTestable keyAgreementTestable) {
+                Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), false);
+                return new Result(value, value.description());
+            }
+        });
+    }
+
     public static KeyAgreementTest function(KeyAgreementTestable ka, TestCallback<KeyAgreementTestable> callback) {
         return new KeyAgreementTest(ka, callback);
     }
diff --git a/src/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java b/src/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
index b232456..32f82cb 100644
--- a/src/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
+++ b/src/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
@@ -22,6 +22,16 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> {
         });
     }
 
+    public static KeyGeneratorTest expectError(KeyGeneratorTestable kg, Result.ExpectedValue expected) {
+        return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() {
+            @Override
+            public Result apply(KeyGeneratorTestable keyGenerationTestable) {
+                Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), false);
+                return new Result(value, value.description());
+            }
+        });
+    }
+
     public static KeyGeneratorTest function(KeyGeneratorTestable ka, TestCallback<KeyGeneratorTestable> callback) {
         return new KeyGeneratorTest(ka, callback);
     }