From fed68b59526eeeb09498f3d7e733eca0b5aad072 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Fri, 9 Aug 2024 18:31:31 +0200
Subject: [PATCH 1/7] Added a failing test

---
 .../feature/formentry/RequiredQuestionTest.java     |  9 +++++++++
 .../src/main/resources/forms/requiredJR275.xml      | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
index ebcbb49d7cd..da690b1ddfe 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
@@ -124,4 +124,13 @@ public void savingFormWithInvalidQuestion_shouldNotChangeTheCurrentQuestionIndex
                 .clickSave()
                 .swipeToNextQuestion("What is your age?");
     }
+
+    @Test // https://github.com/getodk/collect/issues/6327
+    public void requiredQuestionsWithAudio_ShouldDisplayAsterisk() {
+        rule.startAtMainMenu()
+                .copyForm("requiredJR275.xml")
+                .startBlankForm("required")
+                .answerQuestion("* Foo", "blah")
+                .swipeToNextQuestion("* Text with audio");
+    }
 }
diff --git a/test-forms/src/main/resources/forms/requiredJR275.xml b/test-forms/src/main/resources/forms/requiredJR275.xml
index 49acd8c24e4..2f3e5d452ce 100644
--- a/test-forms/src/main/resources/forms/requiredJR275.xml
+++ b/test-forms/src/main/resources/forms/requiredJR275.xml
@@ -3,9 +3,18 @@
   <h:head>
     <h:title>required</h:title>
     <model>
+      <itext>
+        <translation lang="default" default="true()">
+          <text id="/required/text2:label">
+            <value>Text with audio</value>
+            <value form="audio">jr://audio/blah.mp3</value>
+          </text>
+        </translation>
+      </itext>
       <instance>
         <required id="required">
           <text/>
+          <text2/>
           <meta>
             <instanceID/>
             <orx:audit/>
@@ -13,6 +22,7 @@
         </required>
       </instance>
       <bind jr:requiredMsg="Custom required message" nodeset="/required/text" required="true()" type="string"/>
+      <bind nodeset="/required/text2" required="true()" type="string"/>
       <bind nodeset="/data/orx:meta/audit" type="binary" />
       <bind calculate="concat('uuid:', uuid())" nodeset="/required/meta/instanceID" readonly="true()" type="string"/>
     </model>
@@ -21,5 +31,8 @@
     <input ref="/required/text">
       <label>Foo</label>
     </input>
+    <input ref="/required/text2">
+      <label ref="jr:itext('/required/text2:label')"/>
+    </input>
   </h:body>
 </h:html>

From ea9436f4159ac0e58a88f8a8fd29e131873b0983 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Fri, 9 Aug 2024 18:31:48 +0200
Subject: [PATCH 2/7] Removed unused code

---
 .../formentry/questions/AudioVideoImageTextLabel.java      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/questions/AudioVideoImageTextLabel.java b/collect_app/src/main/java/org/odk/collect/android/formentry/questions/AudioVideoImageTextLabel.java
index 34ebd91fb43..e50dcba2c8f 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/questions/AudioVideoImageTextLabel.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/questions/AudioVideoImageTextLabel.java
@@ -53,7 +53,6 @@ public class AudioVideoImageTextLabel extends RelativeLayout implements View.OnC
     private TextView textLabel;
     private int originalTextColor;
     private int playTextColor = Color.BLUE;
-    private CharSequence questionText;
     private SelectItemClickListener listener;
     private File videoFile;
     private File bigImageFile;
