X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Futil%2FTestNotary.java;h=fd3e62ef6e073855fcf2353c4a18aabd93ad952c;hb=6d1b746247f6e1eab7d1da17112beb9cf5abb089;hp=d9f190e096a5adca0ed539673b331b817bb14548;hpb=74c125fe66c7942aaaff89e26a7da2f032fc7203;p=gigi.git

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index d9f190e0..fd3e62ef 100644
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -2,29 +2,28 @@ package org.cacert.gigi.util;
 
 import static org.junit.Assert.*;
 
-import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Date;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
+import org.cacert.gigi.dbObjects.Country;
+import org.cacert.gigi.dbObjects.Country.CountryCodeType;
+import org.cacert.gigi.dbObjects.ObjectCache;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.testUtils.BusinessTest;
 import org.junit.Test;
 
-public class TestNotary extends ManagedTest {
+public class TestNotary extends BusinessTest {
+
+    public final Country DE = Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS);
+
+    public TestNotary() throws GigiApiException {}
 
-    // These tests create a lot of users and therefore require resetting of the
-    // registering-rate-limit.
     @Test
     public void testNormalAssurance() throws SQLException, GigiApiException {
-        try {
-            clearCaches();
-        } catch (IOException e) {
-            throw new Error(e);
-        }
         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);
@@ -36,7 +35,7 @@ public class TestNotary extends ManagedTest {
         };
 
         try {
-            Notary.assure(assurer, users[0], users[0].getName(), users[0].getDoB(), -1, "test-notary", "2014-01-01", AssuranceType.FACE_TO_FACE);
+            Notary.assure(assurer, users[0], users[0].getPreferredName(), users[0].getDoB(), -1, "test-notary", validVerificationDateString(), AssuranceType.FACE_TO_FACE, DE);
             fail("This shouldn't have passed");
         } catch (GigiApiException e) {
             // expected
@@ -44,20 +43,20 @@ public class TestNotary extends ManagedTest {
         for (int i = 0; i < result.length; i++) {
             assertEquals(result[i], assurer.getMaxAssurePoints());
 
-            assuranceFail(assurer, users[i], result[i] + 1, "test-notary", "2014-01-01");
-            Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), result[i], "test-notary", "2014-01-01", AssuranceType.FACE_TO_FACE);
-            assuranceFail(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, DE);
+            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.getName(), user.getDoB(), i, location, date, AssuranceType.FACE_TO_FACE);
+            Notary.assure(assurer, user, user.getPreferredName(), user.getDoB(), i, location, date, AssuranceType.FACE_TO_FACE, DE);
             fail("This shouldn't have passed");
         } catch (GigiApiException e) {
             // expected
@@ -66,11 +65,6 @@ public class TestNotary extends ManagedTest {
 
     @Test
     public void testPoJam() throws SQLException, GigiApiException {
-        try {
-            clearCaches();
-        } catch (IOException e) {
-            throw new Error(e);
-        }
         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);
@@ -81,12 +75,15 @@ public class TestNotary extends ManagedTest {
             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++) {
-            assuranceFail(assurer, users[i], -1, "test-notary", "2014-01-01");
-            assuranceFail(assurer, users[i], 11, "test-notary", "2014-01-01");
-            Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), 10, "test-notary", "2014-01-01", AssuranceType.FACE_TO_FACE);
-            assuranceFail(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, DE);
+            }
+            assuranceFail(assurer, users[i], 10, "test-notary", validVerificationDateString());
         }
     }
 
@@ -102,28 +99,28 @@ public class TestNotary extends ManagedTest {
         // null date
         assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", null);
         // null location
-        assuranceFail(assuranceUser, assuree, 10, null, "2014-01-01");
+        assuranceFail(assuranceUser, assuree, 10, null, validVerificationDateString());
         // empty location
-        assuranceFail(assuranceUser, assuree, 10, "", "2014-01-01");
+        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", "2014-01-01");
+        assuranceFail(assuranceUser, assuree, 10, "n", validVerificationDateString());
         // points too low
-        assuranceFail(assuranceUser, assuree, -1, "notary-junit-test", "2014-01-01");
+        assuranceFail(assuranceUser, assuree, -1, "notary-junit-test", validVerificationDateString());
         // points too high
-        assuranceFail(assuranceUser, assuree, 11, "notary-junit-test", "2014-01-01");
+        assuranceFail(assuranceUser, assuree, 11, "notary-junit-test", validVerificationDateString());
 
-        // assure oneself
-        assuranceFail(assuranceUser, assuranceUser, 10, "notary-junit-test", "2014-01-01");
+        // verify oneself
+        assuranceFail(assuranceUser, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
         // not an assurer
-        assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", "2014-01-01");
+        assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
 
         // valid
-        Notary.assure(assuranceUser, assuree, assuree.getName(), assuree.getDoB(), 10, "notary-junit-test", "2014-01-01", AssuranceType.FACE_TO_FACE);
+        Notary.assure(assuranceUser, assuree, assuree.getPreferredName(), assuree.getDoB(), 10, "notary-junit-test", validVerificationDateString(), AssuranceType.FACE_TO_FACE, DE);
 
-        // assure double
-        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "2014-01-01");
+        // verify double
+        assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", validVerificationDateString());
 
     }
 }