upd: refactor tests to use convenience get-stuff

[gigi.git] / tests / org / cacert / gigi / TestLanguage.java

diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java
index d73f1fa2281533635a1ac733e3e7166e026f4d2a..55a3d12684e893645ab57c0c65a4e97c8915a965 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -1,83 +1,80 @@
 package org.cacert.gigi;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.Locale;
 
 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());
     }
 
     @Test
     public void testSelectStandard() throws IOException {
-        String content = IOUtils.readURL(new URL("https://" + getServerName() + "/").openConnection());
+        String content = IOUtils.readURL(get("cook", "/"));
         assertThat(content, containsString("Translations"));
     }
 
     @Test
     public void testSelectGerman() throws IOException {
-        String content = IOUtils.readURL(new URL("https://" + getServerName() + "/?lang=de").openConnection());
+        String content = IOUtils.readURL(get("", "/?lang=de"));
         assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
     }
 
     @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));
+        String content = IOUtils.readURL(get(cookie, "/"));
         assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
     }
 
     @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));
+        String content = IOUtils.readURL(get(cookie, "/"));
         assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Translations")));
     }
 }