@@ -72,8 +71,6 @@ public AudioVideoImageTextLabel(Context context, AttributeSet attrs) {
     }
 
     public void setTextView(TextView questionText) {
-        this.questionText = questionText.getText();
-
         textLabel = questionText;
         textLabel.setId(R.id.text_label);
         textLabel.setOnClickListener(v -> {
@@ -87,8 +84,6 @@ public void setTextView(TextView questionText) {
     }
 
     public void setText(String questionText, boolean isRequiredQuestion, float fontSize) {
-        this.questionText = questionText;
-
         if (questionText != null && !questionText.isEmpty()) {
             textLabel.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize);
             textLabel.setText(FormEntryPromptUtils.styledQuestionText(questionText, isRequiredQuestion));
@@ -216,8 +211,6 @@ private void setupAudioButton(String audioURI, AudioHelper audioHelper) {
                 textLabel.setTextColor(playTextColor);
             } else {
                 textLabel.setTextColor(originalTextColor);
-                // then set the text to our original (brings back any html formatting)
-                textLabel.setText(questionText);
             }
         });
     }

From 2b0fa0985dfa60de414a239321bde6b314cdcff0 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Fri, 9 Aug 2024 19:42:45 +0200
Subject: [PATCH 3/7] Converted RequiredQuestionTest to kotlin

---
 .../formentry/RequiredQuestionTest.java       | 136 ------------------
 .../feature/formentry/RequiredQuestionTest.kt | 135 +++++++++++++++++
 2 files changed, 135 insertions(+), 136 deletions(-)
 delete mode 100644 collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
 create mode 100644 collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
deleted file mode 100644
index da690b1ddfe..00000000000
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.odk.collect.android.feature.formentry;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.apache.commons.csv.CSVRecord;
-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;
-import org.odk.collect.android.support.rules.CollectTestRule;
-import org.odk.collect.android.support.rules.TestRuleChain;
-
-import java.io.IOException;
-import java.util.List;
-
-// Issue number NODK-249
-@RunWith(AndroidJUnit4.class)
-public class RequiredQuestionTest {
-
-    public CollectTestRule rule = new CollectTestRule();
-
-    @Rule
-    public RuleChain copyFormChain = TestRuleChain.chain()
-            .around(rule);
-
-    @Test
-    public void requiredQuestions_ShouldDisplayAsterisk_andCustomMessageIfSkipped() {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .assertText("* Foo") //TestCase1
-                .swipeToNextQuestionWithConstraintViolation("Custom required message");  //TestCase2
-    }
-
-    @Test
-    public void pressingValidateInOptionsMenuOnSameScreen_shouldUseLatestAnswers() {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .answerQuestion("Foo", true, "blah")
-                .clickOptionsIcon()
-                .clickOnString(org.odk.collect.strings.R.string.validate)
-                .assertText(org.odk.collect.strings.R.string.success_form_validation)
-                .assertTextDoesNotExist("Custom required message");
-    }
-
-    @Test
-    public void pressingValidateInOptionsMenuOnDifferentScreen_shouldReturnToQuestionAndShowMessage() {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .clickGoToArrow()
-                .clickGoToEnd()
-                .clickOptionsIcon()
-                .clickOnString(org.odk.collect.strings.R.string.validate)
-                .assertConstraintDisplayed("Custom required message")
-                .assertQuestion("Foo", true);
-    }
-
-    @Test
-    public void pressingValidateInOptionsMenuOnDifferentScreen_shouldReturnToQuestionAndShowMessage_whenTheQuestionIsInFieldList() {
-        rule.startAtMainMenu()
-                .copyForm("requiredQuestionInFieldList.xml")
-                .startBlankForm("requiredQuestionInFieldList")
-                .clickGoToArrow()
-                .clickGoToEnd()
-                .clickOptionsIcon()
-                .clickOnString(org.odk.collect.strings.R.string.validate)
-                .assertConstraintDisplayed("Custom required message")
-                // Make sure both questions are still displayed on the same screen
-                .assertQuestion("Foo", true)
-                .assertQuestion("Bar", true);
-    }
-
-    @Test
-    public void ifRequiredQuestionIsEmpty_shouldNotBeSavedToAuditLogWhenMovingForward() throws IOException {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .swipeToNextQuestionWithConstraintViolation("Custom required message");
-
-        List<CSVRecord> auditLog = StorageUtils.getAuditLogForFirstInstance();
-        assertThat(auditLog.size(), equalTo(1));
-        assertThat(auditLog.get(0).get(0), equalTo("form start"));
-    }
-
-    @Test
-    public void ifRequiredQuestionIsEmpty_shouldNotBeSavedToAuditLogWhenFormValidated() throws IOException {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .clickOptionsIcon()
-                .clickOnString(org.odk.collect.strings.R.string.validate);
-
-        List<CSVRecord> auditLog = StorageUtils.getAuditLogForFirstInstance();
-        assertThat(auditLog.size(), equalTo(1));
-        assertThat(auditLog.get(0).get(0), equalTo("form start"));
-    }
-
-    @Test
-    public void ifRequiredQuestionIsInFieldListAndNotFirst_shouldBeValidatedProperly() {
-        rule.startAtMainMenu()
-                .copyForm("requiredQuestionInFieldList.xml")
-                .startBlankForm("requiredQuestionInFieldList")
-                .answerQuestion("Foo", true, "blah")
-                .swipeToNextQuestionWithConstraintViolation("Custom required message2")
-                .clickOptionsIcon()
-                .clickOnString(org.odk.collect.strings.R.string.validate)
-                .assertText("Custom required message2")
-                .clickGoToArrow()
-                .clickGoToEnd()
-                .clickSaveAndExitWithError("Custom required message2");
-    }
-
-    @Test // https://github.com/getodk/collect/issues/5847
-    public void savingFormWithInvalidQuestion_shouldNotChangeTheCurrentQuestionIndex() {
-        rule.startAtMainMenu()
-                .copyForm("two-question-required.xml")
-                .startBlankForm("Two Question Required")
-                .clickSave()
-                .swipeToNextQuestion("What is your age?");
-    }
-
-    @Test // https://github.com/getodk/collect/issues/6327
-    public void requiredQuestionsWithAudio_ShouldDisplayAsterisk() {
-        rule.startAtMainMenu()
-                .copyForm("requiredJR275.xml")
-                .startBlankForm("required")
-                .answerQuestion("* Foo", "blah")
-                .swipeToNextQuestion("* Text with audio");
-    }
-}
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
new file mode 100644
index 00000000000..70055137d9e
--- /dev/null
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
@@ -0,0 +1,135 @@
+package org.odk.collect.android.feature.formentry
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.MatcherAssert
+import org.hamcrest.Matchers
+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.rules.CollectTestRule
+import org.odk.collect.android.support.rules.TestRuleChain.chain
+import org.odk.collect.strings.R
+
+@RunWith(AndroidJUnit4::class)
+class RequiredQuestionTest {
+    var rule: CollectTestRule = CollectTestRule()
+
+    @get:Rule
+    var ruleChain: RuleChain = chain()
+        .around(rule)
+
+    @Test
+    fun `requiredQuestionIsMarkedWithAnAsterisk`() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .assertText("* Foo")
+    }
+
+    @Test // https://github.com/getodk/collect/issues/6327
+    fun requiredQuestionWithAudioIsMarkedWithAnAsterisk() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .answerQuestion("* Foo", "blah")
+            .swipeToNextQuestion("* Text with audio")
+    }
+
+    @Test
+    fun requiredQuestionDisplaysACustomErrorMessageIfSpecified() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .swipeToNextQuestionWithConstraintViolation("Custom required message")
+    }
+
+    @Test
+    fun validatingFormByPressingValidateInOptionsMenuOnSameScreen_usesNewlyAddedAnswers() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .answerQuestion("Foo", true, "blah")
+            .clickOptionsIcon()
+            .clickOnString(R.string.validate)
+            .assertText(R.string.success_form_validation)
+            .assertTextDoesNotExist("Custom required message")
+    }
+
+    @Test
+    fun validatingFormByPressingValidateInOptionsMenuOnDifferentScreen_movesToTheQuestionWithErrorAndDisplaysError() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .clickGoToArrow()
+            .clickGoToEnd()
+            .clickOptionsIcon()
+            .clickOnString(R.string.validate)
+            .assertConstraintDisplayed("Custom required message")
+            .assertQuestion("Foo", true)
+    }
+
+    @Test
+    fun validatingFormByPressingValidateInOptionsMenuOnDifferentScreen_movesToTheQuestionWithErrorAndDisplaysError_whenTheQuestionIsInFieldList() {
+        rule.startAtMainMenu()
+            .copyForm("requiredQuestionInFieldList.xml")
+            .startBlankForm("requiredQuestionInFieldList")
+            .clickGoToArrow()
+            .clickGoToEnd()
+            .clickOptionsIcon()
+            .clickOnString(R.string.validate)
+            .assertConstraintDisplayed("Custom required message") // Make sure both questions are still displayed on the same screen
+            .assertQuestion("Foo", true)
+            .assertQuestion("Bar", true)
+    }
+
+    @Test
+    fun emptyRequiredQuestion_isNotSavedToAuditLogOnMovingForward() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .swipeToNextQuestionWithConstraintViolation("Custom required message")
+
+        val auditLog = getAuditLogForFirstInstance()
+        MatcherAssert.assertThat(auditLog.size, Matchers.equalTo(1))
+        MatcherAssert.assertThat(auditLog[0][0], Matchers.equalTo("form start"))
+    }
+
+    @Test
+    fun emptyRequiredQuestion_isNotSavedToAuditLogOnFormValidation() {
+        rule.startAtMainMenu()
+            .copyForm("requiredJR275.xml")
+            .startBlankForm("required")
+            .clickOptionsIcon()
+            .clickOnString(R.string.validate)
+
+        val auditLog = getAuditLogForFirstInstance()
+        MatcherAssert.assertThat(auditLog.size, Matchers.equalTo(1))
+        MatcherAssert.assertThat(auditLog[0][0], Matchers.equalTo("form start"))
+    }
+
+    @Test
+    fun emptyRequiredQuestionInFieldListAndNotFirst_isValidatedProperly() {
+        rule.startAtMainMenu()
+            .copyForm("requiredQuestionInFieldList.xml")
+            .startBlankForm("requiredQuestionInFieldList")
+            .answerQuestion("Foo", true, "blah")
+            .swipeToNextQuestionWithConstraintViolation("Custom required message2")
+            .clickOptionsIcon()
+            .clickOnString(R.string.validate)
+            .assertText("Custom required message2")
+            .clickGoToArrow()
+            .clickGoToEnd()
+            .clickSaveAndExitWithError("Custom required message2")
+    }
+
+    @Test // https://github.com/getodk/collect/issues/5847
+    fun savingFormWithInvalidQuestion_doesNotChangeTheCurrentQuestionIndex() {
+        rule.startAtMainMenu()
+            .copyForm("two-question-required.xml")
+            .startBlankForm("Two Question Required")
+            .clickSave()
+            .swipeToNextQuestion("What is your age?")
+    }
+}

