X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestUser.java;h=1a26f539f3c286edaf05d592b2c364e01cc63446;hb=53d9194f480a4351e6b80551fc2aa537e7d5b039;hp=e276fddf68a57c6b3f8efa1c484c01d4e92b690d;hpb=efb1a90c9fd0e4529731693faa1f0fb1f8039049;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index e276fddf..1a26f539 100644
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -3,7 +3,6 @@ package org.cacert.gigi;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
-import java.sql.Date;
 import java.sql.SQLException;
 import java.util.Locale;
 
@@ -12,16 +11,17 @@ import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.testUtils.BusinessTest;
+import org.cacert.gigi.util.DayDate;
 import org.junit.Test;
 
-public class TestUser extends ManagedTest {
+public class TestUser extends BusinessTest {
 
     @Test
     public void testStoreAndLoad() throws SQLException, GigiApiException {
         long dob = System.currentTimeMillis();
         dob -= dob % (1000 * 60 * 60 * 24);
-        User u = new User(createUniqueName() + "a@email.org", "password", new Name("user", "last", "", ""), new java.sql.Date(dob), Locale.ENGLISH);
+        User u = new User(createUniqueName() + "a@email.org", "password", new Name("user", "last", "", ""), new DayDate(dob), Locale.ENGLISH);
         int id = u.getId();
         User u2 = User.getById(id);
         assertEquals(u.getName(), u2.getName());
@@ -30,7 +30,7 @@ public class TestUser extends ManagedTest {
     }
 
     @Test
-    public void testWebStoreAndLoad() throws SQLException {
+    public void testWebStoreAndLoad() throws SQLException, GigiApiException {
         int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
         Name u = User.getById(id).getName();
@@ -41,7 +41,7 @@ public class TestUser extends ManagedTest {
     }
 
     @Test
-    public void testAssurerUtilMethods() throws SQLException {
+    public void testAssurerUtilMethods() throws SQLException, GigiApiException {
         int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
         User u = User.getById(id);
@@ -65,12 +65,12 @@ public class TestUser extends ManagedTest {
 
         User u = User.getById(id);
         new EmailAddress(u, uq + "b@email.org", Locale.ENGLISH);
-        getMailReciever().receive().verify();
+        getMailReceiver().receive().verify();
         new EmailAddress(u, uq + "c@email.org", Locale.ENGLISH);
-        getMailReciever().receive();// no-verify
-        verify(new Domain(u, uq + "a-testdomain.org"));
-        verify(new Domain(u, uq + "b-testdomain.org"));
-        verify(new Domain(u, uq + "c-testdomain.org"));
+        getMailReceiver().receive();// no-verify
+        verify(new Domain(u, u, uq + "a-testdomain.org"));
+        verify(new Domain(u, u, uq + "b-testdomain.org"));
+        verify(new Domain(u, u, uq + "c-testdomain.org"));
         assertEquals(3, u.getEmails().length);
         assertEquals(3, u.getDomains().length);
         assertTrue(u.isValidDomain(uq + "a-testdomain.org"));
@@ -95,7 +95,9 @@ public class TestUser extends ManagedTest {
 
     @Test
     public void testDoubleInsert() throws GigiApiException {
-        User u = new User(createUniqueName() + "@example.org", TEST_PASSWORD, new Name("f", "k", "m", "s"), new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365), Locale.ENGLISH);
+        long d = System.currentTimeMillis();
+        d -= d % DayDate.MILLI_DAY;
+        User u = new User(createUniqueName() + "@example.org", TEST_PASSWORD, new Name("f", "k", "m", "s"), new DayDate(d + 1000L * 60 * 60 * 24 * 365), Locale.ENGLISH);
         Assurance[] ma = u.getMadeAssurances();
         Assurance[] ma2 = u.getMadeAssurances();
         Assurance[] ra = u.getReceivedAssurances();
@@ -110,7 +112,7 @@ public class TestUser extends ManagedTest {
     }
 
     @Test
-    public void testGetByMail() {
+    public void testGetByMail() throws GigiApiException {
         String email = createUniqueName() + "a@email.org";
         int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD);
         User emailUser = User.getByEmail(email);
@@ -119,9 +121,9 @@ public class TestUser extends ManagedTest {
     }
 
     @Test
-    public void testNoCats() {
+    public void testNoCats() throws GigiApiException {
         String email = createUniqueName() + "a@email.org";
-        int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD);
+        createVerifiedUser("aä", "b", email, TEST_PASSWORD);
         User emailUser = User.getByEmail(email);
         assertFalse(emailUser.hasPassedCATS());
     }