diff options
| author | kwaky <kwaky@google.com> | 2020-08-28 13:14:04 -0700 |
|---|---|---|
| committer | Heemin Seog <hseog@google.com> | 2020-08-31 23:38:15 +0000 |
| commit | 4a6f9b97215f3fed60fe6dc2a9d285645e9fbeae (patch) | |
| tree | b6945a72106d04dad71c6ed3acf16f9a83f678ac /packages/CarSystemUI | |
| parent | 51be8f8d5d0ae62e6066b381dd89463cf9f54491 (diff) | |
Fix AAOS SystemUI Presubmit tests that are breaking.
Due to the newly added check in SystemBarConfig, tests can fail
erroneously when testing behavior of when either top or bottom system
bar is not enabled.
Bug: 162599873
Bug: 165808744
Test: atest carsysui-presubmit --include-subdir passing. (5/5)
Change-Id: Ife2ac4e746006c39eaf46cd0328c1639149891b2
Merged-In: Ife2ac4e746006c39eaf46cd0328c1639149891b2
Diffstat (limited to 'packages/CarSystemUI')
| -rw-r--r-- | packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java index 0b164a2e1a51..84c840477302 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java @@ -48,6 +48,10 @@ import org.mockito.MockitoAnnotations; @SmallTest public class CarNavigationBarControllerTest extends SysuiTestCase { + private static final String TOP_NOTIFICATION_PANEL = + "com.android.systemui.car.notification.TopNotificationPanelViewMediator"; + private static final String BOTTOM_NOTIFICATION_PANEL = + "com.android.systemui.car.notification.BottomNotificationPanelViewMediator"; private CarNavigationBarController mCarNavigationBar; private NavigationBarViewFactory mNavigationBarViewFactory; private TestableResources mTestableResources; @@ -117,6 +121,11 @@ public class CarNavigationBarControllerTest extends SysuiTestCase { @Test public void testGetTopWindow_topDisabled_returnsNull() { mTestableResources.addOverride(R.bool.config_enableTopNavigationBar, false); + mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true); + // If Top Notification Panel is used but top navigation bar is not enabled, SystemUI is + // expected to crash. + mTestableResources.addOverride(R.string.config_notificationPanelViewMediator, + BOTTOM_NOTIFICATION_PANEL); mCarNavigationBar = createNavigationBarController(); ViewGroup window = mCarNavigationBar.getTopWindow(); @@ -148,6 +157,11 @@ public class CarNavigationBarControllerTest extends SysuiTestCase { @Test public void testGetBottomWindow_bottomDisabled_returnsNull() { mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, false); + mTestableResources.addOverride(R.bool.config_enableTopNavigationBar, true); + // If Bottom Notification Panel is used but bottom navigation bar is not enabled, + // SystemUI is expected to crash. + mTestableResources.addOverride(R.string.config_notificationPanelViewMediator, + TOP_NOTIFICATION_PANEL); mCarNavigationBar = createNavigationBarController(); ViewGroup window = mCarNavigationBar.getBottomWindow(); |