From 4cfde77b03f6045fea9762efc1df93de1fbe0b2a Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Fri, 9 Aug 2024 20:37:31 +0200
Subject: [PATCH 4/7] Improved test forms

---
 .../feature/formentry/RequiredQuestionTest.kt | 45 +++++++++----------
 .../main/resources/forms/requiredJR275.xml    | 38 ----------------
 .../forms/required_question_with_audio.xml    | 38 ++++++++++++++++
 ...red_question_with_custom_error_message.xml | 32 +++++++++++++
 4 files changed, 92 insertions(+), 61 deletions(-)
 delete mode 100644 test-forms/src/main/resources/forms/requiredJR275.xml
 create mode 100644 test-forms/src/main/resources/forms/required_question_with_audio.xml
 create mode 100644 test-forms/src/main/resources/forms/required_question_with_custom_error_message.xml

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
index 70055137d9e..ae1180eea81 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
@@ -23,51 +23,50 @@ class RequiredQuestionTest {
     @Test
     fun `requiredQuestionIsMarkedWithAnAsterisk`() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
-            .assertText("* Foo")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
+            .assertText("* Required question")
     }
 
     @Test // https://github.com/getodk/collect/issues/6327
     fun requiredQuestionWithAudioIsMarkedWithAnAsterisk() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
