X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestUser.java;h=4c22f8138280b8dea10a1fb2574e4a283e1b8467;hb=29550b9ab170e87ef6f61df9c1d90456633a674f;hp=0bbc4cbb6756e5378cb5bb737c7ca527a8624e23;hpb=6dcec2ace981aadba1f0a04e20e2bafe19b47976;p=gigi.git diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index 0bbc4cbb..4c22f813 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/org/cacert/gigi/TestUser.java @@ -2,51 +2,54 @@ package org.cacert.gigi; import static org.junit.Assert.*; -import java.sql.Date; +import java.io.IOException; import java.sql.SQLException; +import java.util.Arrays; import java.util.Locale; import org.cacert.gigi.dbObjects.Assurance; +import org.cacert.gigi.dbObjects.Assurance.AssuranceType; +import org.cacert.gigi.dbObjects.Country; +import org.cacert.gigi.dbObjects.Country.CountryCodeType; import org.cacert.gigi.dbObjects.Domain; import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.dbObjects.Name; +import org.cacert.gigi.dbObjects.NamePart; +import org.cacert.gigi.dbObjects.NamePart.NamePartType; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.testUtils.ManagedTest; +import org.cacert.gigi.testUtils.BusinessTest; +import org.cacert.gigi.util.DayDate; +import org.cacert.gigi.util.Notary; +import org.hamcrest.CoreMatchers; import org.junit.Test; -public class TestUser extends ManagedTest { +public class TestUser extends BusinessTest { @Test - public void testStoreAndLoad() throws SQLException { - User u = new User(); - u.setName(new Name("user", "last", "", "")); - u.setPreferredLocale(Locale.ENGLISH); + public void testStoreAndLoad() throws SQLException, GigiApiException { long dob = System.currentTimeMillis(); dob -= dob % (1000 * 60 * 60 * 24); - u.setDoB(new java.sql.Date(dob)); - u.setEmail(createUniqueName() + "a@email.org"); - u.insert("password"); + User u = createUser("f", "l", createUniqueName() + "a@email.org", TEST_PASSWORD); int id = u.getId(); User u2 = User.getById(id); - assertEquals(u.getName(), u2.getName()); + assertEquals(u.getNames()[0], u2.getNames()[0]); assertEquals(u.getDoB().toString(), u2.getDoB().toString()); assertEquals(u.getEmail(), u2.getEmail()); } @Test - public void testWebStoreAndLoad() throws SQLException { + public void testWebStoreAndLoad() throws SQLException, GigiApiException { int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD); - Name u = User.getById(id).getName(); + Name u = User.getById(id).getNames()[0]; - assertEquals("aä", u.getFname()); - assertEquals("b", u.getLname()); - assertEquals("", u.getMname()); + assertThat(Arrays.asList(u.getParts()), CoreMatchers.hasItem(new NamePart(NamePartType.FIRST_NAME, "aä"))); + assertThat(Arrays.asList(u.getParts()), CoreMatchers.hasItem(new NamePart(NamePartType.LAST_NAME, "b"))); + assertEquals(2, u.getParts().length); } @Test - public void testAssurerUtilMethods() throws SQLException { + public void testAssurerUtilMethods() throws SQLException, GigiApiException { int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD); User u = User.getById(id); @@ -54,27 +57,20 @@ public class TestUser extends ManagedTest { int assurancePoints = u.getAssurancePoints(); int expPoints = u.getExperiencePoints(); assertEquals(100, assurancePoints); - assertEquals(2, expPoints); + assertEquals(User.EXPERIENCE_POINTS, expPoints); assertTrue(u.hasPassedCATS()); assertEquals(10, u.getMaxAssurePoints()); - Name name = u.getName(); - assertEquals("aä", name.getFname()); - assertEquals("b", name.getLname()); - assertEquals("", name.getMname()); } @Test - public void testMatcherMethods() throws SQLException, GigiApiException { + public void testMatcherMethodsDomain() throws SQLException, GigiApiException, IOException { String uq = createUniqueName(); int id = createVerifiedUser("aä", "b", uq + "a@email.org", TEST_PASSWORD); 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(); - assertEquals(3, u.getEmails().length); + verify(new Domain(u, u, uq + "a-testdomain.org")); + verify(new Domain(u, u, uq + "b-testdomain.org")); + verify(new Domain(u, u, uq + "c-testdomain.org")); assertEquals(3, u.getDomains().length); assertTrue(u.isValidDomain(uq + "a-testdomain.org")); assertTrue(u.isValidDomain(uq + "b-testdomain.org")); @@ -83,11 +79,40 @@ public class TestUser extends ManagedTest { assertTrue(u.isValidDomain("*." + uq + "a-testdomain.org")); assertFalse(u.isValidDomain("a" + uq + "a-testdomain.org")); assertFalse(u.isValidDomain("b" + uq + "a-testdomain.org")); + } + + @Test + public void testMatcherMethodsEmail() throws SQLException, GigiApiException, IOException { + String uq = createUniqueName(); + int id = createVerifiedUser("aä", "b", uq + "a@email.org", TEST_PASSWORD); + + User u = User.getById(id); + + new EmailAddress(u, uq + "b@email.org", Locale.ENGLISH); + getMailReceiver().receive().verify(); + new EmailAddress(u, uq + "c@email.org", Locale.ENGLISH); + getMailReceiver().receive();// no-verify + assertEquals(3, u.getEmails().length); assertTrue(u.isValidEmail(uq + "a@email.org")); assertTrue(u.isValidEmail(uq + "b@email.org")); assertFalse(u.isValidEmail(uq + "b+6@email.org")); assertFalse(u.isValidEmail(uq + "b*@email.org")); + assertFalse(u.isValidEmail(uq + "c@email.org")); + } + + @Test + public void testMatcherMethodsName() throws SQLException, GigiApiException, IOException { + String uq = createUniqueName(); + int id = createVerifiedUser("aä", "b", uq + "a@email.org", TEST_PASSWORD); + + User u = User.getById(id); + + User[] us = new User[5]; + for (int i = 0; i < us.length; i++) { + us[i] = User.getById(createAssuranceUser("f", "l", createUniqueName() + "@email.com", TEST_PASSWORD)); + Notary.assure(us[i], u, u.getPreferredName(), u.getDoB(), 10, "here", validVerificationDateString(), AssuranceType.FACE_TO_FACE, Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS)); + } assertTrue(u.isValidName("aä b")); assertFalse(u.isValidName("aä c")); @@ -96,19 +121,10 @@ public class TestUser extends ManagedTest { } @Test - public void testDoubleInsert() { - User u = new User(); - u.setName(new Name("f", "k", "m", "s")); - u.setEmail(createUniqueName() + "@example.org"); - u.setDoB(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365)); - u.setPreferredLocale(Locale.ENGLISH); - u.insert(TEST_PASSWORD); - try { - u.insert(TEST_PASSWORD); - fail("Error expected"); - } catch (Error e) { - // expected - } + public void testDoubleInsert() throws GigiApiException { + long d = System.currentTimeMillis(); + d -= d % DayDate.MILLI_DAY; + User u = createUser("f", "l", createUniqueName() + "@example.org", TEST_PASSWORD); Assurance[] ma = u.getMadeAssurances(); Assurance[] ma2 = u.getMadeAssurances(); Assurance[] ra = u.getReceivedAssurances(); @@ -123,7 +139,7 @@ public class TestUser extends ManagedTest { } @Test - public void testGetByMail() { + public void testGetByMail() throws GigiApiException { String email = createUniqueName() + "a@email.org"; int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD); User emailUser = User.getByEmail(email); @@ -131,4 +147,19 @@ public class TestUser extends ManagedTest { assertSame(u, emailUser); } + @Test + public void testNoCats() throws GigiApiException { + String email = createUniqueName() + "a@email.org"; + createVerifiedUser("aä", "b", email, TEST_PASSWORD); + User emailUser = User.getByEmail(email); + assertFalse(emailUser.hasPassedCATS()); + } + + @Test + public void testGetByMailFail() { + String email = createUniqueName() + "d@email.org"; + User emailUser = User.getByEmail(email); + assertNull(emailUser); + } + }