X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestUser.java;h=a3dfb777b3c5b2c336b41f20ac754579355ee072;hp=1124179ac4bc3998a997d0e7d14a7e2fa982beff;hb=c0d62ad52b65d78806431b34ed2ae24bf58c1ada;hpb=6c10d13f4178ee1c2be2e669371f0e885661c859 diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index 1124179a..a3dfb777 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; @@ -13,6 +12,7 @@ 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.util.DayDate; import org.junit.Test; public class TestUser extends ManagedTest { @@ -21,7 +21,7 @@ public class TestUser extends ManagedTest { 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()); @@ -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();