Merge "Stop enabling the Boot Aware Launcher prefs code during Tests after running LauncherPref unit tests." into tm-qpr-dev
diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt
index e675add..fb4da0c 100644
--- a/src/com/android/launcher3/LauncherPrefs.kt
+++ b/src/com/android/launcher3/LauncherPrefs.kt
@@ -36,6 +36,8 @@
* Use same context for shared preferences, so that we use a single cached instance
*
* TODO(b/262721340): Replace all direct SharedPreference refs with LauncherPrefs / Item methods.
+ * TODO(b/274501660): Fix ReorderWidgets#simpleReorder test before enabling
+ * isBootAwareStartupDataEnabled
*/
class LauncherPrefs(private val encryptedContext: Context) {
private val deviceProtectedStorageContext =
@@ -228,7 +230,7 @@
* files.
*
* @return a list of editors with all transactions added so that the caller can determine to use
- * .apply() or .commit()
+ * .apply() or .commit()
*/
private fun prepareToRemove(items: Array<out Item>): List<SharedPreferences.Editor> {
val itemsPerFile = items.groupBy { it.encryptedPrefs }.toMutableMap()
diff --git a/tests/src/com/android/launcher3/LauncherPrefsTest.kt b/tests/src/com/android/launcher3/LauncherPrefsTest.kt
index 41ef3de..d59e02a 100644
--- a/tests/src/com/android/launcher3/LauncherPrefsTest.kt
+++ b/tests/src/com/android/launcher3/LauncherPrefsTest.kt
@@ -25,6 +25,8 @@
import com.google.common.truth.Truth.assertThat
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
+import org.junit.AfterClass
+import org.junit.BeforeClass
import org.junit.Test
import org.junit.runner.RunWith
@@ -45,8 +47,18 @@
private val context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }
private val launcherPrefs by lazy { LauncherPrefs.get(context) }
- init {
- isBootAwareStartupDataEnabled = true
+ companion object {
+ @BeforeClass
+ @JvmStatic
+ fun setup() {
+ isBootAwareStartupDataEnabled = true
+ }
+
+ @AfterClass
+ @JvmStatic
+ fun teardown() {
+ isBootAwareStartupDataEnabled = false
+ }
}
@Test