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

Commit 9a782e21 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Move constant asserts into static blocks 

Bug: 315192399
Test: atest AlertingNotificationManagerTest
Test: atest HeadsUpManagerTest
Test: atest HeadsUpManagerPhoneTest
Flag: NA
Change-Id: I38f26f636487d43946ffa6a9abf54221546ddbe9
parent 53b12ad7

packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java

+6 −4
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ public class AlertingNotificationManagerTest extends SysuiTestCase { 


    @Mock protected ExpandableNotificationRow mRow;



    static {

        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);

        assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_TIMEOUT_TIME);

    }



    private static class TestableAlertingNotificationManager extends AlertingNotificationManager {

        private AlertEntry mLastCreatedEntry;
@@ -167,10 +173,6 @@ public class AlertingNotificationManagerTest extends SysuiTestCase { 
    @Before

    public void setUp() {

        mTestHandler = Handler.createAsync(Looper.myLooper());



        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);

        assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_TIMEOUT_TIME);

    }



    @After

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java

+13 −11
Original line number Diff line number Diff line
@@ -76,6 +76,19 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
    private final HeadsUpManagerLogger mLogger = spy(new HeadsUpManagerLogger(logcatLogBuffer()));

    @Mock private AccessibilityManagerWrapper mAccessibilityMgr;



    static {

        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);

        assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_A11Y_AUTO_DISMISS_TIME);



        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_AUTO_DISMISS_TIME).isLessThan(

                TEST_TIMEOUT_TIME);

        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(

                TEST_TIMEOUT_TIME);

        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_A11Y_AUTO_DISMISS_TIME).isLessThan(

                TEST_A11Y_TIMEOUT_TIME);

    }



    private final class TestableHeadsUpManager extends BaseHeadsUpManager {

        TestableHeadsUpManager(Context context,

                HeadsUpManagerLogger logger,
@@ -216,17 +229,6 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
    public void setUp() {

        initMocks(this);

        super.setUp();



        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);

        assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_A11Y_AUTO_DISMISS_TIME);



        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_AUTO_DISMISS_TIME).isLessThan(

                TEST_TIMEOUT_TIME);

        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(

                TEST_TIMEOUT_TIME);

        assertThat(TEST_TOUCH_ACCEPTANCE_TIME + TEST_A11Y_AUTO_DISMISS_TIME).isLessThan(

                TEST_A11Y_TIMEOUT_TIME);

    }



    @After