Merge "Replace android.support.test for androidx.test" (f7a509a2) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -29,13 +29,14 @@ import android.content.Context;
		import android.content.Intent;
		import android.os.RemoteException;
		import android.platform.helpers.IAppHelper;
		import android.support.test.uiautomator.By;
		import android.support.test.uiautomator.UiDevice;
		import android.support.test.uiautomator.UiObject2;
		import android.support.test.uiautomator.Until;
		import android.util.Rational;
		import android.view.Surface;

		import androidx.test.uiautomator.By;
		import androidx.test.uiautomator.UiDevice;
		import androidx.test.uiautomator.UiObject2;
		import androidx.test.uiautomator.Until;

		import com.android.server.wm.flicker.TransitionRunner.TransitionBuilder;
		import com.android.server.wm.flicker.helpers.AutomationUtils;
		import com.android.server.wm.flicker.helpers.ImeAppHelper;

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,13 +17,13 @@
		package com.android.server.wm.flicker;

		import android.platform.helpers.IAppHelper;
		import android.support.test.uiautomator.UiDevice;
		import android.util.Rational;
		import android.view.Surface;

		import androidx.test.InstrumentationRegistry;
		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;
		import androidx.test.uiautomator.UiDevice;

		import com.android.server.wm.flicker.helpers.ImeAppHelper;
		import com.android.server.wm.flicker.helpers.PipAppHelper;

+3 −6

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

		package com.android.server.wm.flicker;

		import static androidx.test.InstrumentationRegistry.getInstrumentation;

		import static com.android.server.wm.flicker.helpers.AutomationUtils.setDefaultWait;

		import static com.google.common.truth.Truth.assertWithMessage;

		import android.os.Bundle;
		import android.platform.helpers.IAppHelper;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.uiautomator.UiDevice;
		import android.util.Log;

		import androidx.test.InstrumentationRegistry;
		import androidx.test.uiautomator.UiDevice;

		import com.android.server.wm.flicker.TransitionRunner.TransitionResult;

		import org.junit.After;
		@@ -62,7 +60,6 @@ public abstract class FlickerTestBase {

		@Before
		public void setUp() {
		InstrumentationRegistry.registerInstance(getInstrumentation(), new Bundle());
		mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -19,10 +19,9 @@ package com.android.server.wm.flicker;
		import static com.android.server.wm.flicker.helpers.AutomationUtils.closePipWindow;
		import static com.android.server.wm.flicker.helpers.AutomationUtils.hasPipWindow;

		import android.support.test.uiautomator.UiDevice;

		import androidx.test.InstrumentationRegistry;
		import androidx.test.filters.LargeTest;
		import androidx.test.uiautomator.UiDevice;

		import com.android.server.wm.flicker.helpers.PipAppHelper;

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.server.wm.flicker.helpers.AutomationUtils.isInSplitScr
		import static com.google.common.truth.Truth.assertThat;

		import android.graphics.Rect;
		import android.support.test.uiautomator.UiDevice;
		import android.util.Rational;
		import android.view.Surface;

		@@ -34,6 +33,7 @@ import androidx.test.InstrumentationRegistry;
		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;
		import androidx.test.uiautomator.UiDevice;

		import com.android.server.wm.flicker.helpers.ImeAppHelper;