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

Commit fdbbae9f authored by Robert Horvath's avatar Robert Horvath
Browse files

Call #clearSettingsProvider in PowerManagerServiceTest 

Add calls to FakeSettingsProvider.clearSettingsProvider in setUp and
tearDown.

While PowerManagerServiceTest uses FakeSettingsProvider to
interact with a fake version of Settings and stay independent of system
state, this does not work if run together with other tests that do
access the real Settings, as Settings caches the first ContentProvider
it sees in the process.

Test: atest com.android.server.power.PowerManagerServiceTest
Bug: 151114486
Change-Id: I04d11cfcaef89dc1832a5f57af21c815e7861d11
parent 711ba268

services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public class PowerManagerServiceTest { 
    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        FakeSettingsProvider.clearSettingsProvider();



        mPowerSaveState = new PowerSaveState.Builder()

                .setBatterySaverEnabled(BATTERY_SAVER_ENABLED)
@@ -255,6 +256,7 @@ public class PowerManagerServiceTest { 
        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

        LocalServices.removeServiceForTest(BatteryManagerInternal.class);

        LocalServices.removeServiceForTest(ActivityManagerInternal.class);

        FakeSettingsProvider.clearSettingsProvider();

    }



    /**