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

Commit 44cce939 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Actually skip server flag changes in tests." into tm-qpr-dev am: b6959343 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21402524



Change-Id: I6fa18be2047ff66054208f0251a4d5b4103f88f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecaa149a b6959343

packages/SystemUI/src/com/android/systemui/flags/ServerFlagReader.kt

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ class ServerFlagReaderImpl @Inject constructor( 
        override fun onPropertiesChanged(properties: DeviceConfig.Properties) {

            if (isTestHarness) {

                Log.w(TAG, "Ignore server flag changes in Test Harness mode.")

                return

            }

            if (properties.namespace != namespace) {

                return

packages/SystemUI/tests/src/com/android/systemui/flags/ServerFlagReaderImplTest.kt

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import org.junit.Before 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations
@@ -58,4 +59,16 @@ class ServerFlagReaderImplTest : SysuiTestCase() { 


        verify(changeListener).onChange(flag)

    }



    @Test

    fun testChange_ignoresListenersDuringTest() {

        val serverFlagReader = ServerFlagReaderImpl(NAMESPACE, deviceConfig, executor, true)

        val flag = ReleasedFlag(1, "1", "test")

        serverFlagReader.listenForChanges(listOf(flag), changeListener)



        deviceConfig.setProperty(NAMESPACE, "flag_override_1", "1", false)

        executor.runAllReady()



        verify(changeListener, never()).onChange(flag)

    }

}