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 55a3d12684e893645ab57c0c65a4e97c8915a965..912cab6ff9abd6df3674741ad1c6990a1fa5e32c 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -10,6 +10,7 @@ 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,13 +52,13 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testSelectStandard() throws IOException {
         String content = IOUtils.readURL(get("cook", "/"));
-        assertThat(content, containsString("Translations"));
+        assertThat(content, containsString("Language"));
     }
 
     @Test
     public void testSelectGerman() throws IOException {
         String content = IOUtils.readURL(get("", "/?lang=de"));
-        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
+        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Language")));
     }
 
     @Test
@@ -66,15 +67,16 @@ public class TestLanguage extends ManagedTest {
         User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(get(cookie, "/"));
-        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
+        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(get(cookie, "/"));
-        assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Translations")));
+        assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Language")));
     }
 }