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

Commit 262ef7dc authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Fix flakiness in WMShellUnitTests 

Bug: 351057619
Bug: 356984054
Test: atest WMShellUnitTests --iteration 10
Flag: EXEMPT fix to unit tests
Change-Id: Ib9203be8550c0ab252c904b81552e366c2d12164
parent 6a4c1178

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlagsTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.O 
import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY

import com.google.common.truth.Truth.assertThat

import org.junit.Before

import org.junit.After

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -49,9 +49,9 @@ class DesktopModeFlagsTest : ShellTestCase() { 


  @JvmField @Rule val setFlagsRule = SetFlagsRule()



  @Before

  fun setUp() {

    resetCache()

  @After

  fun tearDown() {

    resetToggleOverrideCache()

  }



  // TODO(b/348193756): Add tests
@@ -338,7 +338,7 @@ class DesktopModeFlagsTest : ShellTestCase() { 
    }

  }



  private fun resetCache() {

  private fun resetToggleOverrideCache() {

    val cachedToggleOverride =

      DesktopModeFlags::class.java.getDeclaredField("cachedToggleOverride")

    cachedToggleOverride.isAccessible = true