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

Commit 7a46862c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ief9d2216,Ic2959fee into main 

* changes:
  Set consistent default Locale and TimeZone before each test
  Disable the non-scenes version of test with scenes
parents 56de6fe0 2c6d36fb

packages/SystemUI/multivalentTests/src/com/android/systemui/clock/ui/viewmodel/ClockViewModelTest.kt

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import kotlin.time.Duration.Companion.days 
import kotlin.time.Duration.Companion.minutes

import kotlinx.coroutines.ExperimentalCoroutinesApi

import org.junit.After

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.any
@@ -65,6 +66,12 @@ class ClockViewModelTest : SysuiTestCase() { 
        TimeZone.setDefault(defaultTimeZone)

    }



    @Before

    fun setup() {

        Locale.setDefault(Locale.US)

        TimeZone.setDefault(TimeZone.getTimeZone("UTC"))

    }



    @Test

    fun is24HourFormatTrue_clockTextAndDescription_equalsCurrentTime() =

        kosmos.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableSceneContainer

    @EnableFlags(FLAG_DREAMS_V2)

    fun faceAuthIsRequestedWhenTransitioningFromDreamToLockscreen() =

        kosmos.runTest {