Merge pull request #5888 from grzesiek2010/COLLECT-5549

Fixed minimizing and reopening the app while on enter name dialog
getodk · Jan 17, 2024 · 7c41ddd · 7c41ddd
2 parents 0b92e73 + daab1b6
commit 7c41ddd
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 127 deletions.
diff --git a/...rc/androidTest/java/org/odk/collect/android/feature/formentry/audit/IdentifyUserTest.java b/...rc/androidTest/java/org/odk/collect/android/feature/formentry/audit/IdentifyUserTest.java
diff --git a/.../src/androidTest/java/org/odk/collect/android/feature/formentry/audit/IdentifyUserTest.kt b/.../src/androidTest/java/org/odk/collect/android/feature/formentry/audit/IdentifyUserTest.kt
@@ -0,0 +1,135 @@
+package org.odk.collect.android.feature.formentry.audit
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+import org.odk.collect.android.support.StorageUtils.getAuditLogForFirstInstance
+import org.odk.collect.android.support.pages.FormEntryPage
+import org.odk.collect.android.support.pages.FormHierarchyPage
+import org.odk.collect.android.support.pages.IdentifyUserPromptPage
+import org.odk.collect.android.support.pages.MainMenuPage
+import org.odk.collect.android.support.rules.CollectTestRule
+import org.odk.collect.android.support.rules.TestRuleChain
+import java.io.IOException
+
+@RunWith(AndroidJUnit4::class)
+class IdentifyUserTest {
+    private val rule = CollectTestRule()
+
+    @get:Rule
+    val ruleChain: RuleChain = TestRuleChain
+        .chain()
+        .around(rule)
+
+    @Test
+    @Throws(IOException::class)
+    fun openingForm_andThenEnteringIdentity_andThenFillingForm_logsUser() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("Lucius")
+            .clickKeyboardEnter(FormEntryPage("Identify User"))
+            .swipeToEndScreen()
+            .clickFinalize()
+
+        val auditLog = getAuditLogForFirstInstance()
+        val formStartEvent = auditLog[0]
+        assertThat(formStartEvent[0], equalTo("form start"))
+        assertThat(formStartEvent[4], equalTo("Lucius"))
+    }
+
+    @Test
+    @Throws(IOException::class)
+    fun openingSavedForm_andThenEnteringIdentity_andThenFillingForm_logsUser() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("Lucius")
+            .clickKeyboardEnter(FormEntryPage("Identify User"))
+            .swipeToEndScreen()
+            .clickSaveAsDraft()
+            .clickDrafts()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("Jack")
+            .clickKeyboardEnter(FormHierarchyPage("Identify User"))
+            .clickJumpEndButton()
+            .clickFinalize()
+
+        val auditLog = getAuditLogForFirstInstance()
+        val formResumeEvent = auditLog[5]
+        assertThat(formResumeEvent[0], equalTo("form resume"))
+        assertThat(formResumeEvent[4], equalTo("Jack"))
+    }
+
+    @Test
+    fun openingForm_andEnteringBlankIdentity_remainsOnIdentityPrompt() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("  ")
+            .clickKeyboardEnterWithValidationError()
+    }
+
+    @Test
+    fun openingForm_andPressingBack_returnsToMainMenu() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .closeSoftKeyboard()
+            .pressBack(MainMenuPage())
+    }
+
+    @Test
+    fun openingForm_andRotating_remainsOnIdentityPrompt() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("Blah")
+            .rotateToLandscape(IdentifyUserPromptPage("Identify User"))
+            .assertText("Blah")
+    }
+
+    @Test
+    fun minimizingAndReopeningApp_remainsOnIdentityPrompt() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .enterIdentity("Blah")
+            .minimizeAndReopenApp(IdentifyUserPromptPage("Identify User"))
+            .assertText("Blah")
+    }
+
+    @Test
+    fun openingForm_andPressingCloseCross_returnsToMainMenu() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FORM)
+            .clickFillBlankForm()
+            .clickOnFormWithIdentityPrompt("Identify User")
+            .pressClose()
+    }
+
+    @Test
+    fun openFormWithIdentifyUserFalse_proceedsToForm() {
+        rule.startAtMainMenu()
+            .copyForm(IDENTIFY_USER_AUDIT_FALSE_FORM)
+            .clickFillBlankForm()
+            .clickOnForm("Identify User False")
+            .swipeToEndScreen()
+            .clickFinalize()
+    }
+
+    companion object {
+        private const val IDENTIFY_USER_AUDIT_FORM = "identify-user-audit.xml"
+        private const val IDENTIFY_USER_AUDIT_FALSE_FORM = "identify-user-audit-false.xml"
+    }
+}
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt
@@ -478,6 +478,20 @@ abstract class Page<T : Page<T>> {
         return this as T
     }
 
+    fun <D : Page<D>?> minimizeAndReopenApp(destination: D): D {
+        val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+        // minimize
+        device.pressHome()
+
+        // reopen
+        InstrumentationRegistry.getInstrumentation().targetContext.apply {
+            val intent = packageManager.getLaunchIntentForPackage(BuildConfig.APPLICATION_ID)!!
+            startActivity(intent)
+        }
+        return destination!!.assertOnPage()
+    }
+
     fun <D : Page<D>?> killAndReopenApp(destination: D): D {
         val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -1861,7 +1861,7 @@ protected void onResume() {
                 }
             }
         } else {
-            if (formController == null) {
+            if (formController == null && !identityPromptViewModel.requiresIdentityToContinue().getValue()) {
                 // there is no formController -- fire MainMenu activity?
                 Timber.w("Starting MainMenuActivity because formController is null/formLoaderTask is null");
                 startActivity(new Intent(this, MainMenuActivity.class));