X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FTestUser.java;h=dfd9fc3eac8afa8a24f95f1783a182729c59b41a;hb=411186b81b18da08eb9139a3239ab9d1e8892991;hp=8f5dbd33ca31297f2db18ae5212ad8ccc9e6209e;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git

diff --git a/tests/club/wpia/gigi/TestUser.java b/tests/club/wpia/gigi/TestUser.java
index 8f5dbd33..dfd9fc3e 100644
--- a/tests/club/wpia/gigi/TestUser.java
+++ b/tests/club/wpia/gigi/TestUser.java
@@ -10,8 +10,6 @@ import java.util.Locale;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
-import club.wpia.gigi.dbObjects.Assurance;
-import club.wpia.gigi.dbObjects.Assurance.AssuranceType;
 import club.wpia.gigi.dbObjects.Country;
 import club.wpia.gigi.dbObjects.Country.CountryCodeType;
 import club.wpia.gigi.dbObjects.Domain;
@@ -20,16 +18,15 @@ import club.wpia.gigi.dbObjects.Name;
 import club.wpia.gigi.dbObjects.NamePart;
 import club.wpia.gigi.dbObjects.NamePart.NamePartType;
 import club.wpia.gigi.dbObjects.User;
+import club.wpia.gigi.dbObjects.Verification;
+import club.wpia.gigi.dbObjects.Verification.VerificationType;
 import club.wpia.gigi.testUtils.BusinessTest;
-import club.wpia.gigi.util.DayDate;
 import club.wpia.gigi.util.Notary;
 
 public class TestUser extends BusinessTest {
 
     @Test
     public void testStoreAndLoad() throws SQLException, GigiApiException {
-        long dob = System.currentTimeMillis();
-        dob -= dob % (1000 * 60 * 60 * 24);
         User u = createUser("f", "l", createUniqueName() + "a@email.org", TEST_PASSWORD);
         int id = u.getId();
         User u2 = User.getById(id);
@@ -50,17 +47,17 @@ public class TestUser extends BusinessTest {
     }
 
     @Test
-    public void testAssurerUtilMethods() throws SQLException, GigiApiException {
-        int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
+    public void testAgentUtilMethods() throws SQLException, GigiApiException {
+        int id = createVerificationUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
         User u = User.getById(id);
-        assertTrue(u.canAssure());
-        int assurancePoints = u.getAssurancePoints();
+        assertTrue(u.canVerify());
+        int verificationPoints = u.getVerificationPoints();
         int expPoints = u.getExperiencePoints();
-        assertEquals(100, assurancePoints);
+        assertEquals(100, verificationPoints);
         assertEquals(User.EXPERIENCE_POINTS, expPoints);
         assertTrue(u.hasPassedCATS());
-        assertEquals(10, u.getMaxAssurePoints());
+        assertEquals(10, u.getMaxVerifyPoints());
     }
 
     @Test
@@ -90,9 +87,9 @@ public class TestUser extends BusinessTest {
         User u = User.getById(id);
 
         new EmailAddress(u, uq + "b@email.org", Locale.ENGLISH);
-        getMailReceiver().receive().verify();
+        getMailReceiver().receive(uq + "b@email.org").verify();
         new EmailAddress(u, uq + "c@email.org", Locale.ENGLISH);
-        getMailReceiver().receive();// no-verify
+        getMailReceiver().receive(uq + "c@email.org");// no-verify
         assertEquals(3, u.getEmails().length);
 
         assertTrue(u.isValidEmail(uq + "a@email.org"));
@@ -111,8 +108,8 @@ public class TestUser extends BusinessTest {
 
         User[] us = new User[5];
         for (int i = 0; i < us.length; i++) {
-            us[i] = User.getById(createAssuranceUser("f", "l", createUniqueName() + "@email.com", TEST_PASSWORD));
-            Notary.assure(us[i], u, u.getPreferredName(), u.getDoB(), 10, "here", validVerificationDateString(), AssuranceType.FACE_TO_FACE, Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS));
+            us[i] = User.getById(createVerificationUser("f", "l", createUniqueName() + "@email.com", TEST_PASSWORD));
+            Notary.verify(us[i], u, u.getPreferredName(), u.getDoB(), 10, "here", validVerificationDateString(), VerificationType.FACE_TO_FACE, Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS));
         }
 
         assertTrue(u.isValidName("aä b"));
@@ -123,13 +120,11 @@ public class TestUser extends BusinessTest {
 
     @Test
     public void testDoubleInsert() throws GigiApiException {
-        long d = System.currentTimeMillis();
-        d -= d % DayDate.MILLI_DAY;
         User u = createUser("f", "l", createUniqueName() + "@example.org", TEST_PASSWORD);
-        Assurance[] ma = u.getMadeAssurances();
-        Assurance[] ma2 = u.getMadeAssurances();
-        Assurance[] ra = u.getReceivedAssurances();
-        Assurance[] ra2 = u.getReceivedAssurances();
+        Verification[] ma = u.getMadeVerifications();
+        Verification[] ma2 = u.getMadeVerifications();
+        Verification[] ra = u.getReceivedVerifications();
+        Verification[] ra2 = u.getReceivedVerifications();
         assertEquals(0, u.getCertificates(false).length);
         assertEquals(0, ma.length);
         assertEquals(0, ma2.length);