import org.cacert.gigi.dbObjects.Assurance;
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;
@Test
public void testStoreAndLoad() throws SQLException {
User u = new User();
- u.setFname("user");
- u.setLname("last");
- u.setMname("");
- u.setSuffix("");
+ u.setName(new Name("user", "last", "", ""));
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
public void testWebStoreAndLoad() throws SQLException {
int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
- User u = User.getById(id);
+ Name u = User.getById(id).getName();
+
assertEquals("aä", u.getFname());
assertEquals("b", u.getLname());
assertEquals("", u.getMname());
assertEquals(2, expPoints);
assertTrue(u.hasPassedCATS());
assertEquals(10, u.getMaxAssurePoints());
-
- assertEquals("aä", u.getFname());
- assertEquals("b", u.getLname());
- assertEquals("", u.getMname());
+ Name name = u.getName();
+ assertEquals("aä", name.getFname());
+ assertEquals("b", name.getLname());
+ assertEquals("", name.getMname());
}
@Test
@Test
public void testDoubleInsert() {
User u = new User();
- u.setFname("f");
- u.setLname("l");
- u.setMname("m");
- u.setSuffix("s");
+ 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.setDoB(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365));
u.setPreferredLocale(Locale.ENGLISH);
u.insert(TEST_PASSWORD);
try {