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

Commit 7a8dde25 authored by Yi Jiang's avatar Yi Jiang
Browse files

Fixes ScreenUndimDetectorTest 

Do not call setUp() multiple times during the test. setUp() method will
create a new instance of the detector every time. Instead, we should
just reset the detector and reuse it.

Test: atest ScreenUndimDetectorTest
Bug: 284387743

Change-Id: Iaa28a5ab6c936ffe5de23a193d1883c621ae9c65
parent 87b48447

services/tests/mockingservicestests/src/com/android/server/power/ScreenUndimDetectorTest.java

+12 −5
Original line number Original line Diff line number Diff line
@@ -109,8 +109,8 @@ public class ScreenUndimDetectorTest { 
    public void recordScreenPolicy_disabledByFlag_noop() {

    public void recordScreenPolicy_disabledByFlag_noop() {

        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_KEEP_SCREEN_ON_ENABLED, Boolean.FALSE.toString(), false /*makeDefault*/);

                KEY_KEEP_SCREEN_ON_ENABLED, Boolean.FALSE.toString(), false /*makeDefault*/);

        mScreenUndimDetector.readValuesFromDeviceConfig();





        setup();

        mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_DIM);

        mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_DIM);

        mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_BRIGHT);

        mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_BRIGHT);
@@ -120,7 +120,7 @@ public class ScreenUndimDetectorTest { 
    @Test

    @Test

    public void recordScreenPolicy_samePolicy_noop() {

    public void recordScreenPolicy_samePolicy_noop() {

        for (int policy : ALL_POLICIES) {

        for (int policy : ALL_POLICIES) {

            setup();

            resetDetector();

            mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);

            mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);

            mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);

            mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);
@@ -154,7 +154,7 @@ public class ScreenUndimDetectorTest { 
                if (from == POLICY_DIM && to == POLICY_BRIGHT) {

                if (from == POLICY_DIM && to == POLICY_BRIGHT) {

                    continue;

                    continue;

                }

                }

                setup();

                resetDetector();

                mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, from);

                mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, from);

                mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, to);

                mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, to);
@@ -295,7 +295,8 @@ public class ScreenUndimDetectorTest { 
    @Test

    @Test

    public void recordScreenPolicy_dimToNonBright_resets() {

    public void recordScreenPolicy_dimToNonBright_resets() {

        for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {

        for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {

            setup();

            resetDetector();



            mScreenUndimDetector.mUndimCounter = 1;

            mScreenUndimDetector.mUndimCounter = 1;

            mScreenUndimDetector.mUndimCounterStartedMillis = 123;

            mScreenUndimDetector.mUndimCounterStartedMillis = 123;

            mScreenUndimDetector.mWakeLock.acquire();

            mScreenUndimDetector.mWakeLock.acquire();
@@ -313,7 +314,8 @@ public class ScreenUndimDetectorTest { 
    @Test

    @Test

    public void recordScreenPolicy_brightToNonDim_resets() {

    public void recordScreenPolicy_brightToNonDim_resets() {

        for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {

        for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {

            setup();

            resetDetector();



            mScreenUndimDetector.mUndimCounter = 1;

            mScreenUndimDetector.mUndimCounter = 1;

            mScreenUndimDetector.mUndimCounterStartedMillis = 123;

            mScreenUndimDetector.mUndimCounterStartedMillis = 123;

            mScreenUndimDetector.mWakeLock.acquire();

            mScreenUndimDetector.mWakeLock.acquire();
@@ -356,4 +358,9 @@ public class ScreenUndimDetectorTest { 
            }

            }

        }

        }

    }

    }



    private void resetDetector() {

        mScreenUndimDetector.reset();

        mScreenUndimDetector.mCurrentScreenPolicy = 0;

    }

}
 
}