X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestLanguage.java;h=1cac14527bc7d2f90a7e9d2e5786dbeff55b1db7;hp=d73f1fa2281533635a1ac733e3e7166e026f4d2a;hb=e87392fd58e9152531a8d1cb34cb46e370062108;hpb=e409ba881965634f63f0b67824bc93dda4ec4327

diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java
index d73f1fa2..1cac1452 100644
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -1,5 +1,6 @@
 package org.cacert.gigi;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
@@ -10,44 +11,41 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.ManagedTest;
-
-import static org.hamcrest.CoreMatchers.*;
-
 import org.junit.Test;
 
 public class TestLanguage extends ManagedTest {
 
     @Test
     public void testSignupNoLanguage() {
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.ENGLISH, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupDE() {
         setAcceptLanguage("de");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupMulti() {
         setAcceptLanguage("de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupFallback() {
         setAcceptLanguage("ma,de");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupProjection() {
         setAcceptLanguage("de-de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
@@ -66,7 +64,7 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testLanguageAfterLogin() throws IOException {
         setAcceptLanguage("de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(cookie(new URL("https://" + getServerName() + "/").openConnection(), cookie));
         assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
@@ -75,7 +73,7 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testOtherLanguageAfterLogin() throws IOException {
         setAcceptLanguage("fr,de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(cookie(new URL("https://" + getServerName() + "/").openConnection(), cookie));
         assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Translations")));