5 files changed, 9 insertions, 9 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
index 9a4a39a..fd48212 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java
@@ -15,7 +15,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
     }
 
     public static KeyAgreementTest match(KeyAgreementTestable ka, byte[] expectedSecret) {
-        return new KeyAgreementTest(ka, new TestCallback<>() {
+        return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() {
             @Override
             public Result apply(KeyAgreementTestable ka) {
                 if (Arrays.equals(ka.getSecret(), expectedSecret)) {
@@ -28,7 +28,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
     }
 
     public static KeyAgreementTest expect(KeyAgreementTestable ka, Result.ExpectedValue expected) {
-        return new KeyAgreementTest(ka, new TestCallback<>() {
+        return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() {
             @Override
             public Result apply(KeyAgreementTestable keyAgreementTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), keyAgreementTestable.error());
@@ -38,7 +38,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
     }
 
     public static KeyAgreementTest expectError(KeyAgreementTestable ka, Result.ExpectedValue expected) {
-        return new KeyAgreementTest(ka, new TestCallback<>() {
+        return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() {
             @Override
             public Result apply(KeyAgreementTestable keyAgreementTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), false);
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
index 4ba0647..32f82cb 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java
@@ -13,7 +13,7 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> {
     }
 
     public static KeyGeneratorTest expect(KeyGeneratorTestable kg, Result.ExpectedValue expected) {
-        return new KeyGeneratorTest(kg, new TestCallback<>() {
+        return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() {
             @Override
             public Result apply(KeyGeneratorTestable keyGenerationTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), keyGenerationTestable.error());
@@ -23,7 +23,7 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> {
     }
 
     public static KeyGeneratorTest expectError(KeyGeneratorTestable kg, Result.ExpectedValue expected) {
-        return new KeyGeneratorTest(kg, new TestCallback<>() {
+        return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() {
             @Override
             public Result apply(KeyGeneratorTestable keyGenerationTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), false);
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
index 318715d..258ca12 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
@@ -19,7 +19,7 @@ public class PerformanceTest extends SimpleTest<BaseTestable> {
     private final String desc;
 
     private PerformanceTest(BaseTestable testable, int count, String desc) {
-        super(testable, new TestCallback<>() {
+        super(testable, new TestCallback<BaseTestable>() {
             @Override
             public Result apply(BaseTestable testable) {
                 return new Result(Result.Value.SUCCESS);
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java
index 9c3048a..a817691 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java
@@ -13,7 +13,7 @@ public class SignatureTest extends SimpleTest<SignatureTestable> {
     }
 
     public static SignatureTest expect(SignatureTestable kg, Result.ExpectedValue expected) {
-        return new SignatureTest(kg, new TestCallback<>() {
+        return new SignatureTest(kg, new TestCallback<SignatureTestable>() {
             @Override
             public Result apply(SignatureTestable signatureTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, signatureTestable.ok(), signatureTestable.error());
@@ -23,7 +23,7 @@ public class SignatureTest extends SimpleTest<SignatureTestable> {
     }
 
     public static SignatureTest expectError(SignatureTestable kg, Result.ExpectedValue expected) {
-        return new SignatureTest(kg, new TestCallback<>() {
+        return new SignatureTest(kg, new TestCallback<SignatureTestable>() {
             @Override
             public Result apply(SignatureTestable signatureTestable) {
                 Result.Value value = Result.Value.fromExpected(expected, signatureTestable.ok(), false);
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java
index d4e0841..1900bea 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java
@@ -148,7 +148,7 @@ public class StandaloneEdgeCasesSuite extends StandaloneTestSuite {
             ECPublicKey ecpub = ECUtil.toPublicKey(EC_Store.getInstance().getObject(EC_Key.Public.class, openssl_bug.getOneKey()));
             KeyAgreement ka = kaIdent.getInstance(cfg.selected.getProvider());
             KeyAgreementTestable testable = new KeyAgreementTestable(ka, ecpriv, ecpub);
-            Test ecdh = KeyAgreementTest.function(testable, new TestCallback<>() {
+            Test ecdh = KeyAgreementTest.function(testable, new TestCallback<KeyAgreementTestable>() {
                 @Override
                 public Result apply(KeyAgreementTestable testable) {
                     if (!testable.ok()) {