X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestUser.java;h=30a46b7e66ab41b883a19162db188b039e3cddd4;hb=86697a625a38a4ad3ce13eb169574d91dc282ce7;hp=5831da1f9a5310616eaac9df15515ae009cf65fa;hpb=785fe6cd9e7c9116b801aafc443b4f090cce870c;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 5831da1f..30a46b7e 100644
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -3,6 +3,9 @@ package org.cacert.gigi;
 import java.sql.SQLException;
 import java.util.Locale;
 
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
@@ -25,7 +28,7 @@ public class TestUser extends ManagedTest {
         u.setEmail(createUniqueName() + "a@email.org");
         u.insert("password");
         int id = u.getId();
-        User u2 = new User(id);
+        User u2 = User.getById(id);
         assertEquals(u, u2);
     }
 
@@ -33,7 +36,7 @@ public class TestUser extends ManagedTest {
     public void testWebStoreAndLoad() throws SQLException {
         int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
+        User u = User.getById(id);
         assertEquals("aä", u.getFname());
         assertEquals("b", u.getLname());
         assertEquals("", u.getMname());
@@ -43,7 +46,7 @@ public class TestUser extends ManagedTest {
     public void testAssurerUtilMethods() throws SQLException {
         int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
+        User u = User.getById(id);
         assertTrue(u.canAssure());
         int assurancePoints = u.getAssurancePoints();
         int expPoints = u.getExperiencePoints();
@@ -62,9 +65,9 @@ public class TestUser extends ManagedTest {
         String uq = createUniqueName();
         int id = createVerifiedUser("aä", "b", uq + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
-        new EmailAddress(uq + "b@email.org", u).insert(Language.getInstance(Locale.ENGLISH));
-        new EmailAddress(uq + "c@email.org", u).insert(Language.getInstance(Locale.ENGLISH));
+        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();