From 43262eafef4331cae9553559037891a315165bdd Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Wed, 18 Sep 2024 16:36:34 +0100
Subject: [PATCH] tests: standardize activity cleanup

`startActivityNormallyOpenCollectionWithIntent` calls
`saveControllerForCleanup`, previously:

**DeckPickerWidgetConfigTest**
Did not perform cleanup

**CardAnalysisWidgetConfigTest**
Manually performed cleanup

This may fix Issue 17010: `testLoadSavedPreferences` was flaky
---
 .../cardanalysis/CardAnalysisWidgetConfigTest.kt    | 13 +------------
 .../widget/deckpicker/DeckPickerWidgetConfigTest.kt |  6 +-----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/cardanalysis/CardAnalysisWidgetConfigTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/cardanalysis/CardAnalysisWidgetConfigTest.kt
index 4a138040b8..406e5696b3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/cardanalysis/CardAnalysisWidgetConfigTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/cardanalysis/CardAnalysisWidgetConfigTest.kt
@@ -28,7 +28,6 @@ import com.ichi2.widget.cardanalysis.CardAnalysisWidgetConfig
 import com.ichi2.widget.cardanalysis.CardAnalysisWidgetPreferences
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -53,22 +52,12 @@ class CardAnalysisWidgetConfigTest : RobolectricTest() {
             putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 1)
         }
 
-        activity = Robolectric.buildActivity(CardAnalysisWidgetConfig::class.java, intent)
-            .create()
-            .start()
-            .resume()
-            .get()
+        activity = startActivityNormallyOpenCollectionWithIntent(CardAnalysisWidgetConfig::class.java, intent)
 
         // Ensure deckAdapter is initialized
         activity.initializeUIComponents()
     }
 
-    @After
-    override fun tearDown() {
-        super.tearDown()
-        activity.finish()
-    }
-
     /**
      * Tests the functionality of saving selected decks to preferences.
      *
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetConfigTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetConfigTest.kt
index a89c08220c..a85178d11c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetConfigTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetConfigTest.kt
@@ -52,11 +52,7 @@ class DeckPickerWidgetConfigTest : RobolectricTest() {
             putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 1)
         }
 
-        activity = Robolectric.buildActivity(DeckPickerWidgetConfig::class.java, intent)
-            .create()
-            .start()
-            .resume()
-            .get()
+        activity = startActivityNormallyOpenCollectionWithIntent(DeckPickerWidgetConfig::class.java, intent)
 
         // Ensure deckAdapter is initialized
         activity.initializeUIComponents()