Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AAOS SystemUI Presubmit tests that are breaking." into rvc-qpr-dev am: 339c9812f2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12483659

Change-Id: I0b45b0be5a375272634d31063f50644af1fbe920
This commit is contained in:
Youngjun Kwak
2020-09-01 23:03:59 +00:00
committed by Automerger Merge Worker
parent 446b184ff0 339c9812f2
commit c2888a30ee
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java
View File

@@ -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();