Merge "Suggestions to enhance the SQL call pattern."

[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 1cac14527bc7d2f90a7e9d2e5786dbeff55b1db7..912cab6ff9abd6df3674741ad1c6990a1fa5e32c 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -4,13 +4,13 @@ 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 org.junit.Assume;
 import org.junit.Test;
 
 public class TestLanguage extends ManagedTest {
@@ -51,14 +51,14 @@ public class TestLanguage extends ManagedTest {
 
     @Test
     public void testSelectStandard() throws IOException {
-        String content = IOUtils.readURL(new URL("https://" + getServerName() + "/").openConnection());
-        assertThat(content, containsString("Translations"));
+        String content = IOUtils.readURL(get("cook", "/"));
+        assertThat(content, containsString("Language"));
     }
 
     @Test
     public void testSelectGerman() throws IOException {
-        String content = IOUtils.readURL(new URL("https://" + getServerName() + "/?lang=de").openConnection());
-        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
+        String content = IOUtils.readURL(get("", "/?lang=de"));
+        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Language")));
     }
 
     @Test
@@ -66,16 +66,17 @@ public class TestLanguage extends ManagedTest {
         setAcceptLanguage("de,en");
         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")));
+        String content = IOUtils.readURL(get(cookie, "/"));
+        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Language")));
     }
 
     @Test
     public void testOtherLanguageAfterLogin() throws IOException {
+        Assume.assumeNotNull(Language.getInstance(Locale.FRENCH));
         setAcceptLanguage("fr,de,en");
         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")));
+        String content = IOUtils.readURL(get(cookie, "/"));
+        assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Language")));
     }
 }