Add identify-user support

collect_app/build.gradle

@@ -322,8 +322,10 @@ dependencies {
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
 
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0-alpha02'
-    androidTestImplementation("androidx.test.espresso:espresso-intents:3.3.0-alpha02") {
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
+    androidTestImplementation("androidx.test.espresso:espresso-intents:3.2.0") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }

collect_app/src/androidTest/assets/forms/identify-user-audit-false.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<h:html xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml"
+    xmlns:jr="http://openrosa.org/javarosa" xmlns:odk="http://www.opendatakit.org/xforms"
+    xmlns:orx="http://openrosa.org/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.w3.org/2002/xforms">
+    <h:head>
+        <h:title>Identify User False</h:title>
+        <model>
+            <instance>
+                <data id="identify-user-false">
+                    <what_up />
+                    <meta>
+                        <audit />
+                        <instanceID />
+                    </meta>
+                </data>
+            </instance>
+            <bind nodeset="/data/what_up" type="string" />
+            <bind nodeset="/data/meta/audit" type="binary" odk:identify-user="false" />
+            <bind nodeset="/data/meta/instanceID" readonly="true()" type="string"
+                jr:preload="uid" />
+        </model>
+    </h:head>
+    <h:body>
+        <input ref="/data/what_up">
+            <label>What up?</label>
+        </input>
+    </h:body>
+</h:html>

collect_app/src/androidTest/assets/forms/identify-user-audit.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<h:html xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml"
+    xmlns:jr="http://openrosa.org/javarosa" xmlns:odk="http://www.opendatakit.org/xforms"
+    xmlns:orx="http://openrosa.org/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.w3.org/2002/xforms">
+    <h:head>
+        <h:title>Identify User</h:title>
+        <model>
+            <instance>
+                <data id="identify-user">
+                    <what_up />
+                    <meta>
+                        <audit />
+                        <instanceID />
+                    </meta>
+                </data>
+            </instance>
+            <bind nodeset="/data/what_up" type="string" />
+            <bind nodeset="/data/meta/audit" type="binary" odk:identify-user="true" />
+            <bind nodeset="/data/meta/instanceID" readonly="true()" type="string"
+                jr:preload="uid" />
+        </model>
+    </h:head>
+    <h:body>
+        <input ref="/data/what_up">
+            <label>What up?</label>
+        </input>
+    </h:body>
+</h:html>

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/EditSavedFormPage.java

@@ -60,4 +60,9 @@ public OkDialog clickSavedFormWithDialog(String instanceName) {
         onView(withText(instanceName)).perform(click());
         return new OkDialog(rule).assertOnPage();
     }
+
+    public IdentifyUserPromptPage clickOnFormWithIdentityPrompt(String formName) {
+        onView(withText(formName)).perform(click());
+        return new IdentifyUserPromptPage(formName, rule).assertOnPage();
+    }
 }

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/FillBlankFormPage.java

