From dcc1ed475a45b8c51908d72283a76a20037020f5 Mon Sep 17 00:00:00 2001 From: shawnlin Date: Wed, 28 Jul 2021 22:22:10 +0800 Subject: [PATCH] [DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure The test resources is a mock object so it's still possible to return null in Resources#obtainTypedArray. Add mocks for new added resource configs. Bug: 194879684 Test: atest LocalDisplayAdapterTest Change-Id: Ie5e09e8c43848273d696392da992b366d2514461 --- .../android/server/display/LocalDisplayAdapterTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java index 0efcc57eeec22..34856e2580edf 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java @@ -134,6 +134,14 @@ public class LocalDisplayAdapterTest { when(mMockedResources.getFloat(com.android.internal.R.dimen .config_screenBrightnessSettingMaximumFloat)) .thenReturn(BACKLIGHT_RANGE_ZERO_TO_ONE[1]); + when(mMockedResources.getStringArray(R.array.config_displayUniqueIdArray)) + .thenReturn(new String[]{}); + TypedArray mockArray = mock(TypedArray.class); + when(mockArray.length()).thenReturn(0); + when(mMockedResources.obtainTypedArray(R.array.config_maskBuiltInDisplayCutoutArray)) + .thenReturn(mockArray); + when(mMockedResources.obtainTypedArray(R.array.config_waterfallCutoutArray)) + .thenReturn(mockArray); } @After