From d5f81b1b423f44ec787c70ff1906684d1347bddc Mon Sep 17 00:00:00 2001
From: Robert Horvath <robhor@google.com>
Date: Mon, 19 Dec 2022 15:27:03 +0100
Subject: [PATCH] Use mocked Context in LogcatManagerServiceTest

Avoid calling through to real startActivity calls from Context spy
invocations in the servicetests.

Bug: 262041042
Test: atest LogcatManagerServiceTest
Change-Id: Iaf60ead926e71240a2f76d4ce0a85b4fa6999cb9
---
 .../android/server/logcat/LogcatManagerServiceTest.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/logcat/LogcatManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/logcat/LogcatManagerServiceTest.java
index 2cd5314e961f8..771916ec294a9 100644
--- a/services/tests/servicestests/src/com/android/server/logcat/LogcatManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/logcat/LogcatManagerServiceTest.java
@@ -22,22 +22,19 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.ActivityManager;
 import android.app.ActivityManagerInternal;
-import android.content.ContextWrapper;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.ILogd;
 import android.os.Looper;
 import android.os.UserHandle;
 import android.os.test.TestLooper;
 
-import androidx.test.core.app.ApplicationProvider;
-
 import com.android.server.LocalServices;
 import com.android.server.logcat.LogcatManagerService.Injector;
 import com.android.server.testutils.OffsettableClock;
@@ -69,6 +66,8 @@ public class LogcatManagerServiceTest {
     private static final int FD1 = 10;
     private static final int FD2 = 11;
 
+    @Mock
+    private Context mContextSpy;
     @Mock
     private ActivityManagerInternal mActivityManagerInternalMock;
     @Mock
@@ -78,7 +77,6 @@ public class LogcatManagerServiceTest {
 
     private LogcatManagerService mService;
     private LogcatManagerService.LogAccessDialogCallback mDialogCallback;
-    private ContextWrapper mContextSpy;
     private OffsettableClock mClock;
     private TestLooper mTestLooper;
 
@@ -89,7 +87,6 @@ public class LogcatManagerServiceTest {
         when(mActivityManagerInternalMock.getInstrumentationSourceUid(anyInt()))
                 .thenReturn(INVALID_UID);
 
-        mContextSpy = spy(new ContextWrapper(ApplicationProvider.getApplicationContext()));
         mClock = new OffsettableClock.Stopped();
         mTestLooper = new TestLooper(mClock::now);
         when(mContextSpy.getPackageManager()).thenReturn(mPackageManagerMock);