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

Commit d66825df authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Make UIDs match in GestureLauncherServiceTest. 

Currently, GestureLauncherServiceTest writes settings with
UserHandle.USER_CURRENT and then reads them back with
FAKE_USER_ID = 1337.

This works because FakeSettingsProvider is not multiuser aware.
However, an upcoming CL will make FakeSettingsProvider multiuser aware
so that we can better test multiuser scenarios such as HSUM.

Fix the test so that both reads and writes use
UserHandle.CURRENT. This matches what the service does (it always
reads settings from the current user).

Flag: TEST_ONLY
Test: test-only change
Change-Id: I8729f44a7bed0e758acf85fd7c5bc4740d3597c7
parent 984bc5be

services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java

+25 −26
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import java.util.concurrent.TimeUnit; 
@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class GestureLauncherServiceTest {



    private static final int FAKE_USER_ID = 1337;

    private static final int FAKE_SOURCE = 1982;

    private static final long INITIAL_EVENT_TIME_MILLIS = 20000L;

    private static final long IGNORED_DOWN_TIME = 1234L;
@@ -225,7 +224,7 @@ public class GestureLauncherServiceTest { 
        withDoubleTapPowerGestureActionSettingValue(LAUNCH_CAMERA_ON_DOUBLE_TAP_POWER);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -235,7 +234,7 @@ public class GestureLauncherServiceTest { 
        withCameraDoubleTapPowerDisableSettingValue(1);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -246,7 +245,7 @@ public class GestureLauncherServiceTest { 
        withDoubleTapPowerGestureActionSettingValue(LAUNCH_CAMERA_ON_DOUBLE_TAP_POWER);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -256,7 +255,7 @@ public class GestureLauncherServiceTest { 
        withCameraDoubleTapPowerDisableSettingValue(0);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -267,7 +266,7 @@ public class GestureLauncherServiceTest { 
        withDoubleTapPowerGestureActionSettingValue(LAUNCH_CAMERA_ON_DOUBLE_TAP_POWER);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -277,7 +276,7 @@ public class GestureLauncherServiceTest { 
        withCameraDoubleTapPowerDisableSettingValue(1);



        assertFalse(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -288,7 +287,7 @@ public class GestureLauncherServiceTest { 
        withDoubleTapPowerGestureActionSettingValue(LAUNCH_CAMERA_ON_DOUBLE_TAP_POWER);



        assertTrue(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -298,7 +297,7 @@ public class GestureLauncherServiceTest { 
        withCameraDoubleTapPowerDisableSettingValue(0);



        assertTrue(mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -309,7 +308,7 @@ public class GestureLauncherServiceTest { 


        assertTrue(

                mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -320,7 +319,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -332,7 +331,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -344,7 +343,7 @@ public class GestureLauncherServiceTest { 


        assertTrue(

                mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -356,7 +355,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isCameraDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -368,7 +367,7 @@ public class GestureLauncherServiceTest { 


        assertTrue(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -380,7 +379,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -392,7 +391,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -404,7 +403,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -416,7 +415,7 @@ public class GestureLauncherServiceTest { 


        assertTrue(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -428,7 +427,7 @@ public class GestureLauncherServiceTest { 


        assertFalse(

                mGestureLauncherService.isWalletDoubleTapPowerSettingEnabled(

                        mContext, FAKE_USER_ID));

                        mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -436,7 +435,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGestureEnabledConfigValue(true);

        withEmergencyGestureEnabledSettingValue(false);

        assertFalse(mGestureLauncherService.isEmergencyGestureSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -444,7 +443,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGestureEnabledConfigValue(true);

        withEmergencyGestureEnabledSettingValue(true);

        assertTrue(mGestureLauncherService.isEmergencyGestureSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -452,7 +451,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGestureEnabledConfigValue(false);

        withEmergencyGestureEnabledSettingValue(true);

        assertFalse(mGestureLauncherService.isEmergencyGestureSettingEnabled(

                mContext, FAKE_USER_ID));

                mContext, UserHandle.USER_CURRENT));

    }



    @Test
@@ -460,7 +459,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGesturePowerButtonCooldownPeriodMsValue(4000);

        assertEquals(4000,

                mGestureLauncherService.getEmergencyGesturePowerButtonCooldownPeriodMs(mContext,

                        FAKE_USER_ID));

                        UserHandle.USER_CURRENT));

    }



    @Test
@@ -468,7 +467,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGesturePowerButtonCooldownPeriodMsValue(0);

        assertEquals(0,

                mGestureLauncherService.getEmergencyGesturePowerButtonCooldownPeriodMs(mContext,

                        FAKE_USER_ID));

                        UserHandle.USER_CURRENT));

    }



    @Test
@@ -476,7 +475,7 @@ public class GestureLauncherServiceTest { 
        withEmergencyGesturePowerButtonCooldownPeriodMsValue(10000);

        assertEquals(GestureLauncherService.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS_MAX,

                mGestureLauncherService.getEmergencyGesturePowerButtonCooldownPeriodMs(mContext,

                        FAKE_USER_ID));

                        UserHandle.USER_CURRENT));

    }



    @Test