Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" (e908a1d3) · Commits · e / os / android_frameworks_base

services/tests/wmtests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java→services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -16,16 +16,6 @@

		package com.android.server.am;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;

		import android.app.ActivityOptions;
		import android.content.pm.ActivityInfo;
		import android.graphics.Rect;
		@@ -34,16 +24,26 @@ import android.support.test.filters.MediumTest;
		import android.support.test.runner.AndroidJUnit4;

		import com.android.server.am.LaunchParamsController.LaunchParams;

		import org.junit.runner.RunWith;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.doAnswer;

		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;

		/**
		* Tests for exercising resizing bounds due to activity options.
		*
		* Build/Install/Run:
		* atest WmTests:ActivityLaunchParamsModifierTests
		* atest FrameworksServicesTests:ActivityLaunchParamsModifierTests
		*/
		@MediumTest
		@Presubmit

services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,17 @@ import org.mockito.MockitoAnnotations;
		/**
		* Test class for {@link ActivityManagerInternal}.
		*
		* Build/Install/Run:
		* atest WmTests:ActivityManagerInternalTest
		* To run the tests, use
		*
		* runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services
		*
		* or the following steps:
		*
		* Build: m FrameworksServicesTests
		* Install: adb install -r \
		* ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
		* Run: adb shell am instrument -e class com.android.server.am.ActivityManagerInternalTest -w \
		* com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
		*/
		@RunWith(AndroidJUnit4.class)
		public class ActivityManagerInternalTest {

services/tests/wmtests/src/com/android/server/am/ActivityManagerServiceTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import static android.app.ActivityManager.PROCESS_STATE_RECEIVER;
		import static android.app.ActivityManager.PROCESS_STATE_SERVICE;
		import static android.app.ActivityManager.PROCESS_STATE_TOP;
		import static android.util.DebugUtils.valueToString;

		import static com.android.server.am.ActivityManagerInternalTest.CustomThread;
		import static com.android.server.am.ActivityManagerService.DISPATCH_UIDS_CHANGED_UI_MSG;
		import static com.android.server.am.ActivityManagerService.Injector;
		@@ -89,8 +88,17 @@ import java.util.function.Function;
		/**
		* Test class for {@link ActivityManagerService}.
		*
		* Build/Install/Run:
		* atest WmTests:ActivityManagerServiceTest
		* To run the tests, use
		*
		* runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
		*
		* or the following steps:
		*
		* Build: m FrameworksServicesTests
		* Install: adb install -r \
		* ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
		* Run: adb shell am instrument -e class com.android.server.am.ActivityManagerServiceTest -w \
		* com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
		*/
		@SmallTest
		@RunWith(AndroidJUnit4.class)

services/tests/wmtests/src/com/android/server/am/ActivityManagerTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -18,18 +18,13 @@ package com.android.server.am;

		import android.app.ActivityManager;
		import android.app.IActivityManager;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.os.RemoteException;
		import android.test.AndroidTestCase;

		import java.util.List;

		/**
		* Tests for {@link ActivityManager}.
		*
		* Build/Install/Run:
		* atest WmTests:ActivityManagerTest
		*/
		public class ActivityManagerTest extends AndroidTestCase {

		IActivityManager service;

services/tests/wmtests/src/com/android/server/am/ActivityRecordTests.java→services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,11 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
		import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
		import static android.view.Display.DEFAULT_DISPLAY;

		import static com.android.server.am.ActivityStack.ActivityState.DESTROYED;
		import static com.android.server.am.ActivityStack.ActivityState.DESTROYING;
		import static com.android.server.am.ActivityStack.ActivityState.FINISHING;
		import static com.android.server.am.ActivityStack.ActivityState.INITIALIZING;
		import static com.android.server.am.ActivityStack.ActivityState.PAUSED;
		import static com.android.server.am.ActivityStack.ActivityState.PAUSING;
		import static com.android.server.am.ActivityStack.ActivityState.STOPPED;
		import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING;
		@@ -53,16 +57,17 @@ import android.support.test.filters.MediumTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.util.MutableBoolean;

		import org.junit.runner.RunWith;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.invocation.InvocationOnMock;

		/**
		* Tests for the {@link ActivityRecord} class.
		*
		* Build/Install/Run:
		* atest WmTests:com.android.server.am.ActivityRecordTests
		* atest FrameworksServicesTests:com.android.server.am.ActivityRecordTests
		*/
		@MediumTest
		@Presubmit