Merge "Fix local service binding in tests." (6d0bf150) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,9 +40,11 @@ import android.content.pm.UserInfo;
		import android.net.Uri;
		import android.os.RemoteException;
		import android.os.UserManager;
		import android.platform.test.annotations.Presubmit;

		import androidx.test.filters.SmallTest;

		import com.android.server.LocalServices;
		import com.android.server.SystemService;

		import org.junit.Before;
		@@ -60,6 +62,7 @@ import java.util.List;
		* Tests for {@link com.android.server.apphibernation.AppHibernationService}
		*/
		@SmallTest
		@Presubmit
		public final class AppHibernationServiceTest {
		private static final String PACKAGE_SCHEME = "package";
		private static final String PACKAGE_NAME_1 = "package1";
		@@ -91,6 +94,7 @@ public final class AppHibernationServiceTest {
		MockitoAnnotations.initMocks(this);
		doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt());

		LocalServices.removeServiceForTest(AppHibernationManagerInternal.class);
		mAppHibernationService = new AppHibernationService(new MockInjector(mContext));

		verify(mContext).registerReceiver(mReceiverCaptor.capture(), any());

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.apphibernation;
		import static org.junit.Assert.assertEquals;

		import android.os.FileUtils;
		import android.platform.test.annotations.Presubmit;
		import android.util.proto.ProtoInputStream;
		import android.util.proto.ProtoOutputStream;

		@@ -48,6 +49,7 @@ import java.util.concurrent.TimeoutException;


		@SmallTest
		@Presubmit
		public class HibernationStateDiskStoreTest {
		private static final String STATES_FILE_NAME = "states";
		private final MockScheduledExecutorService mMockScheduledExecutorService =