@@ -7,9 +7,11 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.odk.collect.android.test.CustomMatchers.withIndex;
 
 public class FillBlankFormPage extends Page<FillBlankFormPage> {
@@ -24,6 +26,11 @@ public FillBlankFormPage assertOnPage() {
         return this;
     }
 
+    public IdentifyUserPromptPage clickOnFormWithIdentityPrompt(String formName) {
+        clickOnFormButton(formName);
+        return new IdentifyUserPromptPage(formName, rule).assertOnPage();
+    }
+
     public FillBlankFormPage clickOnSortByButton() {
         onView(withId(R.id.menu_sort)).perform(click());
         return this;
@@ -43,4 +50,13 @@ public FillBlankFormPage checkIsFormSubtextDisplayed() {
         onView(withIndex(withId(R.id.form_subtitle2), 0)).check(matches(isDisplayed()));
         return this;
     }
+
+    public FormEntryPage clickOnForm(String formName) {
+        clickOnFormButton(formName);
+        return new FormEntryPage(formName, rule);
+    }
+
+    private void clickOnFormButton(String formName) {
+        onView(withText(formName)).perform(scrollTo(), click());
+    }
 }

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/FormEntryPage.java

@@ -6,8 +6,6 @@
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.ActivityHelpers;
 
-import timber.log.Timber;
-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.longClick;
@@ -100,7 +98,7 @@ public FormEntryPage swipeToPreviousQuestion() {
         return this;
     }
 
-    public FormEntryPage clickGoToIconInForm() {
+    public FormEntryPage clickGoToArrow() {
         onView(withId(R.id.menu_goto)).perform(click());
         return this;
     }
@@ -115,25 +113,6 @@ public FormEntryPage clickSignatureButton() {
         return this;
     }
 
-    public FormEntryPage waitForRotationToEnd() {
-        try {
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            Timber.i(e);
-        }
-        return this;
-    }
-
-    public FormEntryPage clickIgnoreChanges() {
-        onView(withText(getInstrumentation().getTargetContext().getString(R.string.do_not_save))).perform(click());
-        return this;
-    }
-
-    public FormEntryPage simplePressBack() {
-        Espresso.pressBack();
-        return this;
-    }
-
     public FormEntryPage putTextOnIndex(int index, String text) {
         onView(withIndex(withClassName(endsWith("Text")), index)).perform(replaceText(text));
         return this;

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/IdentifyUserPromptPage.java

@@ -0,0 +1,55 @@
+package org.odk.collect.android.espressoutils.pages;
+
+import androidx.test.rule.ActivityTestRule;
+
+import org.odk.collect.android.R;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.pressImeActionButton;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+public class IdentifyUserPromptPage extends Page<IdentifyUserPromptPage> {
+
+    private final String formName;
+
+    public IdentifyUserPromptPage(String formName, ActivityTestRule rule) {
+        super(rule);
+        this.formName = formName;
+    }
+
+    @Override
+    public IdentifyUserPromptPage assertOnPage() {
+        onView(allOf(withText(formName), isDescendantOfA(withId(R.id.toolbar)))).check(matches(isDisplayed()));
+        onView(withText(getTranslatedString(R.string.enter_identity))).check(matches(isDisplayed()));
+        return this;
+    }
+
+    public IdentifyUserPromptPage enterIdentity(String identity) {
+        onView(withHint(getTranslatedString(R.string.identity))).perform(replaceText(identity));
+        return this;
+    }
+
+    public FormEntryPage clickKeyboardEnter() {
+        onView(withHint(getTranslatedString(R.string.identity))).perform(pressImeActionButton());
+        return new FormEntryPage(formName, rule).assertOnPage();
+    }
+
+    public IdentifyUserPromptPage clickKeyboardEnterWithValidationError() {
+        onView(withHint(getTranslatedString(R.string.identity))).perform(pressImeActionButton());
+        return this.assertOnPage();
+    }
+
+    public MainMenuPage pressClose() {
+        onView(withContentDescription(getTranslatedString(R.string.close))).perform(click());
+        return new MainMenuPage(rule).assertOnPage();
+    }
+}

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/Page.java

@@ -2,10 +2,12 @@
 
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.NoMatchingViewException;
-
+import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.rule.ActivityTestRule;
 
+import org.odk.collect.android.support.actions.RotateAction;
+
 import timber.log.Timber;
 
 import static androidx.test.espresso.Espresso.onView;
@@ -18,6 +20,7 @@
 import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
 import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -176,4 +179,26 @@ public T checkIfOptionIsDisabled(int string) {
         return (T) this;
     }
 
+    public  <D extends Page<D>> D rotateToLandscape(D destination) {
+        onView(isRoot()).perform(rotateToLandscape());
+        waitForRotationToEnd();
+
+        return destination.assertOnPage();
+    }
+
+    private static ViewAction rotateToLandscape() {
+        return new RotateAction();
+    }
+
+    public T waitForRotationToEnd() {
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            Timber.i(e);
+        }
+
+        return (T) this;
+    }
 }
+
+

collect_app/src/androidTest/java/org/odk/collect/android/espressoutils/pages/SaveOrIgnoreDialog.java

@@ -0,0 +1,34 @@
+package org.odk.collect.android.espressoutils.pages;
+
+import androidx.test.rule.ActivityTestRule;
+
+import org.odk.collect.android.R;
+
+public class SaveOrIgnoreDialog<D extends Page<D>> extends Page<SaveOrIgnoreDialog<D>> {
+
+    private final String formName;
+    private final D destination;
+
+    public SaveOrIgnoreDialog(String title, D destination, ActivityTestRule rule) {
+        super(rule);
+        this.formName = title;
+        this.destination = destination;
+    }
+
+    @Override
+    public SaveOrIgnoreDialog assertOnPage() {
+        String title = getTranslatedString(R.string.exit) + " " + formName;
+        checkIsTextDisplayed(title);
+        return this;
+    }
+
+    public D clickSaveChanges() {
+        clickOnString(R.string.keep_changes);
+        return destination;
+    }
+
+    public D clickIgnoreChanges() {
+        clickOnString(R.string.do_not_save);
+        return destination;
+    }
+}

collect_app/src/androidTest/java/org/odk/collect/android/formentry/DeletingRepeatGroupsTest.java

@@ -64,7 +64,7 @@ public void requestingDeletionOfLastRepeat_deletesLastRepeat() {
     @Test
     public void requestingDeletionOfFirstRepeatInHierarchy_deletesFirstRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon();
 
         onView(withId(R.id.list)).check(matches(RecyclerViewMatcher.withListSize(4)));
@@ -82,7 +82,7 @@ public void requestingDeletionOfFirstRepeatInHierarchy_deletesFirstRepeat() {
     @Test
     public void requestingDeletionOfMiddleRepeatInHierarchy_deletesMiddleRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon();
 
         onView(withId(R.id.list)).check(matches(RecyclerViewMatcher.withListSize(4)));
@@ -100,7 +100,7 @@ public void requestingDeletionOfMiddleRepeatInHierarchy_deletesMiddleRepeat() {
     @Test
     public void requestingDeletionOfLastRepeatInHierarchy_deletesLastRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon();
 
         onView(withId(R.id.list)).check(matches(RecyclerViewMatcher.withListSize(4)));
@@ -118,7 +118,7 @@ public void requestingDeletionOfLastRepeatInHierarchy_deletesLastRepeat() {
     @Test
     public void requestingDeletionOfFirstRepeatWithFieldList_deletesFirstRepeat() {
         new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList")
@@ -131,7 +131,7 @@ public void requestingDeletionOfFirstRepeatWithFieldList_deletesFirstRepeat() {
     @Test
     public void requestingDeletionOfMiddleRepeatWithFieldList_deletesMiddleRepeat() {
         new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList")
@@ -144,7 +144,7 @@ public void requestingDeletionOfMiddleRepeatWithFieldList_deletesMiddleRepeat()
     @Test
     public void requestingDeletionOfLastRepeatWithFieldList_deletesLastRepeat() {
         new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList")
@@ -157,7 +157,7 @@ public void requestingDeletionOfLastRepeatWithFieldList_deletesLastRepeat() {
     @Test
     public void requestingDeletionOfFirstRepeatWithFieldListInHierarchy_deletesFirstRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList");
@@ -176,7 +176,7 @@ public void requestingDeletionOfFirstRepeatWithFieldListInHierarchy_deletesFirst
     @Test
     public void requestingDeletionOfMiddleRepeatWithFieldListInHierarchy_deletesMiddleRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList");
@@ -194,7 +194,7 @@ public void requestingDeletionOfMiddleRepeatWithFieldListInHierarchy_deletesMidd
     @Test
     public void requestingDeletionOfLastRepeatWithFieldListInHierarchy_deletesLastRepeat() {
         FormEntryPage page = new FormEntryPage("repeatGroups", activityTestRule)
-                .clickGoToIconInForm()
+                .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
                 .clickOnText("repeatGroupFieldList");