X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestObjectCache.java;h=1d35669b8dc68421cf18eb02324250ee9a0e65ff;hp=6824c3793ec78cb926384dc416bf1fe8b4631aa2;hb=6d1b746247f6e1eab7d1da17112beb9cf5abb089;hpb=673e3f834a719f3b1bfceedfd801a21ca7842cf2

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index 6824c379..1d35669b 100644
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -3,29 +3,26 @@ 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.testUtils.ManagedTest;
+import org.cacert.gigi.testUtils.ClientBusinessTest;
 import org.junit.Test;
 
-public class TestObjectCache extends ManagedTest {
-
-    int uid = createVerifiedUser("fname", "lname", createUniqueName() + "@example.com", TEST_PASSWORD);
+public class TestObjectCache extends ClientBusinessTest {
 
     @Test
     public void testUserCache() throws SQLException, GigiApiException {
-        assertThat(User.getById(uid), is(sameInstance(User.getById(uid))));
+        assertThat(User.getById(id), is(sameInstance(User.getById(id))));
 
         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 = createUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD);
 
         assertThat(u, is(sameInstance(User.getById(u.getId()))));
         assertThat(User.getById(u.getId()), is(sameInstance(User.getById(u.getId()))));
@@ -34,8 +31,7 @@ public class TestObjectCache extends ManagedTest {
 
     @Test
     public void testDomainCache() throws GigiApiException {
-        Domain d = new Domain(User.getById(uid), "example.org");
-        d.insert();
+        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()))));
@@ -43,7 +39,7 @@ public class TestObjectCache extends ManagedTest {
 
     @Test
     public void testEmailCache() throws GigiApiException {
-        EmailAddress em = new EmailAddress(User.getById(uid), createUniqueName() + "@example.org", Locale.ENGLISH);
+        EmailAddress em = new EmailAddress(u, createUniqueName() + "@example.org", Locale.ENGLISH);
 
         assertThat(em, is(sameInstance(EmailAddress.getById(em.getId()))));
         assertThat(EmailAddress.getById(em.getId()), is(sameInstance(EmailAddress.getById(em.getId()))));