X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FTestUser.java;h=dfd9fc3eac8afa8a24f95f1783a182729c59b41a;hb=feadaca27fca9d518b7436299e23da523eb15d4b;hp=7ad3f49df4f3799ca6c769584f617dd8f0a139d9;hpb=08c941629aea14473e5c42ab6f5d590be4af4bf8;p=gigi.git diff --git a/tests/club/wpia/gigi/TestUser.java b/tests/club/wpia/gigi/TestUser.java index 7ad3f49d..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.Verification; -import club.wpia.gigi.dbObjects.Verification.VerificationType; 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); @@ -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")); @@ -123,8 +120,6 @@ 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); Verification[] ma = u.getMadeVerifications(); Verification[] ma2 = u.getMadeVerifications();