adding script to generate cacerts.jks from NRE-roots

[gigi.git] / tests / org / cacert / gigi / TestObjectCache.java

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index d361c16b923e783a110d34a302199ecca8c874c6..d55bef1e1da3e90a495be8d6a0fa02746a6fe2fe 100644 (file)
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -8,6 +8,10 @@ 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.junit.Test;
@@ -21,14 +25,11 @@ public class TestObjectCache extends ManagedTest {
         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.setName(new Name("fname", "lname", "mname", "suffix"));
         u.setEmail(createUniqueName() + "@example.org");
         Calendar c = Calendar.getInstance();
         c.set(1950, 1, 1);
-        u.setDob(new Date(c.getTime().getTime()));
+        u.setDoB(new Date(c.getTime().getTime()));
         u.setPreferredLocale(Locale.ENGLISH);
         u.insert(TEST_PASSWORD);
 
@@ -47,8 +48,8 @@ public class TestObjectCache extends ManagedTest {
     }
 
     @Test
-    public void testEmailCache() {
-        EmailAddress em = new EmailAddress(createUniqueName() + "@example.org", User.getById(uid));
+    public void testEmailCache() throws GigiApiException {
+        EmailAddress em = new EmailAddress(User.getById(uid), createUniqueName() + "@example.org");
         em.insert(Language.getInstance(Locale.ENGLISH));
 
         assertThat(em, is(sameInstance(EmailAddress.getById(em.getId()))));