Empty: rename fname,mname,lname,dob

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

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 16543dad5b6eb236fd111ddfdaafe00bbc0bab15..93deebaa4fe4af245148cf3a133d98e0d02c49a0 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -1,5 +1,7 @@
 package org.cacert.gigi;
 
+import static org.junit.Assert.*;
+
 import java.sql.Date;
 import java.sql.SQLException;
 import java.util.Locale;
@@ -12,26 +14,26 @@ import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class TestUser extends ManagedTest {
 
     @Test
     public void testStoreAndLoad() throws SQLException {
         User u = new User();
-        u.setFname("user");
-        u.setLname("last");
-        u.setMname("");
+        u.setFName("user");
+        u.setLName("last");
+        u.setMName("");
         u.setSuffix("");
         u.setPreferredLocale(Locale.ENGLISH);
         long dob = System.currentTimeMillis();
         dob -= dob % (1000 * 60 * 60 * 24);
-        u.setDob(new java.sql.Date(dob));
+        u.setDoB(new java.sql.Date(dob));
         u.setEmail(createUniqueName() + "a@email.org");
         u.insert("password");
         int id = u.getId();
         User u2 = User.getById(id);
-        assertEquals(u, u2);
+        assertEquals(u.getName(), u2.getName());
+        assertEquals(u.getDoB().toString(), u2.getDoB().toString());
+        assertEquals(u.getEmail(), u2.getEmail());
     }
 
     @Test
@@ -39,9 +41,9 @@ public class TestUser extends ManagedTest {
         int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
         User u = User.getById(id);
-        assertEquals("aä", u.getFname());
-        assertEquals("b", u.getLname());
-        assertEquals("", u.getMname());
+        assertEquals("aä", u.getFName());
+        assertEquals("b", u.getLName());
+        assertEquals("", u.getMName());
     }
 
     @Test
@@ -57,9 +59,9 @@ public class TestUser extends ManagedTest {
         assertTrue(u.hasPassedCATS());
         assertEquals(10, u.getMaxAssurePoints());
 
-        assertEquals("aä", u.getFname());
-        assertEquals("b", u.getLname());
-        assertEquals("", u.getMname());
+        assertEquals("aä", u.getFName());
+        assertEquals("b", u.getLName());
+        assertEquals("", u.getMName());
     }
 
     @Test
@@ -70,18 +72,18 @@ public class TestUser extends ManagedTest {
         User u = User.getById(id);
         new EmailAddress(u, uq + "b@email.org").insert(Language.getInstance(Locale.ENGLISH));
         new EmailAddress(u, uq + "c@email.org").insert(Language.getInstance(Locale.ENGLISH));
-        new Domain(u, uq + "a.testdomain.org").insert();
-        new Domain(u, uq + "b.testdomain.org").insert();
-        new Domain(u, uq + "c.testdomain.org").insert();
+        new Domain(u, uq + "a-testdomain.org").insert();
+        new Domain(u, uq + "b-testdomain.org").insert();
+        new Domain(u, uq + "c-testdomain.org").insert();
         assertEquals(3, u.getEmails().length);
         assertEquals(3, u.getDomains().length);
-        assertTrue(u.isValidDomain(uq + "a.testdomain.org"));
-        assertTrue(u.isValidDomain(uq + "b.testdomain.org"));
-        assertTrue(u.isValidDomain(uq + "c.testdomain.org"));
-        assertTrue(u.isValidDomain("a." + uq + "a.testdomain.org"));
-        assertTrue(u.isValidDomain("*." + uq + "a.testdomain.org"));
-        assertFalse(u.isValidDomain("a" + uq + "a.testdomain.org"));
-        assertFalse(u.isValidDomain("b" + uq + "a.testdomain.org"));
+        assertTrue(u.isValidDomain(uq + "a-testdomain.org"));
+        assertTrue(u.isValidDomain(uq + "b-testdomain.org"));
+        assertTrue(u.isValidDomain(uq + "c-testdomain.org"));
+        assertTrue(u.isValidDomain("a." + uq + "a-testdomain.org"));
+        assertTrue(u.isValidDomain("*." + uq + "a-testdomain.org"));
+        assertFalse(u.isValidDomain("a" + uq + "a-testdomain.org"));
+        assertFalse(u.isValidDomain("b" + uq + "a-testdomain.org"));
 
         assertTrue(u.isValidEmail(uq + "a@email.org"));
         assertTrue(u.isValidEmail(uq + "b@email.org"));
@@ -97,12 +99,12 @@ public class TestUser extends ManagedTest {
     @Test
     public void testDoubleInsert() {
         User u = new User();
-        u.setFname("f");
-        u.setLname("l");
-        u.setMname("m");
+        u.setFName("f");
+        u.setLName("l");
+        u.setMName("m");
         u.setSuffix("s");
         u.setEmail(createUniqueName() + "@example.org");
-        u.setDob(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365));
+        u.setDoB(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365));
         u.setPreferredLocale(Locale.ENGLISH);
         u.insert(TEST_PASSWORD);
         try {
@@ -115,7 +117,7 @@ public class TestUser extends ManagedTest {
         Assurance[] ma2 = u.getMadeAssurances();
         Assurance[] ra = u.getReceivedAssurances();
         Assurance[] ra2 = u.getReceivedAssurances();
-        assertEquals(0, u.getCertificates().length);
+        assertEquals(0, u.getCertificates(false).length);
         assertEquals(0, ma.length);
         assertEquals(0, ma2.length);
         assertEquals(0, ra.length);
@@ -124,4 +126,13 @@ public class TestUser extends ManagedTest {
         assertSame(ra, ra2);
     }
 
+    @Test
+    public void testGetByMail() {
+        String email = createUniqueName() + "a@email.org";
+        int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD);
+        User emailUser = User.getByEmail(email);
+        User u = User.getById(id);
+        assertSame(u, emailUser);
+    }
+
 }