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

Commit 787ff0fa authored by Suprabh Shukla's avatar Suprabh Shukla
Browse files

Removing local service in test setup 

A bad test run earlier could leave a local service registered, which can
lead to the exception 'Overriding service registration' in setUp.

Test: atest FrameworksServicesTests:JobSetTest

Change-Id: Ie7ff2216af9bddd70e0dfd04df52c9361a7d8ef9
parent 70c02611

services/tests/servicestests/src/com/android/server/job/JobSetTest.java

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.Context; 
import android.content.pm.PackageManagerInternal;

import android.os.Build;

import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;

import android.util.ArraySet;

import android.util.Log;

import android.util.SparseArray;
@@ -47,6 +48,7 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class JobSetTest {

    private static final String TAG = JobSetTest.class.getSimpleName();

    private static final int SECONDARY_USER_ID_1 = 12;
@@ -64,6 +66,7 @@ public class JobSetTest { 
        final PackageManagerInternal pm = mock(PackageManagerInternal.class);

        when(pm.getPackageTargetSdkVersion(anyString()))

                .thenReturn(Build.VERSION_CODES.CUR_DEVELOPMENT);

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

        LocalServices.addService(PackageManagerInternal.class, pm);

        assumeFalse("Test cannot run in user " + mContext.getUserId(),

                mContext.getUserId() == SECONDARY_USER_ID_1