Move pages to test support package

grzesiek2010 · Dec 20, 2019 · c3c8a1e · c3c8a1e
1 parent 028c85a
commit c3c8a1e
Show file tree

Hide file tree

Showing 42 changed files with 74 additions and 74 deletions.
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/FormMapTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/FormMapTest.java
@@ -16,7 +16,7 @@
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.activities.FormEntryActivity;
 import org.odk.collect.android.activities.MainMenuActivity;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.utilities.GeoUtils;

diff --git a/..._app/src/androidTest/java/org/odk/collect/android/formentry/DeletingRepeatGroupsTest.java b/..._app/src/androidTest/java/org/odk/collect/android/formentry/DeletingRepeatGroupsTest.java
@@ -10,7 +10,7 @@
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.FormEntryActivity;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.support.matchers.RecyclerViewMatcher;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/formentry/EncryptedFormTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/formentry/EncryptedFormTest.java
@@ -26,7 +26,7 @@
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.MainMenuActivity;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.provider.InstanceProviderAPI;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;

diff --git a/.../src/androidTest/java/org/odk/collect/android/formentry/ExternalDataFileNotFoundTest.java b/.../src/androidTest/java/org/odk/collect/android/formentry/ExternalDataFileNotFoundTest.java
@@ -10,7 +10,7 @@
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.FormEntryActivity;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.test.FormLoadingUtils;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/formentry/FormHierarchyTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/formentry/FormHierarchyTest.java
@@ -8,8 +8,8 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.regression.BaseRegressionTest;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/formentry/SelectMinimalTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/formentry/SelectMinimalTest.java
@@ -11,7 +11,7 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.activities.FormEntryActivity;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.test.FormLoadingUtils;

diff --git a/...ct_app/src/androidTest/java/org/odk/collect/android/formentry/audit/IdentifyUserTest.java b/...ct_app/src/androidTest/java/org/odk/collect/android/formentry/audit/IdentifyUserTest.java
@@ -11,8 +11,8 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.activities.MainMenuActivity;
-import org.odk.collect.android.espressoutils.pages.IdentifyUserPromptPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.IdentifyUserPromptPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/.../src/androidTest/java/org/odk/collect/android/formentry/audit/TrackChangesReasonTest.java b/.../src/androidTest/java/org/odk/collect/android/formentry/audit/TrackChangesReasonTest.java
@@ -12,10 +12,10 @@
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.MainMenuActivity;
-import org.odk.collect.android.espressoutils.pages.ChangesReasonPromptPage;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.SaveOrIgnoreDialog;
+import org.odk.collect.android.support.pages.ChangesReasonPromptPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.SaveOrIgnoreDialog;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/DrawWidgetTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/DrawWidgetTest.java
@@ -11,9 +11,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.SaveOrIgnoreDialog;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.SaveOrIgnoreDialog;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.support.ScreenshotOnFailureTestRule;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/FillBlankFormTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/FillBlankFormTest.java
@@ -13,12 +13,12 @@
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.FormEntryActivity;
-import org.odk.collect.android.espressoutils.pages.BlankFormSearchPage;
-import org.odk.collect.android.espressoutils.pages.ExitFormDialog;
-import org.odk.collect.android.espressoutils.pages.FillBlankFormPage;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.BlankFormSearchPage;
+import org.odk.collect.android.support.pages.ExitFormDialog;
+import org.odk.collect.android.support.pages.FillBlankFormPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.provider.InstanceProviderAPI;
 import org.odk.collect.android.support.ActivityHelpers;
 import org.odk.collect.android.support.CopyFormRule;

