package org.cacert.gigi;
+import static org.junit.Assert.*;
+
import java.sql.Date;
import java.sql.SQLException;
import java.util.Locale;
import org.cacert.gigi.testUtils.ManagedTest;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class TestUser extends ManagedTest {
@Test
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"));
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);
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);
+ }
+
}