X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestObjectCache.java;h=d2a04595b0c6014d7ad75fd5a3a4ab280b3c2f4c;hp=b1272a0f8c413f902b3745a30d11e5ae8eac20d5;hb=c0d62ad52b65d78806431b34ed2ae24bf58c1ada;hpb=b47144d6f3bf6b6eb1ec477de9d2af38256f074f diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java index b1272a0f..d2a04595 100644 --- a/tests/org/cacert/gigi/TestObjectCache.java +++ b/tests/org/cacert/gigi/TestObjectCache.java @@ -3,7 +3,6 @@ package org.cacert.gigi; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; -import java.sql.Date; import java.sql.SQLException; import java.util.Calendar; 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 TestObjectCache extends ManagedTest { @@ -24,8 +24,9 @@ public class TestObjectCache extends ManagedTest { assertThat(User.getById(uid), is(sameInstance(User.getById(uid)))); Calendar c = Calendar.getInstance(); - c.set(1950, 1, 1); - User u = new User(createUniqueName() + "@example.org", TEST_PASSWORD, new Name("fname", "lname", "mname", "suffix"), new Date(c.getTime().getTime()), Locale.ENGLISH); + c.set(1950, 1, 1, 0, 0, 0); + c.set(Calendar.MILLISECOND, 0); + User u = new User(createUniqueName() + "@example.org", TEST_PASSWORD, new Name("fname", "lname", "mname", "suffix"), new DayDate(c.getTime().getTime()), Locale.ENGLISH); assertThat(u, is(sameInstance(User.getById(u.getId())))); assertThat(User.getById(u.getId()), is(sameInstance(User.getById(u.getId())))); @@ -34,7 +35,8 @@ public class TestObjectCache extends ManagedTest { @Test public void testDomainCache() throws GigiApiException { - Domain d = new Domain(User.getById(uid), "example.org"); + User u = User.getById(uid); + Domain d = new Domain(u, u, "example.org"); assertThat(d, is(sameInstance(Domain.getById(d.getId())))); assertThat(Domain.getById(d.getId()), is(sameInstance(Domain.getById(d.getId()))));