X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestObjectCache.java;h=b1272a0f8c413f902b3745a30d11e5ae8eac20d5;hb=bafe96665aa27ee01a09853941fcd7c46573eb5c;hp=c63da92219ec39c67ad15a4b3cdd206bdc53b44a;hpb=9031f0cf4327eaef9ede27f83cadf0b44833193c;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index c63da922..b1272a0f 100644
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -10,8 +10,8 @@ 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.junit.Test;
 
@@ -20,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()))));
@@ -43,16 +35,14 @@ public class TestObjectCache extends ManagedTest {
     @Test
     public void testDomainCache() throws GigiApiException {
         Domain d = new Domain(User.getById(uid), "example.org");
-        d.insert();
 
         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(User.getById(uid), createUniqueName() + "@example.org");
-        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()))));