test: fix EmptyFragmentActivity memory leaks

Issue 21168

Assisted-by: Claude Opus 4.8 - all

Author: david-allison

AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt

@@ -89,38 +89,39 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
         runTest {
             val note = createFindReplaceTestNote("A", "kart", "kilogram")
             val file = IdsFile(targetContext.cacheDir, listOf(note.id))
-            val scenario =
-                FragmentScenario.launch(
+            FragmentScenario
+                .launch(
                     fragmentClass = FindAndReplaceDialogFragment::class.java,
                     fragmentArgs = bundleOf(FindAndReplaceDialogFragment.ARG_IDS to file),
                     themeResId = R.style.Theme_Light,
-                )
-            scenario.onFragment { fragment ->
-                advanceUntilIdle()
-                onView(withId(R.id.only_selected_notes_check_box))
-                    .inRoot(isDialog())
-                    .check(matches(isEnabled()))
-                onView(withId(R.id.only_selected_notes_check_box))
-                    .inRoot(isDialog())
-                    .check(matches(isChecked()))
-                // 2 default field options + 2 fields from the only note selected
-                val allTargets =
-                    targetContext.getDefaultTargets() + listOf("Afield0", "Afield1")
-                assertThat(fragment.adapter.items, equalTo(allTargets))
-            }
-            scenario.recreate()
-            scenario.onFragment { fragment ->
-                advanceUntilIdle()
-                onView(withId(R.id.only_selected_notes_check_box))
-                    .inRoot(isDialog())
-                    .check(matches(isEnabled()))
-                onView(withId(R.id.only_selected_notes_check_box))
-                    .inRoot(isDialog())
-                    .check(matches(isChecked()))
-                // check that the target list from before the recreate call wasn't reset
-                val allTargets = targetContext.getDefaultTargets() + listOf("Afield0", "Afield1")
-                assertThat(fragment.adapter.items, equalTo(allTargets))
-            }
+                ).use { scenario ->
+                    scenario.onFragment { fragment ->
+                        advanceUntilIdle()
+                        onView(withId(R.id.only_selected_notes_check_box))
+                            .inRoot(isDialog())
+                            .check(matches(isEnabled()))
+                        onView(withId(R.id.only_selected_notes_check_box))
+                            .inRoot(isDialog())
+                            .check(matches(isChecked()))
+                        // 2 default field options + 2 fields from the only note selected
+                        val allTargets =
+                            targetContext.getDefaultTargets() + listOf("Afield0", "Afield1")
+                        assertThat(fragment.adapter.items, equalTo(allTargets))
+                    }
+                    scenario.recreate()
+                    scenario.onFragment { fragment ->
+                        advanceUntilIdle()
+                        onView(withId(R.id.only_selected_notes_check_box))
+                            .inRoot(isDialog())
+                            .check(matches(isEnabled()))
+                        onView(withId(R.id.only_selected_notes_check_box))
+                            .inRoot(isDialog())
+                            .check(matches(isChecked()))
+                        // check that the target list from before the recreate call wasn't reset
+                        val allTargets = targetContext.getDefaultTargets() + listOf("Afield0", "Afield1")
+                        assertThat(fragment.adapter.items, equalTo(allTargets))
+                    }
+                }
         }
 
     private fun onFindReplaceFragment(
@@ -133,7 +134,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
                 fragmentClass = FindAndReplaceDialogFragment::class.java,
                 fragmentArgs = bundleOf(FindAndReplaceDialogFragment.ARG_IDS to file),
                 themeResId = R.style.Theme_Light,
-            ).onFragment { fragment -> fragment.action() }
+            ).use { scenario -> scenario.onFragment { fragment -> fragment.action() } }
     }
 
     /**

AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt

@@ -36,9 +36,7 @@ import org.junit.runner.RunWith
 class ExportDialogFragmentTest : RobolectricTest() {
     @Test
     fun `collection export options are initialized correctly`() {
-        launchFragment<ExportDialogFragment>(
-            themeResId = R.style.Theme_Light,
-        ).onFragment {
+        onExportDialog {
             // Select export type as anki collection package.
             onView(withId(R.id.export_type_selector)).inRoot(isDialog()).perform(click())
             onData(containsString(TR.exportingAnkiCollectionPackage()))
@@ -62,9 +60,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
 
     @Test
     fun `apkg export options are initialized correctly`() {
-        launchFragment<ExportDialogFragment>(
-            themeResId = R.style.Theme_Light,
-        ).onFragment {
+        onExportDialog {
             // Select export type as anki deck package.
             onView(withId(R.id.export_type_selector)).inRoot(isDialog()).perform(click())
             onData(containsString(TR.exportingAnkiDeckPackage()))
@@ -100,9 +96,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
 
     @Test
     fun `Legacy export checkbox(default false) is shown only for collection and apkg`() {
-        launchFragment<ExportDialogFragment>(
-            themeResId = R.style.Theme_Light,
-        ).onFragment {
+        onExportDialog {
             // check legacy checkboxes status for collection export
             onView(withId(R.id.export_type_selector)).inRoot(isDialog()).perform(click())
             onData(containsString(TR.exportingAnkiCollectionPackage()))
@@ -158,4 +152,10 @@ class ExportDialogFragmentTest : RobolectricTest() {
                 .check(matches(not(isDisplayed())))
         }
     }
+
+    /** Launches [ExportDialogFragment] and executes [action] on the fragment. */
+    private fun onExportDialog(action: ExportDialogFragment.() -> Unit) =
+        launchFragment<ExportDialogFragment>(
+            themeResId = R.style.Theme_Light,
+        ).use { scenario -> scenario.onFragment { action(it) } }
 }

AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt

@@ -152,10 +152,10 @@ class SetDueDateDialogTest : RobolectricTest() {
             fragmentArgs = dialog.arguments,
         ) {
             return@launchFragment dialog
-        }.apply {
-            moveToState(Lifecycle.State.RESUMED)
+        }.use { scenario ->
+            scenario.moveToState(Lifecycle.State.RESUMED)
             advanceRobolectricLooper()
-            this.onFragment {
+            scenario.onFragment {
                 action(it)
             }
         }