X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestObjectCache.java;h=e4dec8a3b541224bd90d11b11d0cd7ad1bf2cf51;hb=74c125fe66c7942aaaff89e26a7da2f032fc7203;hp=d361c16b923e783a110d34a302199ecca8c874c6;hpb=231b0e94c013f955d3ab3b6c2ecab6908b2b9ca8;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index d361c16b..e4dec8a3 100644
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -8,7 +8,10 @@ import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Locale;
 
-import org.cacert.gigi.localisation.Language;
+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.junit.Test;
 
@@ -17,20 +20,12 @@ 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);
+        User u = new User(createUniqueName() + "@example.org", TEST_PASSWORD, new Name("fname", "lname", "mname", "suffix"), new Date(c.getTime().getTime()), Locale.ENGLISH);
 
         assertThat(u, is(sameInstance(User.getById(u.getId()))));
         assertThat(User.getById(u.getId()), is(sameInstance(User.getById(u.getId()))));
@@ -39,17 +34,16 @@ 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()))));
     }
 
     @Test
-    public void testEmailCache() {
-        EmailAddress em = new EmailAddress(createUniqueName() + "@example.org", User.getById(uid));
-        em.insert(Language.getInstance(Locale.ENGLISH));
+    public void testEmailCache() throws GigiApiException {
+        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()))));