From 387f32a214b843e6a02567a62040f56042975c9f Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Tue, 10 Jan 2023 16:19:18 +0900 Subject: [PATCH] Mock some methods of Context in CoreSettingsObserverTest In order to fix the test NPE during set up. Bug: 264668735 Test: com.android.server.am.CoreSettingsObserverTest Change-Id: I452bb7730c9d3b39cbec32c9e71525a079941456 --- .../src/com/android/server/am/CoreSettingsObserverTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java b/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java index 574aaf00e4603..5f55f0914d140 100644 --- a/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java +++ b/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java @@ -97,6 +97,8 @@ public class CoreSettingsObserverTest { mContentResolver = new MockContentResolver(mContext); mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); when(mContext.getContentResolver()).thenReturn(mContentResolver); + when(mContext.getCacheDir()).thenReturn(originalContext.getCacheDir()); + when(mContext.getAttributionSource()).thenReturn(originalContext.getAttributionSource()); when(mContext.getResources()).thenReturn(mResources); // To prevent NullPointerException at the constructor of ActivityManagerConstants. when(mResources.getStringArray(anyInt())).thenReturn(new String[0]);