diff --git a/...androidTest/java/org/odk/collect/android/regression/FillBlankFormWithRepeatGroupTest.java b/...androidTest/java/org/odk/collect/android/regression/FillBlankFormWithRepeatGroupTest.java
@@ -9,9 +9,9 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/...ct_app/src/androidTest/java/org/odk/collect/android/regression/FormEntrySettingsTest.java b/...ct_app/src/androidTest/java/org/odk/collect/android/regression/FormEntrySettingsTest.java
@@ -8,10 +8,10 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.AdminSettingsPage;
-import org.odk.collect.android.espressoutils.pages.ExitFormDialog;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.AdminSettingsPage;
+import org.odk.collect.android.support.pages.ExitFormDialog;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/FormManagementTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/FormManagementTest.java
@@ -10,9 +10,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/FormValidationTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/FormValidationTest.java
@@ -10,9 +10,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.SaveOrIgnoreDialog;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.SaveOrIgnoreDialog;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/...ect_app/src/androidTest/java/org/odk/collect/android/regression/RequiredQuestionTest.java b/...ect_app/src/androidTest/java/org/odk/collect/android/regression/RequiredQuestionTest.java
@@ -10,8 +10,8 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.SaveOrIgnoreDialog;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.SaveOrIgnoreDialog;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/...ect_app/src/androidTest/java/org/odk/collect/android/regression/ResetApplicationTest.java b/...ect_app/src/androidTest/java/org/odk/collect/android/regression/ResetApplicationTest.java
@@ -8,9 +8,9 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.AdminSettingsPage;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.AdminSettingsPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/ServerOtherTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/ServerOtherTest.java
@@ -6,7 +6,7 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.ResetStateRule;
 
 // Issue number NODK-235

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/SignatureWidgetTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/SignatureWidgetTest.java
@@ -11,9 +11,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.SaveOrIgnoreDialog;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.SaveOrIgnoreDialog;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 import org.odk.collect.android.support.ScreenshotOnFailureTestRule;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/SpinnerWidgetTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/SpinnerWidgetTest.java
@@ -9,8 +9,8 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.FormEntryPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.FormEntryPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/TriggerWidgetTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/TriggerWidgetTest.java
@@ -10,8 +10,8 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/...pp/src/androidTest/java/org/odk/collect/android/regression/UserAndDeviceIdentityTest.java b/...pp/src/androidTest/java/org/odk/collect/android/regression/UserAndDeviceIdentityTest.java
@@ -10,9 +10,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
-import org.odk.collect.android.espressoutils.pages.UserAndDeviceIdentitySettingsPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.UserAndDeviceIdentitySettingsPage;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;
 

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/regression/UserSettingsTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/regression/UserSettingsTest.java
@@ -7,9 +7,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
-import org.odk.collect.android.espressoutils.pages.AdminSettingsPage;
-import org.odk.collect.android.espressoutils.pages.GeneralSettingsPage;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.AdminSettingsPage;
+import org.odk.collect.android.support.pages.GeneralSettingsPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.support.ResetStateRule;
 
 //Issue NODK-241

diff --git a/...org/odk/collect/android/regression/formfilling/CascadingSelectWithNumberInHeaderTest.java b/...org/odk/collect/android/regression/formfilling/CascadingSelectWithNumberInHeaderTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.regression.BaseRegressionTest;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;

diff --git a/...t/java/org/odk/collect/android/regression/formfilling/ExternalSecondaryInstancesTest.java b/...t/java/org/odk/collect/android/regression/formfilling/ExternalSecondaryInstancesTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.odk.collect.android.espressoutils.pages.MainMenuPage;
+import org.odk.collect.android.support.pages.MainMenuPage;
 import org.odk.collect.android.regression.BaseRegressionTest;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.ResetStateRule;

diff --git a/...spressoutils/pages/AddNewGroupDialog.java → ...roid/support/pages/AddNewGroupDialog.java b/...spressoutils/pages/AddNewGroupDialog.java → ...roid/support/pages/AddNewGroupDialog.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...spressoutils/pages/AdminSettingsPage.java → ...roid/support/pages/AdminSettingsPage.java b/...spressoutils/pages/AdminSettingsPage.java → ...roid/support/pages/AdminSettingsPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.matcher.PreferenceMatchers;