-            .answerQuestion("* Foo", "blah")
-            .swipeToNextQuestion("* Text with audio")
+            .copyForm("required_question_with_audio.xml")
+            .startBlankForm("required_question_with_audio")
+            .swipeToNextQuestion("* Required question with audio")
     }
 
     @Test
     fun requiredQuestionDisplaysACustomErrorMessageIfSpecified() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
-            .swipeToNextQuestionWithConstraintViolation("Custom required message")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
+            .swipeToNextQuestionWithConstraintViolation("Custom message")
     }
 
     @Test
     fun validatingFormByPressingValidateInOptionsMenuOnSameScreen_usesNewlyAddedAnswers() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
-            .answerQuestion("Foo", true, "blah")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
+            .answerQuestion("* Required question", "blah")
             .clickOptionsIcon()
             .clickOnString(R.string.validate)
             .assertText(R.string.success_form_validation)
-            .assertTextDoesNotExist("Custom required message")
+            .assertTextDoesNotExist("Custom message")
     }
 
     @Test
     fun validatingFormByPressingValidateInOptionsMenuOnDifferentScreen_movesToTheQuestionWithErrorAndDisplaysError() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
             .clickGoToArrow()
             .clickGoToEnd()
             .clickOptionsIcon()
             .clickOnString(R.string.validate)
-            .assertConstraintDisplayed("Custom required message")
-            .assertQuestion("Foo", true)
+            .assertConstraintDisplayed("Custom message")
+            .assertQuestion("Required question", true)
     }
 
     @Test
