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

Commit a6fedf6e authored by JW Wang's avatar JW Wang
Browse files

Set device configs before starting tests (2/n) 

Otherwise some tests (testFailureHistoryIsPreserved) which
assume default device config values might fail.

Bug: 178675924
Test: atest PackageWatchdogTest
Change-Id: I44c51d0df6973420becf01582ed2603d869a7231
parent 5f4e3f8f

tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java

+10 −14
Original line number Original line Diff line number Diff line
@@ -112,7 +112,8 @@ public class PackageWatchdogTest { 
        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        new File(InstrumentationRegistry.getContext().getFilesDir(),

        new File(InstrumentationRegistry.getContext().getFilesDir(),

                "package-watchdog.xml").delete();

                "package-watchdog.xml").delete();

        adoptShellPermissions(Manifest.permission.READ_DEVICE_CONFIG);

        adoptShellPermissions(Manifest.permission.READ_DEVICE_CONFIG,

                Manifest.permission.WRITE_DEVICE_CONFIG);

        mTestLooper = new TestLooper();

        mTestLooper = new TestLooper();

        mSpyContext = spy(InstrumentationRegistry.getContext());

        mSpyContext = spy(InstrumentationRegistry.getContext());

        when(mSpyContext.getPackageManager()).thenReturn(mMockPackageManager);

        when(mSpyContext.getPackageManager()).thenReturn(mMockPackageManager);
@@ -157,6 +158,14 @@ public class PackageWatchdogTest { 
                    return storedValue == null ? defaultValue : Long.parseLong(storedValue);

                    return storedValue == null ? defaultValue : Long.parseLong(storedValue);

                }

                }

        ).when(() -> SystemProperties.getLong(anyString(), anyLong()));

        ).when(() -> SystemProperties.getLong(anyString(), anyLong()));



        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

                PackageWatchdog.PROPERTY_WATCHDOG_EXPLICIT_HEALTH_CHECK_ENABLED,

                Boolean.toString(true), false);



        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                Integer.toString(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_COUNT), false);

    }

    }





    @After

    @After
@@ -611,10 +620,6 @@ public class PackageWatchdogTest { 
     */

     */

    @Test

    @Test

    public void testExplicitHealthCheckStateChanges() throws Exception {

    public void testExplicitHealthCheckStateChanges() throws Exception {

        adoptShellPermissions(

                Manifest.permission.WRITE_DEVICE_CONFIG,

                Manifest.permission.READ_DEVICE_CONFIG);



        TestController controller = new TestController();

        TestController controller = new TestController();

        PackageWatchdog watchdog = createWatchdog(controller, true /* withPackagesReady */);

        PackageWatchdog watchdog = createWatchdog(controller, true /* withPackagesReady */);

        TestObserver observer = new TestObserver(OBSERVER_NAME_1,

        TestObserver observer = new TestObserver(OBSERVER_NAME_1,
@@ -807,9 +812,6 @@ public class PackageWatchdogTest { 
    /** Test default values are used when device property is invalid. */

    /** Test default values are used when device property is invalid. */

    @Test

    @Test

    public void testInvalidConfig_watchdogTriggerFailureCount() {

    public void testInvalidConfig_watchdogTriggerFailureCount() {

        adoptShellPermissions(

                Manifest.permission.WRITE_DEVICE_CONFIG,

                Manifest.permission.READ_DEVICE_CONFIG);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                Integer.toString(-1), /*makeDefault*/false);

                Integer.toString(-1), /*makeDefault*/false);
@@ -835,9 +837,6 @@ public class PackageWatchdogTest { 
    /** Test default values are used when device property is invalid. */

    /** Test default values are used when device property is invalid. */

    @Test

    @Test

    public void testInvalidConfig_watchdogTriggerDurationMillis() {

    public void testInvalidConfig_watchdogTriggerDurationMillis() {

        adoptShellPermissions(

                Manifest.permission.WRITE_DEVICE_CONFIG,

                Manifest.permission.READ_DEVICE_CONFIG);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                Integer.toString(2), /*makeDefault*/false);

                Integer.toString(2), /*makeDefault*/false);
@@ -915,9 +914,6 @@ public class PackageWatchdogTest { 
    /** Test we are notified when enough failures are triggered within any window. */

    /** Test we are notified when enough failures are triggered within any window. */

    @Test

    @Test

    public void testFailureTriggerWindow() {

    public void testFailureTriggerWindow() {

        adoptShellPermissions(

                Manifest.permission.WRITE_DEVICE_CONFIG,

                Manifest.permission.READ_DEVICE_CONFIG);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                PackageWatchdog.PROPERTY_WATCHDOG_TRIGGER_FAILURE_COUNT,

                Integer.toString(3), /*makeDefault*/false);

                Integer.toString(3), /*makeDefault*/false);