Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956b88e5 authored by Stefan Andonian's avatar Stefan Andonian
Browse files

Stop enabling the Boot Aware Launcher prefs code during Tests after 

running LauncherPref unit tests.

There is something in the LauncherPrefs code that interacts with the
boot aware shared preference data that is not compatible with the
Widgets.Reorder tests. A todo has been added to fix that before
releasing that feature. For now, implementing a simple fix to stop
enabling this feature for while doing post submit testing.

Bug: 271434610
Test: Used go/abdt to verify that this CL fixes the post submit tests.
They no longer fail like they did before this was pushed.

Change-Id: Id6bd94f5d0e0ee9afc2ccea3a4808cf723a4e688
parent d7d58e2a

src/com/android/launcher3/LauncherPrefs.kt

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.launcher3.util.Themes 
 * 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 =

tests/src/com/android/launcher3/LauncherPrefsTest.kt

+14 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import com.android.launcher3.LauncherPrefs.Companion.BOOT_AWARE_PREFS_KEY 
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,10 +47,20 @@ class LauncherPrefsTest { 
    private val context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

    private val launcherPrefs by lazy { LauncherPrefs.get(context) }



    init {

    companion object {

        @BeforeClass

        @JvmStatic

        fun setup() {

            isBootAwareStartupDataEnabled = true

        }



        @AfterClass

        @JvmStatic

        fun teardown() {

            isBootAwareStartupDataEnabled = false

        }

    }



    @Test

    fun has_keyMissingFromLauncherPrefs_returnsFalse() {

        assertThat(launcherPrefs.has(TEST_BOOLEAN_ITEM)).isFalse()