@@ -87,9 +86,9 @@ class RequiredQuestionTest {
     @Test
     fun emptyRequiredQuestion_isNotSavedToAuditLogOnMovingForward() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
-            .swipeToNextQuestionWithConstraintViolation("Custom required message")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
+            .swipeToNextQuestionWithConstraintViolation("Custom message")
 
         val auditLog = getAuditLogForFirstInstance()
         MatcherAssert.assertThat(auditLog.size, Matchers.equalTo(1))
@@ -99,8 +98,8 @@ class RequiredQuestionTest {
     @Test
     fun emptyRequiredQuestion_isNotSavedToAuditLogOnFormValidation() {
         rule.startAtMainMenu()
-            .copyForm("requiredJR275.xml")
-            .startBlankForm("required")
+            .copyForm("required_question_with_custom_error_message.xml")
+            .startBlankForm("required_question_with_custom_error_message")
             .clickOptionsIcon()
             .clickOnString(R.string.validate)
 
diff --git a/test-forms/src/main/resources/forms/requiredJR275.xml b/test-forms/src/main/resources/forms/requiredJR275.xml
deleted file mode 100644
index 2f3e5d452ce..00000000000
--- a/test-forms/src/main/resources/forms/requiredJR275.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<h:html xmlns="http://www.w3.org/2002/xforms" 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">
-  <h:head>
-    <h:title>required</h:title>
-    <model>
-      <itext>
-        <translation lang="default" default="true()">
-          <text id="/required/text2:label">
-            <value>Text with audio</value>
-            <value form="audio">jr://audio/blah.mp3</value>
-          </text>
-        </translation>
-      </itext>
-      <instance>
-        <required id="required">
-          <text/>
-          <text2/>
-          <meta>
-            <instanceID/>
-            <orx:audit/>
-          </meta>
-        </required>
-      </instance>
-      <bind jr:requiredMsg="Custom required message" nodeset="/required/text" required="true()" type="string"/>
-      <bind nodeset="/required/text2" required="true()" type="string"/>
-      <bind nodeset="/data/orx:meta/audit" type="binary" />
-      <bind calculate="concat('uuid:', uuid())" nodeset="/required/meta/instanceID" readonly="true()" type="string"/>
-    </model>
-  </h:head>
-  <h:body>
-    <input ref="/required/text">
-      <label>Foo</label>
-    </input>
-    <input ref="/required/text2">
-      <label ref="jr:itext('/required/text2:label')"/>
-    </input>
-  </h:body>
-</h:html>
diff --git a/test-forms/src/main/resources/forms/required_question_with_audio.xml b/test-forms/src/main/resources/forms/required_question_with_audio.xml
new file mode 100644
index 00000000000..2fc3d88ef9f
--- /dev/null
+++ b/test-forms/src/main/resources/forms/required_question_with_audio.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<h:html
+    xmlns="http://www.w3.org/2002/xforms"
+    xmlns:h="http://www.w3.org/1999/xhtml"
+    xmlns:ev="http://www.w3.org/2001/xml-events"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:jr="http://openrosa.org/javarosa"
+    xmlns:orx="http://openrosa.org/xforms"
+    xmlns:odk="http://www.opendatakit.org/xforms">
+    <h:head>
+        <h:title>required_question_with_audio</h:title>
+        <model odk:xforms-version="1.0.0">
+            <itext>
+                <translation lang="default" default="true()">
+                    <text id="/data/q1:label">
+                        <value>Required question with audio</value>
+                        <value form="audio">jr://audio/blah.mp3</value>
+                    </text>
+                </translation>
+            </itext>
+            <instance>
+                <data id="required_question_with_audio">
+                    <q1/>
+                    <meta>
+                        <instanceID/>
+                    </meta>
+                </data>
+            </instance>
+            <bind nodeset="/data/q1" type="string" required="true()"/>
+            <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" jr:preload="uid"/>
+        </model>
+    </h:head>
+    <h:body>
+        <input ref="/data/q1">
+            <label ref="jr:itext('/data/q1:label')"/>
+        </input>
+    </h:body>
+</h:html>
diff --git a/test-forms/src/main/resources/forms/required_question_with_custom_error_message.xml b/test-forms/src/main/resources/forms/required_question_with_custom_error_message.xml
new file mode 100644
index 00000000000..152625f7ff8
--- /dev/null
+++ b/test-forms/src/main/resources/forms/required_question_with_custom_error_message.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<h:html
+    xmlns="http://www.w3.org/2002/xforms"
+    xmlns:h="http://www.w3.org/1999/xhtml"
+    xmlns:ev="http://www.w3.org/2001/xml-events"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:jr="http://openrosa.org/javarosa"
+    xmlns:orx="http://openrosa.org/xforms"
+    xmlns:odk="http://www.opendatakit.org/xforms">
+    <h:head>
+        <h:title>required_question_with_custom_error_message</h:title>
+        <model odk:xforms-version="1.0.0">
+            <instance>
+                <data id="required_question_with_custom_error_message">
+                    <q1/>
+                    <meta>
+                        <instanceID/>
+                        <orx:audit/>
+                    </meta>
+                </data>
+            </instance>
+            <bind nodeset="/data/orx:meta/audit" type="binary" />
+            <bind nodeset="/data/q1" type="string" required="true()" jr:requiredMsg="Custom message"/>
+            <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" jr:preload="uid"/>
+        </model>
+    </h:head>
+    <h:body>
+        <input ref="/data/q1">
+            <label>Required question</label>
+        </input>
+    </h:body>
+</h:html>

From 5006f48c131bfe07003886ad5f9d654ae1794419 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Fri, 9 Aug 2024 20:43:05 +0200
Subject: [PATCH 5/7] Code improvements

---
 .../feature/formentry/RequiredQuestionTest.kt        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
index ae1180eea81..84836887542 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
@@ -1,8 +1,8 @@
 package org.odk.collect.android.feature.formentry
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.MatcherAssert
-import org.hamcrest.Matchers
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -91,8 +91,8 @@ class RequiredQuestionTest {
             .swipeToNextQuestionWithConstraintViolation("Custom message")
 
         val auditLog = getAuditLogForFirstInstance()
-        MatcherAssert.assertThat(auditLog.size, Matchers.equalTo(1))
-        MatcherAssert.assertThat(auditLog[0][0], Matchers.equalTo("form start"))
+        assertThat(auditLog.size, equalTo(1))
+        assertThat(auditLog[0][0], equalTo("form start"))
     }
 
     @Test
@@ -104,8 +104,8 @@ class RequiredQuestionTest {
             .clickOnString(R.string.validate)
 
         val auditLog = getAuditLogForFirstInstance()
-        MatcherAssert.assertThat(auditLog.size, Matchers.equalTo(1))
-        MatcherAssert.assertThat(auditLog[0][0], Matchers.equalTo("form start"))
+        assertThat(auditLog.size, equalTo(1))
+        assertThat(auditLog[0][0], equalTo("form start"))
     }
 
     @Test

From 5d15562227cae47dc07d5e08743bbb2775750295 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Tue, 20 Aug 2024 23:14:30 +0200
Subject: [PATCH 6/7] Removed redundant backticks

---
 .../collect/android/feature/formentry/RequiredQuestionTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
index 84836887542..caa9a9c88a6 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
@@ -21,7 +21,7 @@ class RequiredQuestionTest {
         .around(rule)
 
     @Test
-    fun `requiredQuestionIsMarkedWithAnAsterisk`() {
+    fun requiredQuestionIsMarkedWithAnAsterisk() {
         rule.startAtMainMenu()
             .copyForm("required_question_with_custom_error_message.xml")
             .startBlankForm("required_question_with_custom_error_message")

From 1f0c01d2d90074b913f7a373c5878fe1257036e9 Mon Sep 17 00:00:00 2001
From: Grzegorz Orczykowski <grzesiek2010@gmail.com>
Date: Tue, 20 Aug 2024 23:16:04 +0200
Subject: [PATCH 7/7] Improved tests

---
 .../collect/android/feature/formentry/RequiredQuestionTest.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
index caa9a9c88a6..f6de4d0eb05 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/RequiredQuestionTest.kt
@@ -25,7 +25,7 @@ class RequiredQuestionTest {
         rule.startAtMainMenu()
             .copyForm("required_question_with_custom_error_message.xml")
             .startBlankForm("required_question_with_custom_error_message")
-            .assertText("* Required question")
+            .assertQuestion("Required question", true)
     }
 
     @Test // https://github.com/getodk/collect/issues/6327
@@ -33,7 +33,7 @@ class RequiredQuestionTest {
         rule.startAtMainMenu()
             .copyForm("required_question_with_audio.xml")
             .startBlankForm("required_question_with_audio")
-            .swipeToNextQuestion("* Required question with audio")
+            .swipeToNextQuestion("Required question with audio", true)
     }
 
     @Test