Update the imports to androidx.test.filters.* Bug: 316941721 Test: mmma . Change-Id: Ib257fd390b7d1442bc453e425d338a1a986f6e8d
diff --git a/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java b/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java index 3701f22..61b25ed 100644 --- a/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java +++ b/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java
@@ -16,16 +16,17 @@ package com.example.android.documentcentricapps.tests; -import com.example.android.documentcentricapps.DocumentCentricActivity; -import com.example.android.documentcentricapps.R; - import android.app.ActivityManager; import android.content.Context; import android.test.ActivityInstrumentationTestCase2; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.Button; +import androidx.test.filters.LargeTest; + +import com.example.android.documentcentricapps.DocumentCentricActivity; +import com.example.android.documentcentricapps.R; + import java.util.List; /**
diff --git a/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java b/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java index b3da974..a3b803f 100644 --- a/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java +++ b/ui/activitytasks/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java
@@ -16,15 +16,16 @@ package com.example.android.documentcentricapps.tests; -import com.example.android.documentcentricapps.DocumentCentricActivity; -import com.example.android.documentcentricapps.R; - import android.content.Intent; import android.test.ActivityUnitTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.Button; import android.widget.CheckBox; +import androidx.test.filters.MediumTest; + +import com.example.android.documentcentricapps.DocumentCentricActivity; +import com.example.android.documentcentricapps.R; + /** * Unit tests for DocumentCentricApps sample. */
diff --git a/ui/window/MultiWindowPlayground/Application/src/androidTest/java/LaunchTests.java b/ui/window/MultiWindowPlayground/Application/src/androidTest/java/LaunchTests.java index e0567ef..0523859 100644 --- a/ui/window/MultiWindowPlayground/Application/src/androidTest/java/LaunchTests.java +++ b/ui/window/MultiWindowPlayground/Application/src/androidTest/java/LaunchTests.java
@@ -14,17 +14,6 @@ * limitations under the License. */ -import com.android.multiwindowplayground.MainActivity; -import com.android.multiwindowplayground.R; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.action.ViewActions.scrollTo; @@ -32,6 +21,18 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; +import android.support.test.rule.ActivityTestRule; +import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; + +import com.android.multiwindowplayground.MainActivity; +import com.android.multiwindowplayground.R; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + @LargeTest @RunWith(AndroidJUnit4.class) public class LaunchTests {