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

Commit 04f8300e authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Notif] Rename HeadsUpManagerPhoneTest to HeadsUpManagerImplTest. 

Once we eventually merge the two HeadsUpManager test files, we want it
to be in Kotlin. Since HeadsUpManagerPhoneTest is in Kotlin, give that
test file the correct name.

Bug: 378142453
Flag: EXEMPT refactor
Test: atest HeadsUpManagerImplOldTest HeadsUpManagerImplTest
Change-Id: I7fd412ba26b20e8ca28b3db1aa43c37973a12412
parent b80a5aec

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplOldTest.java

+3 −3
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ import java.util.List; 
@SmallTest

@TestableLooper.RunWithLooper

@RunWith(ParameterizedAndroidJunit4.class)

// TODO(b/378142453): Merge this with HeadsUpManagerPhoneTest.

public class HeadsUpManagerImplTest extends SysuiTestCase {

// TODO(b/378142453): Merge this with HeadsUpManagerImplTest.

public class HeadsUpManagerImplOldTest extends SysuiTestCase {

    protected KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this);



    @Rule
@@ -169,7 +169,7 @@ public class HeadsUpManagerImplTest extends SysuiTestCase { 
        return FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME);

    }



    public HeadsUpManagerImplTest(FlagsParameterization flags) {

    public HeadsUpManagerImplOldTest(FlagsParameterization flags) {

        mSetFlagsRule.setFlagsParameterization(flags);

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerPhoneTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import platform.test.runner.parameterized.Parameters 
@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@RunWithLooper

class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : HeadsUpManagerImplTest(flags) {

class HeadsUpManagerImplTest(flags: FlagsParameterization) : HeadsUpManagerImplOldTest(flags) {



    private val mHeadsUpManagerLogger = HeadsUpManagerLogger(logcatLogBuffer())

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/TestableHeadsUpManager.java

+4 −4
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ class TestableHeadsUpManager extends HeadsUpManagerImpl { 
                shadeInteractor,

                avalancheController);



        mTouchAcceptanceDelay = HeadsUpManagerImplTest.TEST_TOUCH_ACCEPTANCE_TIME;

        mMinimumDisplayTime = HeadsUpManagerImplTest.TEST_MINIMUM_DISPLAY_TIME;

        mAutoDismissTime = HeadsUpManagerImplTest.TEST_AUTO_DISMISS_TIME;

        mStickyForSomeTimeAutoDismissTime = HeadsUpManagerImplTest.TEST_STICKY_AUTO_DISMISS_TIME;

        mTouchAcceptanceDelay = HeadsUpManagerImplOldTest.TEST_TOUCH_ACCEPTANCE_TIME;

        mMinimumDisplayTime = HeadsUpManagerImplOldTest.TEST_MINIMUM_DISPLAY_TIME;

        mAutoDismissTime = HeadsUpManagerImplOldTest.TEST_AUTO_DISMISS_TIME;

        mStickyForSomeTimeAutoDismissTime = HeadsUpManagerImplOldTest.TEST_STICKY_AUTO_DISMISS_TIME;

    }



    @NonNull