Removed the regression test package part3

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java

@@ -200,4 +200,29 @@ public void regularGroupThatWrapsARepeatableGroupShouldBeTreatedAsARegularOne()
                 .assertPath("Outer")
                 .assertNotRemovableGroup();
     }
+
+    @Test
+    public void when_openHierarchyViewFromLastPage_should_mainGroupViewBeVisible() {
+        rule.startAtMainMenu()
+                .copyForm("repeat_group_form.xml")
+                .startBlankFormWithRepeatGroup("Repeat Group", "Grp1")
+                .clickOnDoNotAdd(new FormEntryPage("Repeat Group"))
+                .clickGoToArrow()
+                .clickJumpEndButton()
+                .clickGoToArrow()
+                .checkIfElementInHierarchyMatchesToText("Group Name", 0);
+    }
+
+    @Test
+    public void hierachyView_shouldNotChangeAfterScreenRotation() {
+        rule.startAtMainMenu()
+                .copyForm("repeat_group_form.xml")
+                .startBlankFormWithRepeatGroup("Repeat Group", "Grp1")
+                .clickOnDoNotAdd(new FormEntryPage("Repeat Group"))
+                .clickGoToArrow()
+                .clickGoUpIcon()
+                .checkIfElementInHierarchyMatchesToText("Group Name", 0)
+                .rotateToLandscape(new FormHierarchyPage("Repeat Group"))
+                .checkIfElementInHierarchyMatchesToText("Group Name", 0);
+    }
 }

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/InvalidFormTest.kt

@@ -0,0 +1,50 @@
+package org.odk.collect.android.feature.formentry
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+import org.odk.collect.android.support.pages.FormEntryPage
+import org.odk.collect.android.support.pages.MainMenuPage
+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 InvalidFormTest {
+    private var rule = CollectTestRule()
+
+    @get:Rule
+    var copyFormChain: RuleChain = chain().around(rule)
+
+    @Test
+    fun brokenForm_shouldNotBeVisibleOnFormList() {
+        rule.startAtMainMenu()
+            .copyForm("invalid-form.xml")
+            .clickFillBlankForm()
+            .checkIsSnackbarErrorVisible("org.javarosa.xform.parse.XFormParseException: Cycle detected in form's relevant and calculation logic!")
+            .assertTextDoesNotExist("invalid-form")
+    }
+
+    @Test
+    fun app_ShouldNotCrash_whenFillingFormsWithEmptyGroupFieldList() {
+        MainMenuPage()
+            .copyForm("emptyGroupFieldList.xml")
+            .clickFillBlankForm()
+            .clickOnEmptyForm("emptyGroupFieldList")
+            .clickFinalize()
+            .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
+    }
+
+    @Test
+    fun app_ShouldNotCrash_whenFillingFormsWithRepeatInFieldList() {
+        rule.startAtMainMenu()
+            .copyForm("repeat_in_field_list.xml")
+            .startBlankFormWithError("repeat_in_field_list")
+            .clickOK(FormEntryPage("repeat_in_field_list"))
+            .swipeToEndScreen()
+            .clickFinalize()
+            .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
+    }
+}