X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestObjectCache.java;h=d2a04595b0c6014d7ad75fd5a3a4ab280b3c2f4c;hp=f143c4712cc99208e9a4774d163b0bf6337e8778;hb=c0d62ad52b65d78806431b34ed2ae24bf58c1ada;hpb=4b91927aa8d90226414872ce5b3006d0e0f5d273

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index f143c471..d2a04595 100644
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -3,16 +3,16 @@ 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;
 
 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.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.util.DayDate;
 import org.junit.Test;
 
 public class TestObjectCache extends ManagedTest {
@@ -20,20 +20,13 @@ public class TestObjectCache extends ManagedTest {
     int uid = createVerifiedUser("fname", "lname", createUniqueName() + "@example.com", TEST_PASSWORD);
 
     @Test
-    public void testUserCache() throws SQLException {
+    public void testUserCache() throws SQLException, GigiApiException {
         assertThat(User.getById(uid), is(sameInstance(User.getById(uid))));
 
-        User u = new User();
-        u.setFName("fname");
-        u.setMName("mname");
-        u.setSuffix("suffix");
-        u.setLName("lname");
-        u.setEmail(createUniqueName() + "@example.org");
         Calendar c = Calendar.getInstance();
-        c.set(1950, 1, 1);
-        u.setDoB(new Date(c.getTime().getTime()));
-        u.setPreferredLocale(Locale.ENGLISH);
-        u.insert(TEST_PASSWORD);
+        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()))));
@@ -42,8 +35,8 @@ public class TestObjectCache extends ManagedTest {
 
     @Test
     public void testDomainCache() throws GigiApiException {
-        Domain d = new Domain(User.getById(uid), "example.org");
-        d.insert();
+        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()))));
@@ -51,8 +44,7 @@ public class TestObjectCache extends ManagedTest {
 
     @Test
     public void testEmailCache() throws GigiApiException {
-        EmailAddress em = new EmailAddress(User.getById(uid), createUniqueName() + "@example.org");
-        em.insert(Language.getInstance(Locale.ENGLISH));
+        EmailAddress em = new EmailAddress(User.getById(uid), createUniqueName() + "@example.org", Locale.ENGLISH);
 
         assertThat(em, is(sameInstance(EmailAddress.getById(em.getId()))));
         assertThat(EmailAddress.getById(em.getId()), is(sameInstance(EmailAddress.getById(em.getId()))));