Implement better result of "Notary.assure"

[gigi.git] / tests / org / cacert / gigi / util / TestNotary.java

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 750fd9384cb892085c9aa352b80719ad1423430a..7b1f5a133db93d47528fa41fca6816ae3267cbab 100644 (file)
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -4,6 +4,7 @@ import java.sql.SQLException;
 
 import org.cacert.gigi.User;
 import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.util.Notary.AssuranceResult;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -24,16 +25,17 @@ public class TestNotary extends ManagedTest {
                                35, 35, 35};
 
                System.out.println(result.length);
-               assertFalse(Notary.assure(assurer, users[0], -1, "test-notary",
-                               "2014-01-01"));
+               assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
+                               assurer, users[0], -1, "test-notary", "2014-01-01"));
                for (int i = 0; i < result.length; i++) {
                        assertEquals(result[i], assurer.getMaxAssurePoints());
-                       assertFalse(Notary.assure(assurer, users[i], result[i] + 1,
-                                       "test-notary", "2014-01-01"));
-                       assertTrue(Notary.assure(assurer, users[i], result[i],
-                                       "test-notary", "2014-01-01"));
-                       assertFalse(Notary.assure(assurer, users[i], result[i],
-                                       "test-notary", "2014-01-01"));
+                       assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
+                                       assurer, users[i], result[i] + 1, "test-notary",
+                                       "2014-01-01"));
+                       assertEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
+                                       assurer, users[i], result[i], "test-notary", "2014-01-01"));
+                       assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(
+                                       assurer, users[i], result[i], "test-notary", "2014-01-01"));
                }
 
                assertEquals(35, assurer.getMaxAssurePoints());