Moved tests from FormMediaTest to ExternalSelectsTest

grzesiek2010 · grzesiek2010 · commit 4d4aecbf383d · 2024-11-08T18:29:53.000+01:00
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/ExternalSelectsTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/ExternalSelectsTest.java
@@ -3,6 +3,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
+import org.odk.collect.android.storage.StoragePathProvider;
+import org.odk.collect.android.storage.StorageSubdirectory;
 import org.odk.collect.android.support.rules.CollectTestRule;
 import org.odk.collect.android.support.rules.TestRuleChain;
 
@@ -31,4 +33,29 @@ public void displaysAllChoicesFromItemsetsCSV() {
                 .assertText("King")
                 .assertText("Cameron");
     }
+
+    @Test
+    public void missingFileMessage_shouldBeDisplayedIfExternalFileWithChoicesIsMissing() {
+        String formsDirPath = new StoragePathProvider().getOdkDirPath(StorageSubdirectory.FORMS);
+
+        rule.startAtMainMenu()
+                .copyForm("select_one_external.xml")
+                .startBlankForm("cascading select test")
+                .clickOnText("Texas")
+                .swipeToNextQuestion("county")
+                .assertText("File: $formsDirPath/select_one_external-media/itemsets.csv is missing.")
+                .swipeToNextQuestion("city")
+                .assertText("File: $formsDirPath/select_one_external-media/itemsets.csv is missing.");
+    }
+
+    @Test
+    public void missingFileMessage_shouldBeDisplayedIfExternalFileWithChoicesUsedBySearchFunctionIsMissing() {
+        String formsDirPath = new StoragePathProvider().getOdkDirPath(StorageSubdirectory.FORMS);
+
+        rule.startAtMainMenu()
+                .copyForm("search_and_select.xml")
+                .startBlankForm("search_and_select")
+                .assertText("File: $formsDirPath/search_and_select-media/nombre.csv is missing.")
+                .assertText("File: $formsDirPath/search_and_select-media/nombre2.csv is missing.");
+    }
 }
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormMediaTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormMediaTest.kt
@@ -5,8 +5,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import org.odk.collect.android.storage.StoragePathProvider
-import org.odk.collect.android.storage.StorageSubdirectory
 import org.odk.collect.android.support.rules.CollectTestRule
 import org.odk.collect.android.support.rules.TestRuleChain.chain
 
@@ -29,37 +27,4 @@ class FormMediaTest {
             .assertText("ab")
             .assertText("ac")
     }
-
-    @Test
-    fun missingFileMessage_shouldBeDisplayedIfExternalFileIsMissing() {
-        val formsDirPath = StoragePathProvider().getOdkDirPath(StorageSubdirectory.FORMS)
-
-        rule.startAtMainMenu()
-            .copyForm("search_and_select.xml")
-            .startBlankForm("search_and_select")
-            .assertText("File: $formsDirPath/search_and_select-media/nombre.csv is missing.")
-            .assertText("File: $formsDirPath/search_and_select-media/nombre2.csv is missing.")
-            .swipeToEndScreen()
-            .clickFinalize()
-
-            .copyForm("select_one_external.xml")
-            .startBlankForm("cascading select test")
-            .clickOnText("Texas")
-            .swipeToNextQuestion("county")
-            .assertText("File: $formsDirPath/select_one_external-media/itemsets.csv is missing.")
-            .swipeToNextQuestion("city")
-            .assertText("File: $formsDirPath/select_one_external-media/itemsets.csv is missing.")
-            .swipeToEndScreen()
-            .clickFinalize()
-
-            .copyForm("fieldlist-updates_nocsv.xml")
-            .startBlankForm("fieldlist-updates")
-            .clickGoToArrow()
-            .clickGoUpIcon()
-            .clickOnElementInHierarchy(14)
-            .clickOnQuestion("Source15")
-            .assertText("File: $formsDirPath/fieldlist-updates_nocsv-media/fruits.csv is missing.")
-            .swipeToEndScreen()
-            .clickFinalize()
-    }
 }
diff --git a/test-forms/src/main/resources/forms/fieldlist-updates_nocsv.xml b/test-forms/src/main/resources/forms/fieldlist-updates_nocsv.xml
