Merge pull request #194 from nheyek/choose-language-layout

Augment the test of language choosing
Gorzen · Nov 17, 2018 · 37ba986 · 37ba986
2 parents 68025f9 + a779d7e
commit 37ba986
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/SettingsActivityTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/SettingsActivityTest.java
@@ -27,6 +27,7 @@
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static ch.epfl.sweng.studyup.utils.Constants.LANGUAGES;
 import static ch.epfl.sweng.studyup.utils.Constants.PERSIST_LOGIN_FILENAME;
 import static org.junit.Assert.assertTrue;
 
@@ -74,11 +75,13 @@ public void closeButtonTest() {
 
     @Test
     public void testLanguageChoosingPopup() {
-        onView(withId(R.id.languageChoiceButton)).perform(click());
-        onView(withText(R.string.cancel))
-                .inRoot(isDialog())
-                .check(matches(isDisplayed()))
-                .perform(click());
+        for(String s : LANGUAGES) {
+            onView(withId(R.id.languageChoiceButton)).perform(click());
+            onView(withText(s))
+                    .inRoot(isDialog())
+                    .check(matches(isDisplayed()))
+                    .perform(click());
+        }
 
         //If all worked, we could close the settings
         onView(withId(R.id.back_button)).perform(click());