test: fix ActivityScenario memory leaks

Issue 21168

Assisted-by: Claude Opus 4.8 - all

Author: david-allison

AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt

@@ -485,6 +485,7 @@ class CardTemplateEditorTest : RobolectricTest() {
                     .start()
                     .resume()
                     .visible()
+            saveControllerForCleanup(templateEditorController)
             testEditor = templateEditorController.get()
             shadowTestEditor = shadowOf(testEditor)
             assertFalse("Note type should not have changed yet", testEditor.noteTypeHasChanged())

AnkiDroid/src/test/java/com/ichi2/anki/pages/StatisticsTest.kt

@@ -42,13 +42,15 @@ class StatisticsTest : RobolectricTest() {
     @Test
     fun `shows 'Default' deck when collection is empty`() =
         runTest {
-            ActivityScenario.launch<SingleFragmentActivity>(
-                StatisticsDestination().toIntent(
-                    targetContext,
-                ),
-            )
-            advanceUntilIdle()
-            onView(withText("Default")).check(matches(isDisplayed()))
+            ActivityScenario
+                .launch<SingleFragmentActivity>(
+                    StatisticsDestination().toIntent(
+                        targetContext,
+                    ),
+                ).use {
+                    advanceUntilIdle()
+                    onView(withText("Default")).check(matches(isDisplayed()))
+                }
         }
 
     @Test
@@ -59,19 +61,21 @@ class StatisticsTest : RobolectricTest() {
             val testDeck1 = addDeck(testDeckName1)
             withCol { decks.select(testDeck1) }
             addDeck(testDeckName2)
-            ActivityScenario.launch<SingleFragmentActivity>(
-                StatisticsDestination().toIntent(
-                    targetContext,
-                ),
-            )
-            advanceUntilIdle()
-            onView(withId(R.id.deck_name)).check(matches(withText(testDeckName1)))
-            onView(withId(R.id.deck_name)).perform(click())
-            advanceUntilIdle()
-            // select test deck 2
-            onView(withText(testDeckName2)).inRoot(isDialog()).perform(click())
-            // check the activity that it has the new deck name
-            onView(withId(R.id.deck_name)).check(matches(withText(testDeckName2)))
+            ActivityScenario
+                .launch<SingleFragmentActivity>(
+                    StatisticsDestination().toIntent(
+                        targetContext,
+                    ),
+                ).use {
+                    advanceUntilIdle()
+                    onView(withId(R.id.deck_name)).check(matches(withText(testDeckName1)))
+                    onView(withId(R.id.deck_name)).perform(click())
+                    advanceUntilIdle()
+                    // select test deck 2
+                    onView(withText(testDeckName2)).inRoot(isDialog()).perform(click())
+                    // check the activity that it has the new deck name
+                    onView(withId(R.id.deck_name)).check(matches(withText(testDeckName2)))
+                }
         }
 
     @Test
@@ -93,6 +97,6 @@ class StatisticsTest : RobolectricTest() {
                     assertFalse(deckSelectionDialog.requireArguments().getBoolean(DeckSelectionDialog.ARG_ALLOW_ALL, true))
                     assertFalse(deckSelectionDialog.requireArguments().getBoolean(DeckSelectionDialog.ARG_ALLOW_FILTERED, true))
                     assertTrue(deckSelectionDialog.requireArguments().getBoolean(DeckSelectionDialog.ARG_SKIP_EMPTY_DEFAULT, false))
-                }
+                }.close()
         }
 }

AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesTest.kt

@@ -80,12 +80,12 @@ class PreferencesTest : RobolectricTest() {
     /** checks if any of the Preferences fragments throws while being created */
     @Test
     fun fragmentsDoNotThrowOnCreation() {
-        val activityScenario = ActivityScenario.launch<PreferencesActivity>(PreferencesActivity.getIntent(targetContext))
-
-        activityScenario.onActivity { activity ->
-            PreferenceTestUtils.getAllPreferencesFragments(activity).forEach {
-                activity.supportFragmentManager.commitNow {
-                    add(R.id.settings_container, it)
+        ActivityScenario.launch<PreferencesActivity>(PreferencesActivity.getIntent(targetContext)).use { activityScenario ->
+            activityScenario.onActivity { activity ->
+                PreferenceTestUtils.getAllPreferencesFragments(activity).forEach {
+                    activity.supportFragmentManager.commitNow {
+                        add(R.id.settings_container, it)
+                    }
                 }
             }
         }

AnkiDroid/src/test/java/com/ichi2/anki/preferences/PrefsSearchBarTest.kt

@@ -88,11 +88,13 @@ class PrefsSearchBarTest : RobolectricTest() {
 
     private fun getPreferencesActivity(): PreferencesActivity {
         val intent = PreferencesActivity.getIntent(targetContext)
-        return Robolectric
-            .buildActivity(PreferencesActivity::class.java, intent)
-            .create()
-            .start()
-            .resume()
-            .get()
+        val controller =
+            Robolectric
+                .buildActivity(PreferencesActivity::class.java, intent)
+                .create()
+                .start()
+                .resume()
+        saveControllerForCleanup(controller)
+        return controller.get()
     }
 }

AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerBigScreenTest.kt

@@ -30,6 +30,6 @@ class ReviewerBigScreenTest : RobolectricTest() {
     fun `sw600dp layout is initialized`() {
         ensureCollectionLoadIsSynchronous()
         val intent = ReviewerFragment.getIntent(targetContext)
-        ActivityScenario.launch<CardViewerActivity>(intent)
+        ActivityScenario.launch<CardViewerActivity>(intent).close()
     }
 }

AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/StateFlowLifecycleCollectionTest.kt

@@ -36,6 +36,7 @@ class StateFlowLifecycleCollectionTest : RobolectricTest() {
     @Test
     fun `concurrent value change does not skip UI update`() {
         val controller = Robolectric.buildActivity(AnkiActivity::class.java, Intent())
+        saveControllerForCleanup(controller)
         val flow = MutableStateFlow(0)
         val concurrentFlow =
             ConcurrentStateFlow(flow) { emitted ->