Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5f81b1b authored by Robert Horvath's avatar Robert Horvath
Browse files

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
parent 85a3f505

services/tests/servicestests/src/com/android/server/logcat/LogcatManagerServiceTest.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -22,22 +22,19 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityManagerInternal;

import android.content.ContextWrapper;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.os.ILogd;

import android.os.ILogd;

import android.os.Looper;

import android.os.Looper;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.test.TestLooper;

import android.os.test.TestLooper;





import androidx.test.core.app.ApplicationProvider;



import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.logcat.LogcatManagerService.Injector;

import com.android.server.logcat.LogcatManagerService.Injector;

import com.android.server.testutils.OffsettableClock;

import com.android.server.testutils.OffsettableClock;
@@ -69,6 +66,8 @@ public class LogcatManagerServiceTest { 
    private static final int FD1 = 10;

    private static final int FD1 = 10;

    private static final int FD2 = 11;

    private static final int FD2 = 11;





    @Mock

    private Context mContextSpy;

    @Mock

    @Mock

    private ActivityManagerInternal mActivityManagerInternalMock;

    private ActivityManagerInternal mActivityManagerInternalMock;

    @Mock

    @Mock
@@ -78,7 +77,6 @@ public class LogcatManagerServiceTest { 




    private LogcatManagerService mService;

    private LogcatManagerService mService;

    private LogcatManagerService.LogAccessDialogCallback mDialogCallback;

    private LogcatManagerService.LogAccessDialogCallback mDialogCallback;

    private ContextWrapper mContextSpy;

    private OffsettableClock mClock;

    private OffsettableClock mClock;

    private TestLooper mTestLooper;

    private TestLooper mTestLooper;
@@ -89,7 +87,6 @@ public class LogcatManagerServiceTest { 
        when(mActivityManagerInternalMock.getInstrumentationSourceUid(anyInt()))

        when(mActivityManagerInternalMock.getInstrumentationSourceUid(anyInt()))

                .thenReturn(INVALID_UID);

                .thenReturn(INVALID_UID);





        mContextSpy = spy(new ContextWrapper(ApplicationProvider.getApplicationContext()));

        mClock = new OffsettableClock.Stopped();

        mClock = new OffsettableClock.Stopped();

        mTestLooper = new TestLooper(mClock::now);

        mTestLooper = new TestLooper(mClock::now);

        when(mContextSpy.getPackageManager()).thenReturn(mPackageManagerMock);

        when(mContextSpy.getPackageManager()).thenReturn(mPackageManagerMock);