Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix local service binding in tests." am: 6d0bf150e3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb43aae6f11a26f6d1d1937ab99880b3da19e352
This commit is contained in:
Kevin Han
2021-03-11 22:00:03 +00:00
committed by Automerger Merge Worker
parent bb58b8a819 6d0bf150e3
commit fe54088dcb
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/servicestests/src/com/android/server/apphibernation/AppHibernationServiceTest.java
View File

@@ -40,9 +40,11 @@ import android.content.pm.UserInfo;
import android.net.Uri; import android.net.Uri;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserManager; import android.os.UserManager;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import com.android.server.LocalServices;
import com.android.server.SystemService; import com.android.server.SystemService;
import org.junit.Before; import org.junit.Before;
@@ -60,6 +62,7 @@ import java.util.List;
* Tests for {@link com.android.server.apphibernation.AppHibernationService} * Tests for {@link com.android.server.apphibernation.AppHibernationService}
*/ */
@SmallTest @SmallTest
@Presubmit
public final class AppHibernationServiceTest { public final class AppHibernationServiceTest {
private static final String PACKAGE_SCHEME = "package"; private static final String PACKAGE_SCHEME = "package";
private static final String PACKAGE_NAME_1 = "package1"; private static final String PACKAGE_NAME_1 = "package1";
@@ -91,6 +94,7 @@ public final class AppHibernationServiceTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt()); doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt());
LocalServices.removeServiceForTest(AppHibernationManagerInternal.class);
mAppHibernationService = new AppHibernationService(new MockInjector(mContext)); mAppHibernationService = new AppHibernationService(new MockInjector(mContext));
verify(mContext).registerReceiver(mReceiverCaptor.capture(), any()); verify(mContext).registerReceiver(mReceiverCaptor.capture(), any());

2
services/tests/servicestests/src/com/android/server/apphibernation/HibernationStateDiskStoreTest.java
View File

@@ -19,6 +19,7 @@ package com.android.server.apphibernation;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import android.os.FileUtils; import android.os.FileUtils;
import android.platform.test.annotations.Presubmit;
import android.util.proto.ProtoInputStream; import android.util.proto.ProtoInputStream;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -48,6 +49,7 @@ import java.util.concurrent.TimeoutException;
@SmallTest @SmallTest
@Presubmit
public class HibernationStateDiskStoreTest { public class HibernationStateDiskStoreTest {
private static final String STATES_FILE_NAME = "states"; private static final String STATES_FILE_NAME = "states";
private final MockScheduledExecutorService mMockScheduledExecutorService = private final MockScheduledExecutorService mMockScheduledExecutorService =