X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestNotary.java;h=37451573c28c32ea51503f100d7432257b5e4a9d;hb=6fdaa05e2fc9f65211d3c8c5bda894b3c1906d2c;hp=9797a03eea4016a74dd756bac81bd0f7d58abd52;hpb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;p=gigi.git

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 9797a03e..37451573 100644
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -1,61 +1,122 @@
 package org.cacert.gigi.util;
 
-import java.sql.PreparedStatement;
+import static org.junit.Assert.*;
+
 import java.sql.SQLException;
+import java.util.Date;
 
-import org.cacert.gigi.User;
-import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.testUtils.ManagedTest;
-import org.cacert.gigi.util.Notary.AssuranceResult;
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.database.GigiPreparedStatement;
+import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
+import org.cacert.gigi.dbObjects.ObjectCache;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.testUtils.BusinessTest;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
-public class TestNotary extends ManagedTest {
+public class TestNotary extends BusinessTest {
 
+    // These tests create a lot of users and therefore require resetting of the
+    // registering-rate-limit.
     @Test
-    public void testNormalAssurance() throws SQLException {
+    public void testNormalAssurance() throws SQLException, GigiApiException {
         User[] users = new User[30];
         for (int i = 0; i < users.length; i++) {
             int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD);
-            users[i] = new User(id);
+            users[i] = User.getById(id);
         }
-        User assurer = new User(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
+        User assurer = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
         int[] result = new int[] {
                 10, 10, 10, 10, 15, 15, 15, 15, 15, 20, 20, 20, 20, 20, 25, 25, 25, 25, 25, 30, 30, 30, 30, 30, 35, 35, 35, 35, 35, 35
         };
 
-        assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(assurer, users[0], -1, "test-notary", "2014-01-01"));
+        try {
+            Notary.assure(assurer, users[0], users[0].getPreferredName(), users[0].getDoB(), -1, "test-notary", validVerificationDateString(), AssuranceType.FACE_TO_FACE);
+            fail("This shouldn't have passed");
+        } catch (GigiApiException e) {
+            // expected
+        }
         for (int i = 0; i < result.length; i++) {
             assertEquals(result[i], assurer.getMaxAssurePoints());
-            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"));
+
+            assuranceFail(assurer, users[i], result[i] + 1, "test-notary", validVerificationDateString());
+            Notary.assure(assurer, users[i], users[i].getPreferredName(), users[i].getDoB(), result[i], "test-notary", validVerificationDateString(), AssuranceType.FACE_TO_FACE);
+            assuranceFail(assurer, users[i], result[i], "test-notary", validVerificationDateString());
         }
 
         assertEquals(35, assurer.getMaxAssurePoints());
 
-        assertEquals(2 + 60, assurer.getExperiencePoints());
+        assertEquals(User.EXPERIENCE_POINTS + (30 * User.EXPERIENCE_POINTS), assurer.getExperiencePoints());
+
+    }
 
+    private void assuranceFail(User assurer, User user, int i, String location, String date) throws SQLException {
+        try {
+            Notary.assure(assurer, user, user.getPreferredName(), user.getDoB(), i, location, date, AssuranceType.FACE_TO_FACE);
+            fail("This shouldn't have passed");
+        } catch (GigiApiException e) {
+            // expected
+        }
     }
 
     @Test
-    public void testPoJam() throws SQLException {
+    public void testPoJam() throws SQLException, GigiApiException {
         User[] users = new User[30];
         for (int i = 0; i < users.length; i++) {
             int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD);
-            users[i] = new User(id);
+            users[i] = User.getById(id);
         }
         int id = createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD);
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE users SET dob=NOW() WHERE id=?");
-        ps.setInt(1, id);
-        ps.execute();
-        User assurer = new User(id);
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `users` SET dob=NOW() - interval '15 years' WHERE id=?")) {
+            ps.setInt(1, id);
+            ps.execute();
+        }
+        ObjectCache.clearAllCaches(); // reload values from db
+        User assurer = User.getById(id);
         for (int i = 0; i < users.length; i++) {
-            assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(assurer, users[i], -1, "test-notary", "2014-01-01"));
-            assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(assurer, users[i], 11, "test-notary", "2014-01-01"));
-            assertEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(assurer, users[i], 10, "test-notary", "2014-01-01"));
-            assertNotEquals(AssuranceResult.ASSURANCE_SUCCEDED, Notary.assure(assurer, users[i], 10, "test-notary", "2014-01-01"));
+            assuranceFail(assurer, users[i], -1, "test-notary", validVerificationDateString());
+            assuranceFail(assurer, users[i], 11, "test-notary", validVerificationDateString());
+            if (User.POJAM_ENABLED) {
+                Notary.assure(assurer, users[i], users[i].getPreferredName(), users[i].getDoB(), 10, "test-notary", validVerificationDateString(), AssuranceType.FACE_TO_FACE);
+            }
+            assuranceFail(assurer, users[i], 10, "test-notary", validVerificationDateString());
         }
     }
+
+    @Test
+    public void testFail() throws SQLException, GigiApiException {
+        User assuranceUser = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User assuree = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+
+        // invalid date format
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "2014-01-blah");
+        // empty date
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "");
+        // null date
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", null);
+        // null location
+        assuranceFail(assuranceUser, assuree, 10, null, validVerificationDateString());
+        // empty location
+        assuranceFail(assuranceUser, assuree, 10, "", validVerificationDateString());
+        // date in the future
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", DateSelector.getDateFormat().format(new Date(System.currentTimeMillis() + 2 * 24 * 60 * 60 * 1000)));
+        // location too short
+        assuranceFail(assuranceUser, assuree, 10, "n", validVerificationDateString());
+        // points too low
+        assuranceFail(assuranceUser, assuree, -1, "notary-junit-test", validVerificationDateString());
+        // points too high
+        assuranceFail(assuranceUser, assuree, 11, "notary-junit-test", validVerificationDateString());
+
+        // verify oneself
+        assuranceFail(assuranceUser, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
+        // not an assurer
+        assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
+
+        // valid
+        Notary.assure(assuranceUser, assuree, assuree.getPreferredName(), assuree.getDoB(), 10, "notary-junit-test", validVerificationDateString(), AssuranceType.FACE_TO_FACE);
+
+        // verify double
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", validVerificationDateString());
+
+    }
 }