diff --git a/...ressoutils/pages/BlankFormSearchPage.java → ...id/support/pages/BlankFormSearchPage.java b/...ressoutils/pages/BlankFormSearchPage.java → ...id/support/pages/BlankFormSearchPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...outils/pages/ChangesReasonPromptPage.java → ...upport/pages/ChangesReasonPromptPage.java b/...outils/pages/ChangesReasonPromptPage.java → ...upport/pages/ChangesReasonPromptPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...spressoutils/pages/EditSavedFormPage.java → ...roid/support/pages/EditSavedFormPage.java b/...spressoutils/pages/EditSavedFormPage.java → ...roid/support/pages/EditSavedFormPage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import android.widget.RelativeLayout;
 

diff --git a/...roid/espressoutils/pages/ErrorDialog.java → ...ct/android/support/pages/ErrorDialog.java b/...roid/espressoutils/pages/ErrorDialog.java → ...ct/android/support/pages/ErrorDialog.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...d/espressoutils/pages/ExitFormDialog.java → ...android/support/pages/ExitFormDialog.java b/...d/espressoutils/pages/ExitFormDialog.java → ...android/support/pages/ExitFormDialog.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...spressoutils/pages/FillBlankFormPage.java → ...roid/support/pages/FillBlankFormPage.java b/...spressoutils/pages/FillBlankFormPage.java → ...roid/support/pages/FillBlankFormPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import android.database.Cursor;
 

diff --git a/...id/espressoutils/pages/FormEntryPage.java → .../android/support/pages/FormEntryPage.java b/...id/espressoutils/pages/FormEntryPage.java → .../android/support/pages/FormEntryPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.espresso.Espresso;
 import androidx.test.rule.ActivityTestRule;

diff --git a/...roid/espressoutils/pages/FormMapPage.java → ...ct/android/support/pages/FormMapPage.java b/...roid/espressoutils/pages/FormMapPage.java → ...ct/android/support/pages/FormMapPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...ressoutils/pages/GeneralSettingsPage.java → ...id/support/pages/GeneralSettingsPage.java b/...ressoutils/pages/GeneralSettingsPage.java → ...id/support/pages/GeneralSettingsPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.matcher.PreferenceMatchers;

diff --git a/...soutils/pages/IdentifyUserPromptPage.java → ...support/pages/IdentifyUserPromptPage.java b/...soutils/pages/IdentifyUserPromptPage.java → ...support/pages/IdentifyUserPromptPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...oid/espressoutils/pages/MainMenuPage.java → ...t/android/support/pages/MainMenuPage.java b/...oid/espressoutils/pages/MainMenuPage.java → ...t/android/support/pages/MainMenuPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import org.odk.collect.android.R;
 import org.odk.collect.android.provider.FormsProviderAPI.FormsColumns;

diff --git a/...android/espressoutils/pages/OkDialog.java → ...llect/android/support/pages/OkDialog.java b/...android/espressoutils/pages/OkDialog.java → ...llect/android/support/pages/OkDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...ect/android/espressoutils/pages/Page.java → ...k/collect/android/support/pages/Page.java b/...ect/android/espressoutils/pages/Page.java → ...k/collect/android/support/pages/Page.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import android.app.Activity;
 

diff --git a/...pressoutils/pages/SaveOrIgnoreDialog.java → ...oid/support/pages/SaveOrIgnoreDialog.java b/...pressoutils/pages/SaveOrIgnoreDialog.java → ...oid/support/pages/SaveOrIgnoreDialog.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/...pressoutils/pages/ServerSettingsPage.java → ...oid/support/pages/ServerSettingsPage.java b/...pressoutils/pages/ServerSettingsPage.java → ...oid/support/pages/ServerSettingsPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.espresso.matcher.PreferenceMatchers;
 import androidx.test.rule.ActivityTestRule;

diff --git a/...es/UserAndDeviceIdentitySettingsPage.java → ...es/UserAndDeviceIdentitySettingsPage.java b/...es/UserAndDeviceIdentitySettingsPage.java → ...es/UserAndDeviceIdentitySettingsPage.java
@@ -1,4 +1,4 @@
-package org.odk.collect.android.espressoutils.pages;
+package org.odk.collect.android.support.pages;
 
 import androidx.test.espresso.matcher.PreferenceMatchers;
 import androidx.test.rule.ActivityTestRule;