diff options
614 files changed, 2045 insertions, 1773 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 74943c7bd6dd..0fc3bd224fbf 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -36,12 +36,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-core-util-lib \ mockwebserver \ guava \ - android-support-test \ + androidx.test.runner \ + androidx.test.rules \ mockito-target-minus-junit4 \ espresso-core \ ub-uiautomator \ platform-test-annotations \ - compatibility-device-util \ truth-prebuilt \ print-test-util-lib \ testng # TODO: remove once Android migrates to JUnit 4.12, which provide assertThrows diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index 46d4a4773389..e80cb6d0295b 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -1425,7 +1425,7 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.coretests" android:label="Frameworks Core Tests" /> <key-sets> diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml index 68ef34b279e6..b40aa87cb78b 100644 --- a/core/tests/coretests/AndroidTest.xml +++ b/core/tests/coretests/AndroidTest.xml @@ -25,6 +25,7 @@ <option name="test-tag" value="FrameworksCoreTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.frameworks.coretests" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java b/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java index e26bdf53b872..be1d44cec6a6 100644 --- a/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java +++ b/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import androidx.test.filters.LargeTest; import com.android.frameworks.coretests.R; +import java.util.HashSet; +import java.util.Set; + @LargeTest public class AnimatorInflaterTest extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> { Set<Integer> identityHashes = new HashSet<Integer>(); diff --git a/core/tests/coretests/src/android/animation/AnimatorSetActivity.java b/core/tests/coretests/src/android/animation/AnimatorSetActivity.java index 501ea485b8b2..af265afa83e5 100644 --- a/core/tests/coretests/src/android/animation/AnimatorSetActivity.java +++ b/core/tests/coretests/src/android/animation/AnimatorSetActivity.java @@ -1,10 +1,26 @@ -package android.animation; +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -import com.android.frameworks.coretests.R; +package android.animation; import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class AnimatorSetActivity extends Activity { @Override public void onCreate(Bundle savedBundleInstance) { diff --git a/core/tests/coretests/src/android/animation/AnimatorSetActivityTest.java b/core/tests/coretests/src/android/animation/AnimatorSetActivityTest.java index 922bc59d71d1..55837ba3926c 100644 --- a/core/tests/coretests/src/android/animation/AnimatorSetActivityTest.java +++ b/core/tests/coretests/src/android/animation/AnimatorSetActivityTest.java @@ -1,12 +1,29 @@ -package android.animation; +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -import com.android.frameworks.coretests.R; +package android.animation; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.SmallTest; import android.view.View; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.SmallTest; + +import com.android.frameworks.coretests.R; + import java.util.ArrayList; public class AnimatorSetActivityTest extends ActivityInstrumentationTestCase2<AnimatorSetActivity> { diff --git a/core/tests/coretests/src/android/animation/AnimatorSetEventsTest.java b/core/tests/coretests/src/android/animation/AnimatorSetEventsTest.java index 7eb32ee36876..4e90d1acf4a0 100644 --- a/core/tests/coretests/src/android/animation/AnimatorSetEventsTest.java +++ b/core/tests/coretests/src/android/animation/AnimatorSetEventsTest.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import android.os.Handler; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.widget.Button; + +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; import java.util.concurrent.TimeUnit; diff --git a/core/tests/coretests/src/android/animation/AutoCancelTest.java b/core/tests/coretests/src/android/animation/AutoCancelTest.java index b1f88db86473..b3ec92cf1f0f 100644 --- a/core/tests/coretests/src/android/animation/AutoCancelTest.java +++ b/core/tests/coretests/src/android/animation/AutoCancelTest.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import android.os.Handler; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.util.HashMap; import java.util.concurrent.TimeUnit; diff --git a/core/tests/coretests/src/android/animation/BasicAnimatorActivity.java b/core/tests/coretests/src/android/animation/BasicAnimatorActivity.java index 0e1e6ac98672..2b9866d7a0b2 100644 --- a/core/tests/coretests/src/android/animation/BasicAnimatorActivity.java +++ b/core/tests/coretests/src/android/animation/BasicAnimatorActivity.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.animation; -import com.android.frameworks.coretests.R; +package android.animation; import android.app.Activity; import android.os.Bundle; import android.widget.Button; +import com.android.frameworks.coretests.R; + public class BasicAnimatorActivity extends Activity { public Button mAnimatingButton; @Override diff --git a/core/tests/coretests/src/android/animation/EventsTest.java b/core/tests/coretests/src/android/animation/EventsTest.java index 28cfe3d5d68b..ba7413a2a4f7 100644 --- a/core/tests/coretests/src/android/animation/EventsTest.java +++ b/core/tests/coretests/src/android/animation/EventsTest.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import android.os.Handler; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/core/tests/coretests/src/android/animation/FutureWaiter.java b/core/tests/coretests/src/android/animation/FutureWaiter.java index 0c65e20be6a5..0c09a4a27d93 100644 --- a/core/tests/coretests/src/android/animation/FutureWaiter.java +++ b/core/tests/coretests/src/android/animation/FutureWaiter.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import com.google.common.util.concurrent.AbstractFuture; diff --git a/core/tests/coretests/src/android/animation/ObjectAnimatorEventsTest.java b/core/tests/coretests/src/android/animation/ObjectAnimatorEventsTest.java index 606a93949a54..53f94727f6d3 100644 --- a/core/tests/coretests/src/android/animation/ObjectAnimatorEventsTest.java +++ b/core/tests/coretests/src/android/animation/ObjectAnimatorEventsTest.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import android.widget.Button; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/animation/StateListAnimatorTest.java b/core/tests/coretests/src/android/animation/StateListAnimatorTest.java index a9961e19e0c6..e755b89f8551 100644 --- a/core/tests/coretests/src/android/animation/StateListAnimatorTest.java +++ b/core/tests/coretests/src/android/animation/StateListAnimatorTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ - package android.animation; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; import android.util.StateSet; import android.view.View; import android.view.ViewGroup; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.LargeTest; + import com.android.frameworks.coretests.R; import java.util.concurrent.atomic.AtomicInteger; diff --git a/core/tests/coretests/src/android/animation/ValueAnimatorEventsTest.java b/core/tests/coretests/src/android/animation/ValueAnimatorEventsTest.java index c25d050dd3f4..f6d71b88bd89 100644 --- a/core/tests/coretests/src/android/animation/ValueAnimatorEventsTest.java +++ b/core/tests/coretests/src/android/animation/ValueAnimatorEventsTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; /** diff --git a/core/tests/coretests/src/android/animation/ValueAnimatorTests.java b/core/tests/coretests/src/android/animation/ValueAnimatorTests.java index 4facf7742153..dee0a3ecdbe0 100644 --- a/core/tests/coretests/src/android/animation/ValueAnimatorTests.java +++ b/core/tests/coretests/src/android/animation/ValueAnimatorTests.java @@ -13,8 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; +import static android.test.MoreAsserts.assertNotEqual; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -24,23 +27,20 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.SystemClock; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.view.Choreographer; import android.view.animation.LinearInterpolator; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; -import static android.test.MoreAsserts.assertNotEqual; - @RunWith(AndroidJUnit4.class) @MediumTest public class ValueAnimatorTests { diff --git a/core/tests/coretests/src/android/animation/ViewPropertyAnimatorTest.java b/core/tests/coretests/src/android/animation/ViewPropertyAnimatorTest.java index 30ec182f757c..997af009a9b8 100644 --- a/core/tests/coretests/src/android/animation/ViewPropertyAnimatorTest.java +++ b/core/tests/coretests/src/android/animation/ViewPropertyAnimatorTest.java @@ -13,15 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.animation; import android.os.Handler; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.view.ViewPropertyAnimator; import android.widget.Button; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import java.util.concurrent.TimeUnit; diff --git a/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java b/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java index 19a390ab1a11..8dc5ad66194b 100644 --- a/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java +++ b/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java @@ -16,15 +16,16 @@ package android.app; -import org.junit.Test; -import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import android.app.ApplicationErrorReport.CrashInfo; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest diff --git a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java index 063bef7387c6..4b0ed65e5fde 100644 --- a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java +++ b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java @@ -16,13 +16,17 @@ package android.app; +import static android.os.storage.VolumeInfo.STATE_MOUNTED; +import static android.os.storage.VolumeInfo.STATE_UNMOUNTED; + import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import junit.framework.TestCase; @@ -32,9 +36,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static android.os.storage.VolumeInfo.STATE_MOUNTED; -import static android.os.storage.VolumeInfo.STATE_UNMOUNTED; - @LargeTest public class ApplicationPackageManagerTest extends TestCase { private static final String sInternalVolPath = "/data"; diff --git a/core/tests/coretests/src/android/app/DownloadManagerFunctionalTest.java b/core/tests/coretests/src/android/app/DownloadManagerFunctionalTest.java index c1d4be0f33c3..33e040253f06 100644 --- a/core/tests/coretests/src/android/app/DownloadManagerFunctionalTest.java +++ b/core/tests/coretests/src/android/app/DownloadManagerFunctionalTest.java @@ -22,7 +22,8 @@ import android.database.Cursor; import android.net.Uri; import android.os.Environment; import android.os.ParcelFileDescriptor; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import com.google.mockwebserver.MockResponse; diff --git a/core/tests/coretests/src/android/app/DownloadManagerStressTest.java b/core/tests/coretests/src/android/app/DownloadManagerStressTest.java index 39d9a8e31ddc..adfe76f2f151 100644 --- a/core/tests/coretests/src/android/app/DownloadManagerStressTest.java +++ b/core/tests/coretests/src/android/app/DownloadManagerStressTest.java @@ -23,10 +23,11 @@ import android.net.Uri; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.StatFs; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/core/tests/coretests/src/android/app/InstrumentationTest.java b/core/tests/coretests/src/android/app/InstrumentationTest.java index 9b59da48e760..93b5aecfc8f7 100644 --- a/core/tests/coretests/src/android/app/InstrumentationTest.java +++ b/core/tests/coretests/src/android/app/InstrumentationTest.java @@ -17,9 +17,10 @@ package android.app; import android.os.Bundle; -import android.support.test.filters.LargeTest; import android.test.InstrumentationTestCase; +import androidx.test.filters.LargeTest; + @LargeTest public class InstrumentationTest extends InstrumentationTestCase { diff --git a/core/tests/coretests/src/android/app/LoaderLifecycleTest.java b/core/tests/coretests/src/android/app/LoaderLifecycleTest.java index c83e7988dcc6..e343383df3f1 100644 --- a/core/tests/coretests/src/android/app/LoaderLifecycleTest.java +++ b/core/tests/coretests/src/android/app/LoaderLifecycleTest.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package android.app; import static junit.framework.TestCase.assertNotNull; @@ -27,11 +26,12 @@ import static org.junit.Assert.fail; import android.content.Context; import android.os.Handler; import android.os.Parcelable; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/NotificationTest.java b/core/tests/coretests/src/android/app/NotificationTest.java index e89a4d3bf94f..c17aa9254808 100644 --- a/core/tests/coretests/src/android/app/NotificationTest.java +++ b/core/tests/coretests/src/android/app/NotificationTest.java @@ -33,11 +33,12 @@ import android.media.session.MediaSession; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.widget.RemoteViews; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/SearchManagerTest.java b/core/tests/coretests/src/android/app/SearchManagerTest.java index 08b7f60c368f..14370c887675 100644 --- a/core/tests/coretests/src/android/app/SearchManagerTest.java +++ b/core/tests/coretests/src/android/app/SearchManagerTest.java @@ -17,17 +17,13 @@ package android.app; import android.app.activity.LocalActivity; - -import android.app.Activity; -import android.app.ISearchManager; -import android.app.SearchManager; -import android.app.SearchableInfo; import android.content.ComponentName; import android.content.Context; import android.os.ServiceManager; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; /** * To launch this test from the command line: diff --git a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java index 61d73bc918d5..bbd442d53f76 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java @@ -21,8 +21,9 @@ import android.content.Context; import android.content.pm.ConfigurationInfo; import android.content.res.Configuration; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; import java.util.Iterator; import java.util.List; diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java index 0f83a29d8d36..9cb34895dea4 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java @@ -36,13 +36,14 @@ import android.app.servertransaction.StopActivityItem; import android.content.Intent; import android.content.res.Configuration; import android.os.IBinder; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.util.MergedConfiguration; import android.view.Display; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/activity/BroadcastTest.java b/core/tests/coretests/src/android/app/activity/BroadcastTest.java index 13e70ebdb2e3..0f81896692c0 100644 --- a/core/tests/coretests/src/android/app/activity/BroadcastTest.java +++ b/core/tests/coretests/src/android/app/activity/BroadcastTest.java @@ -27,11 +27,10 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Parcel; import android.os.UserHandle; -import android.support.test.filters.LargeTest; -import android.test.FlakyTest; import android.util.Log; -import java.util.Arrays; +import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; @LargeTest public class BroadcastTest extends ActivityTestsBase { @@ -231,7 +230,7 @@ public class BroadcastTest extends ActivityTestsBase { }; // Mark flaky until http://b/issue?id=1191607 is resolved. - @FlakyTest(tolerance=2) + @FlakyTest public void testRegistered() throws Exception { runLaunchpad(LaunchpadActivity.BROADCAST_REGISTERED); } @@ -248,12 +247,12 @@ public class BroadcastTest extends ActivityTestsBase { runLaunchpad(LaunchpadActivity.BROADCAST_ABORT); } - @FlakyTest(tolerance=2) + @FlakyTest public void testAll() throws Exception { runLaunchpad(LaunchpadActivity.BROADCAST_ALL); } - @FlakyTest(tolerance=2) + @FlakyTest public void testMulti() throws Exception { runLaunchpad(LaunchpadActivity.BROADCAST_MULTI); } @@ -348,7 +347,7 @@ public class BroadcastTest extends ActivityTestsBase { } // Marking flaky until http://b/issue?id=1191337 is resolved - @FlakyTest(tolerance=2) + @FlakyTest public void testReceiveSticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); @@ -358,7 +357,7 @@ public class BroadcastTest extends ActivityTestsBase { } // Marking flaky until http://b/issue?id=1191337 is resolved - @FlakyTest(tolerance=2) + @FlakyTest public void testReceive2Sticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); diff --git a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java index 8c1d79b5d89c..19ddb52db86e 100644 --- a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java +++ b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java @@ -21,7 +21,8 @@ import android.app.PendingIntent; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; @LargeTest public class IntentSenderTest extends BroadcastTest { diff --git a/core/tests/coretests/src/android/app/activity/LaunchTest.java b/core/tests/coretests/src/android/app/activity/LaunchTest.java index 5b86dceb75f8..6846ea75e524 100644 --- a/core/tests/coretests/src/android/app/activity/LaunchTest.java +++ b/core/tests/coretests/src/android/app/activity/LaunchTest.java @@ -17,8 +17,9 @@ package android.app.activity; import android.content.ComponentName; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; @Suppress // Flaky. public class LaunchTest extends ActivityTestsBase { diff --git a/core/tests/coretests/src/android/app/activity/LifecycleTest.java b/core/tests/coretests/src/android/app/activity/LifecycleTest.java index ed01fac5e0a9..5aa03807264e 100644 --- a/core/tests/coretests/src/android/app/activity/LifecycleTest.java +++ b/core/tests/coretests/src/android/app/activity/LifecycleTest.java @@ -18,8 +18,9 @@ package android.app.activity; import android.content.ComponentName; import android.content.Intent; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; public class LifecycleTest extends ActivityTestsBase { private Intent mTopIntent; diff --git a/core/tests/coretests/src/android/app/activity/MetaDataTest.java b/core/tests/coretests/src/android/app/activity/MetaDataTest.java index 5b9c0e903135..cf27878e897e 100644 --- a/core/tests/coretests/src/android/app/activity/MetaDataTest.java +++ b/core/tests/coretests/src/android/app/activity/MetaDataTest.java @@ -27,8 +27,11 @@ import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.Bundle; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java b/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java index 9f402a5265ec..8184627494ed 100644 --- a/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java +++ b/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java @@ -1,19 +1,18 @@ -/* //device/apps/AndroidTests/src/com.android.unit_tests/activity/TestedScreen.java -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ +/* + * Copyright (C) 2006 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package android.app.activity; @@ -21,7 +20,8 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Process; -import android.util.Log; + +//device/apps/AndroidTests/src/com.android.unit_tests/activity/TestedScreen.java public class RemoteSubActivityScreen extends SubActivityScreen { Handler mHandler = new Handler(); diff --git a/core/tests/coretests/src/android/app/activity/ServiceTest.java b/core/tests/coretests/src/android/app/activity/ServiceTest.java index d3ae415223e0..9d2aebd1e6cd 100644 --- a/core/tests/coretests/src/android/app/activity/ServiceTest.java +++ b/core/tests/coretests/src/android/app/activity/ServiceTest.java @@ -22,13 +22,12 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.Binder; import android.os.Bundle; -import android.os.RemoteException; import android.os.IBinder; import android.os.Parcel; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; -import android.util.Log; +import android.os.RemoteException; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; // These test binders purport to support an interface whose canonical // interface name is ServiceTest.SERVICE_LOCAL diff --git a/core/tests/coretests/src/android/app/activity/SetTimeZonePermissionsTest.java b/core/tests/coretests/src/android/app/activity/SetTimeZonePermissionsTest.java index 41b95476baf3..8e172952c9ee 100644 --- a/core/tests/coretests/src/android/app/activity/SetTimeZonePermissionsTest.java +++ b/core/tests/coretests/src/android/app/activity/SetTimeZonePermissionsTest.java @@ -19,7 +19,8 @@ package android.app.activity; import android.app.AlarmManager; import android.content.Context; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import java.util.TimeZone; diff --git a/core/tests/coretests/src/android/app/activity/SubActivityTest.java b/core/tests/coretests/src/android/app/activity/SubActivityTest.java index 35dde8a51567..53f89fe1276b 100644 --- a/core/tests/coretests/src/android/app/activity/SubActivityTest.java +++ b/core/tests/coretests/src/android/app/activity/SubActivityTest.java @@ -16,9 +16,10 @@ package android.app.activity; -import android.test.suitebuilder.annotation.Suppress; import android.content.ComponentName; +import androidx.test.filters.Suppress; + @Suppress public class SubActivityTest extends ActivityTestsBase { diff --git a/core/tests/coretests/src/android/app/admin/PasswordMetricsTest.java b/core/tests/coretests/src/android/app/admin/PasswordMetricsTest.java index 9b5b725a3bed..8d42c74be7b0 100644 --- a/core/tests/coretests/src/android/app/admin/PasswordMetricsTest.java +++ b/core/tests/coretests/src/android/app/admin/PasswordMetricsTest.java @@ -27,8 +27,9 @@ import static org.junit.Assert.assertNotEquals; import android.app.admin.PasswordMetrics.PasswordComplexityBucket; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/assist/AssistStructureTest.java b/core/tests/coretests/src/android/app/assist/AssistStructureTest.java index 689e683dda23..1f4e5dffc84e 100644 --- a/core/tests/coretests/src/android/app/assist/AssistStructureTest.java +++ b/core/tests/coretests/src/android/app/assist/AssistStructureTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.app.assist; import static android.view.View.AUTOFILL_TYPE_TEXT; @@ -22,13 +23,9 @@ import static android.view.View.IMPORTANT_FOR_AUTOFILL_YES; import static com.google.common.truth.Truth.assertThat; import android.app.assist.AssistStructure.ViewNode; -import android.content.ComponentName; import android.content.Context; import android.os.Parcel; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.text.InputFilter; import android.util.Log; import android.view.autofill.AutofillId; @@ -37,6 +34,10 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/assist/EmptyLayoutActivity.java b/core/tests/coretests/src/android/app/assist/EmptyLayoutActivity.java index f4b6bed1cac8..defec433e403 100644 --- a/core/tests/coretests/src/android/app/assist/EmptyLayoutActivity.java +++ b/core/tests/coretests/src/android/app/assist/EmptyLayoutActivity.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.app.assist; import android.app.Activity; diff --git a/core/tests/coretests/src/android/app/backup/BackupDataTest.java b/core/tests/coretests/src/android/app/backup/BackupDataTest.java index 5b8e481cf573..18ff54fa6989 100644 --- a/core/tests/coretests/src/android/app/backup/BackupDataTest.java +++ b/core/tests/coretests/src/android/app/backup/BackupDataTest.java @@ -16,31 +16,22 @@ package android.app.backup; -import android.app.backup.BackupDataInput; -import android.app.backup.BackupDataOutput; -import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; import android.os.Bundle; import android.os.Environment; import android.os.ParcelFileDescriptor; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; -import android.test.InstrumentationTestCase; import android.util.Base64; -import android.util.Log; -import org.json.JSONObject; + +import androidx.test.filters.LargeTest; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; -import java.lang.Exception; -import java.nio.ByteBuffer; @LargeTest public class BackupDataTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/app/backup/FullBackupTest.java b/core/tests/coretests/src/android/app/backup/FullBackupTest.java index 5db416b33af7..08edb4e9be97 100644 --- a/core/tests/coretests/src/android/app/backup/FullBackupTest.java +++ b/core/tests/coretests/src/android/app/backup/FullBackupTest.java @@ -18,11 +18,12 @@ package android.app.backup; import android.app.backup.FullBackup.BackupScheme.PathWithRequiredFlags; import android.content.Context; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.ArrayMap; import android.util.ArraySet; +import androidx.test.filters.LargeTest; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; diff --git a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java index b1f855246320..52b26589279f 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java @@ -23,8 +23,9 @@ import static org.mockito.Mockito.verify; import android.app.ClientTransactionHandler; import android.os.IBinder; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java index fb0f5344f643..ad28d13dc46a 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java @@ -35,8 +35,9 @@ import android.os.Binder; import android.os.Bundle; import android.os.PersistableBundle; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java index a788a938357f..f730a244a593 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java @@ -45,10 +45,11 @@ import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java index 2801f32430ef..8604b0c48476 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java @@ -50,8 +50,9 @@ import android.os.PersistableBundle; import android.os.RemoteCallback; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IVoiceInteractor; diff --git a/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java b/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java index e20645c7d3c8..0efc0ab89a73 100644 --- a/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java +++ b/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import org.junit.Test; diff --git a/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java b/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java index b69054cebbd2..b519bf8b13f7 100644 --- a/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java +++ b/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import org.junit.Test; diff --git a/core/tests/coretests/src/android/app/timezone/RulesStateTest.java b/core/tests/coretests/src/android/app/timezone/RulesStateTest.java index dd462403ed82..bb535b6fac7d 100644 --- a/core/tests/coretests/src/android/app/timezone/RulesStateTest.java +++ b/core/tests/coretests/src/android/app/timezone/RulesStateTest.java @@ -16,14 +16,13 @@ package android.app.timezone; -import static junit.framework.Assert.fail; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import org.junit.Test; diff --git a/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java b/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java index 4004086354ca..df9ddea53c91 100644 --- a/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java +++ b/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java @@ -25,7 +25,8 @@ import static org.mockito.hamcrest.MockitoHamcrest.argThat; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; diff --git a/core/tests/coretests/src/android/app/usage/EventListTest.java b/core/tests/coretests/src/android/app/usage/EventListTest.java index 9dc0d4309a8f..685fcae46553 100644 --- a/core/tests/coretests/src/android/app/usage/EventListTest.java +++ b/core/tests/coretests/src/android/app/usage/EventListTest.java @@ -20,10 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/app/usage/UsageStatsTest.java b/core/tests/coretests/src/android/app/usage/UsageStatsTest.java index 28aaf1e05644..29fd8c527322 100644 --- a/core/tests/coretests/src/android/app/usage/UsageStatsTest.java +++ b/core/tests/coretests/src/android/app/usage/UsageStatsTest.java @@ -33,8 +33,9 @@ import static org.junit.Assert.fail; import android.app.usage.UsageEvents.Event; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java b/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java index 978ea7aa9c00..c307e648752d 100644 --- a/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java @@ -16,7 +16,6 @@ package android.content; - import static org.junit.Assert.fail; import android.app.ActivityManager; @@ -30,9 +29,10 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/content/AssetTest.java b/core/tests/coretests/src/android/content/AssetTest.java index b66574cee231..8e55e8a1a632 100644 --- a/core/tests/coretests/src/android/content/AssetTest.java +++ b/core/tests/coretests/src/android/content/AssetTest.java @@ -18,7 +18,8 @@ package android.content; import android.content.res.AssetManager; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.io.IOException; import java.io.InputStream; diff --git a/core/tests/coretests/src/android/content/BrickDeniedTest.java b/core/tests/coretests/src/android/content/BrickDeniedTest.java index 3d246b457ed5..d8c9baa8df5b 100644 --- a/core/tests/coretests/src/android/content/BrickDeniedTest.java +++ b/core/tests/coretests/src/android/content/BrickDeniedTest.java @@ -17,7 +17,8 @@ package android.content; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** Test to make sure brick intents <b>don't</b> work without permission. */ public class BrickDeniedTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/content/BroadcastReceiverTests.java b/core/tests/coretests/src/android/content/BroadcastReceiverTests.java index 8deccb7ffa7f..1509ff960ece 100644 --- a/core/tests/coretests/src/android/content/BroadcastReceiverTests.java +++ b/core/tests/coretests/src/android/content/BroadcastReceiverTests.java @@ -18,9 +18,9 @@ package android.content; import static org.junit.Assert.fail; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/content/ContentProviderOperationTest.java b/core/tests/coretests/src/android/content/ContentProviderOperationTest.java index aea124b08658..b142761760c4 100644 --- a/core/tests/coretests/src/android/content/ContentProviderOperationTest.java +++ b/core/tests/coretests/src/android/content/ContentProviderOperationTest.java @@ -16,22 +16,23 @@ package android.content; -import android.content.ContentValues; import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.os.Parcel; -import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; + +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; -import java.util.Set; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; @SmallTest public class ContentProviderOperationTest extends TestCase { diff --git a/core/tests/coretests/src/android/content/ContentProviderTest.java b/core/tests/coretests/src/android/content/ContentProviderTest.java index 2142f27ff6d8..8895f9bdf23d 100644 --- a/core/tests/coretests/src/android/content/ContentProviderTest.java +++ b/core/tests/coretests/src/android/content/ContentProviderTest.java @@ -23,7 +23,8 @@ import static org.mockito.Mockito.withSettings; import android.content.pm.ApplicationInfo; import android.content.pm.ProviderInfo; import android.net.Uri; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/content/ContentQueryMapTest.java b/core/tests/coretests/src/android/content/ContentQueryMapTest.java index f47bfdbb28fc..710623488552 100644 --- a/core/tests/coretests/src/android/content/ContentQueryMapTest.java +++ b/core/tests/coretests/src/android/content/ContentQueryMapTest.java @@ -16,16 +16,14 @@ package android.content; -import android.content.ContentQueryMap; -import android.content.ContentResolver; -import android.content.ContentValues; import android.database.Cursor; import android.os.Handler; import android.os.Looper; import android.provider.Settings; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; import java.util.Observable; import java.util.Observer; diff --git a/core/tests/coretests/src/android/content/ContentResolverTest.java b/core/tests/coretests/src/android/content/ContentResolverTest.java index 9940bf7dd692..f14f2896d8f5 100644 --- a/core/tests/coretests/src/android/content/ContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ContentResolverTest.java @@ -31,10 +31,11 @@ import android.graphics.Paint; import android.net.Uri; import android.os.MemoryFile; import android.os.ParcelFileDescriptor; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.util.Size; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/content/ContentValuesTest.java b/core/tests/coretests/src/android/content/ContentValuesTest.java index 7b39939b2d0c..0ab79e730ea1 100644 --- a/core/tests/coretests/src/android/content/ContentValuesTest.java +++ b/core/tests/coretests/src/android/content/ContentValuesTest.java @@ -17,8 +17,8 @@ package android.content; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; /* runtest -c android.content.ContentValuesTest frameworks-core @@ -29,7 +29,7 @@ import android.test.suitebuilder.annotation.SmallTest; adb shell pm uninstall -k com.android.frameworks.coretests && \ adb install out/target/product/bullhead/testcases/FrameworksCoreTests/FrameworksCoreTests.apk && \ adb shell am instrument -w -e package android.content \ - com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ public class ContentValuesTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index c8a3098690be..2f442c34f2c1 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -19,11 +19,12 @@ package android.content; import static org.junit.Assert.assertEquals; import android.app.ActivityThread; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.WindowManager; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java index 4362ec3a0ed6..22b23148cbcf 100644 --- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java @@ -19,7 +19,8 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; /** * To run the tests, use @@ -32,7 +33,7 @@ import android.support.test.filters.LargeTest; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ @LargeTest public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest { diff --git a/core/tests/coretests/src/android/content/MemoryFileProviderTest.java b/core/tests/coretests/src/android/content/MemoryFileProviderTest.java index bbe7c1008299..7cd486222101 100644 --- a/core/tests/coretests/src/android/content/MemoryFileProviderTest.java +++ b/core/tests/coretests/src/android/content/MemoryFileProviderTest.java @@ -18,9 +18,10 @@ package android.content; import android.net.Uri; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.io.InputStream; import java.util.Arrays; diff --git a/core/tests/coretests/src/android/content/RestrictionsManagerTest.java b/core/tests/coretests/src/android/content/RestrictionsManagerTest.java index 10d74f7d2945..fd5de3217389 100644 --- a/core/tests/coretests/src/android/content/RestrictionsManagerTest.java +++ b/core/tests/coretests/src/android/content/RestrictionsManagerTest.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License */ + package android.content; import android.os.Bundle; import android.os.Parcelable; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; +import androidx.test.filters.LargeTest; + import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java index f8b13f032652..dbe027800e3f 100644 --- a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java @@ -18,7 +18,8 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; /** * To run the tests, use @@ -31,7 +32,7 @@ import android.support.test.filters.LargeTest; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ @LargeTest public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest { diff --git a/core/tests/coretests/src/android/content/UriMatcherTest.java b/core/tests/coretests/src/android/content/UriMatcherTest.java index f3b9e76f3bcb..6cef46b0731a 100644 --- a/core/tests/coretests/src/android/content/UriMatcherTest.java +++ b/core/tests/coretests/src/android/content/UriMatcherTest.java @@ -17,14 +17,14 @@ package android.content; import android.net.Uri; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; import java.lang.reflect.Field; import java.util.ArrayList; - public class UriMatcherTest extends TestCase { static final int ROOT = 0; diff --git a/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java b/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java index 2acb08da4ef0..9b360db023d0 100644 --- a/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; @@ -20,7 +21,8 @@ import static android.content.pm.SharedLibraryNames.ANDROID_HIDL_BASE; import static android.content.pm.SharedLibraryNames.ANDROID_HIDL_MANAGER; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/AndroidTestBaseUpdaterTest.java b/core/tests/coretests/src/android/content/pm/AndroidTestBaseUpdaterTest.java index dce22ce6a6f2..0ed76dcf7c5d 100644 --- a/core/tests/coretests/src/android/content/pm/AndroidTestBaseUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/AndroidTestBaseUpdaterTest.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; import static android.content.pm.SharedLibraryNames.ANDROID_TEST_BASE; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/AndroidTestRunnerSplitUpdaterTest.java b/core/tests/coretests/src/android/content/pm/AndroidTestRunnerSplitUpdaterTest.java index 866de93c07fe..7f817d66caf7 100644 --- a/core/tests/coretests/src/android/content/pm/AndroidTestRunnerSplitUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/AndroidTestRunnerSplitUpdaterTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; @@ -20,7 +21,8 @@ import static android.content.pm.SharedLibraryNames.ANDROID_TEST_MOCK; import static android.content.pm.SharedLibraryNames.ANDROID_TEST_RUNNER; import android.content.pm.PackageBackwardCompatibility.AndroidTestRunnerSplitUpdater; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/ComponentTest.java b/core/tests/coretests/src/android/content/pm/ComponentTest.java index cc7564165bba..f31f0b5ee1b4 100644 --- a/core/tests/coretests/src/android/content/pm/ComponentTest.java +++ b/core/tests/coretests/src/android/content/pm/ComponentTest.java @@ -21,7 +21,14 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED; import static android.content.pm.PackageManager.GET_DISABLED_COMPONENTS; -import android.test.suitebuilder.annotation.Suppress; +import android.content.ComponentName; +import android.content.Intent; +import android.test.AndroidTestCase; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + import com.android.frameworks.coretests.enabled_app.DisabledActivity; import com.android.frameworks.coretests.enabled_app.DisabledProvider; import com.android.frameworks.coretests.enabled_app.DisabledReceiver; @@ -31,12 +38,6 @@ import com.android.frameworks.coretests.enabled_app.EnabledProvider; import com.android.frameworks.coretests.enabled_app.EnabledReceiver; import com.android.frameworks.coretests.enabled_app.EnabledService; -import android.content.ComponentName; -import android.content.Intent; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; - import java.util.List; /** diff --git a/core/tests/coretests/src/android/content/pm/LimitedLengthInputStreamTest.java b/core/tests/coretests/src/android/content/pm/LimitedLengthInputStreamTest.java index 1f762fdc49f4..1c703ab0b98f 100644 --- a/core/tests/coretests/src/android/content/pm/LimitedLengthInputStreamTest.java +++ b/core/tests/coretests/src/android/content/pm/LimitedLengthInputStreamTest.java @@ -17,7 +17,8 @@ package android.content.pm; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java b/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java index 659f9ea77956..1ddd753de80e 100644 --- a/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java +++ b/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java @@ -16,9 +16,12 @@ package android.content.pm; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; +import androidx.test.filters.LargeTest; + +import libcore.io.Streams; + import java.io.ByteArrayInputStream; import java.util.Arrays; @@ -26,8 +29,6 @@ import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import libcore.io.Streams; - @LargeTest public class MacAuthenticatedInputStreamTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/content/pm/OptionalClassRunner.java b/core/tests/coretests/src/android/content/pm/OptionalClassRunner.java index 91697c0d74f3..05db8ee29844 100644 --- a/core/tests/coretests/src/android/content/pm/OptionalClassRunner.java +++ b/core/tests/coretests/src/android/content/pm/OptionalClassRunner.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import org.junit.Assume; diff --git a/core/tests/coretests/src/android/content/pm/OrgApacheHttpLegacyUpdaterTest.java b/core/tests/coretests/src/android/content/pm/OrgApacheHttpLegacyUpdaterTest.java index dcd2707a9540..834a0bbeab89 100644 --- a/core/tests/coretests/src/android/content/pm/OrgApacheHttpLegacyUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/OrgApacheHttpLegacyUpdaterTest.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; import static android.content.pm.SharedLibraryNames.ORG_APACHE_HTTP_LEGACY; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/PackageBackwardCompatibilityTest.java b/core/tests/coretests/src/android/content/pm/PackageBackwardCompatibilityTest.java index c64d5202e1fd..3d7aab001227 100644 --- a/core/tests/coretests/src/android/content/pm/PackageBackwardCompatibilityTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageBackwardCompatibilityTest.java @@ -24,7 +24,8 @@ import static android.content.pm.SharedLibraryNames.ORG_APACHE_HTTP_LEGACY; import android.content.pm.PackageBackwardCompatibility.RemoveUnnecessaryAndroidTestBaseLibrary; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Assume; import org.junit.Test; diff --git a/core/tests/coretests/src/android/content/pm/PackageBuilder.java b/core/tests/coretests/src/android/content/pm/PackageBuilder.java index 4ceed834aab7..c5db9622b60d 100644 --- a/core/tests/coretests/src/android/content/pm/PackageBuilder.java +++ b/core/tests/coretests/src/android/content/pm/PackageBuilder.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static org.junit.Assert.assertEquals; diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 8ac9451deaf6..0ab536779296 100644 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -54,11 +54,12 @@ import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.filters.LargeTest; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + import com.android.frameworks.coretests.R; import com.android.internal.content.PackageHelper; diff --git a/core/tests/coretests/src/android/content/pm/PackageParserCacheHelperTest.java b/core/tests/coretests/src/android/content/pm/PackageParserCacheHelperTest.java index 00be82219e4f..e852f989a17f 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserCacheHelperTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserCacheHelperTest.java @@ -22,8 +22,9 @@ import android.content.pm.PackageParserCacheHelper.ReadHelper; import android.content.pm.PackageParserCacheHelper.WriteHelper; import android.os.Bundle; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index 3f91a65549a1..be1b1ce48276 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -29,9 +29,10 @@ import android.os.Build; import android.os.Bundle; import android.os.FileUtils; import android.os.SystemProperties; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/content/pm/PackageSharedLibraryUpdaterTest.java b/core/tests/coretests/src/android/content/pm/PackageSharedLibraryUpdaterTest.java index d5d3d7a6f2f4..71a0e5e51b71 100644 --- a/core/tests/coretests/src/android/content/pm/PackageSharedLibraryUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageSharedLibraryUpdaterTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import java.util.function.Supplier; diff --git a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java index 952bb5530c15..8874525ebc77 100644 --- a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java +++ b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java @@ -1,8 +1,25 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package android.content.pm; import android.os.Parcel; import android.os.Parcelable; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java index d3d1f22af3cb..365e97ded928 100644 --- a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java +++ b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java @@ -21,11 +21,12 @@ import android.os.FileUtils; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.AttributeSet; import android.util.SparseArray; +import androidx.test.filters.LargeTest; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; diff --git a/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryAndroidTestBaseLibraryTest.java b/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryAndroidTestBaseLibraryTest.java index 3dba4406de47..216b0c8950b7 100644 --- a/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryAndroidTestBaseLibraryTest.java +++ b/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryAndroidTestBaseLibraryTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; @@ -20,7 +21,8 @@ import static android.content.pm.SharedLibraryNames.ANDROID_TEST_BASE; import android.content.pm.PackageBackwardCompatibility.RemoveUnnecessaryAndroidTestBaseLibrary; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java b/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java index 15b27d71f81d..fc60980bb796 100644 --- a/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java +++ b/core/tests/coretests/src/android/content/pm/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.pm; import static android.content.pm.PackageBuilder.builder; @@ -20,7 +21,8 @@ import static android.content.pm.SharedLibraryNames.ORG_APACHE_HTTP_LEGACY; import android.content.pm.PackageBackwardCompatibility.RemoveUnnecessaryOrgApacheHttpLegacyLibrary; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/content/pm/SignatureTest.java b/core/tests/coretests/src/android/content/pm/SignatureTest.java index a3fa1a9c06cf..f0b4af6fc44f 100644 --- a/core/tests/coretests/src/android/content/pm/SignatureTest.java +++ b/core/tests/coretests/src/android/content/pm/SignatureTest.java @@ -16,7 +16,7 @@ package android.content.pm; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java b/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java index 68942cbd54ad..f6527da0ba1a 100644 --- a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java +++ b/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java @@ -16,12 +16,12 @@ package android.content.pm; -import android.content.pm.VerificationParams; import android.net.Uri; import android.os.Parcel; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; +import androidx.test.filters.LargeTest; + /** * Tests the android.content.pm.VerificationParams class * diff --git a/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java b/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java index 88d7a59a98e2..e7cd02d866d5 100644 --- a/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java +++ b/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java @@ -17,7 +17,8 @@ package android.content.pm; import android.os.Parcel; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import java.util.Random; diff --git a/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java b/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java index e248a7771cab..1ca879cde6c8 100644 --- a/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java +++ b/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java @@ -29,12 +29,21 @@ import android.content.pm.PackageParser.Package; import android.content.pm.PackageParser.PackageLite; import android.content.pm.PackageParser.PackageParserException; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; +import libcore.testing.io.TestIoUtils; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -45,14 +54,6 @@ import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import libcore.testing.io.TestIoUtils; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - @SmallTest @RunWith(AndroidJUnit4.class) public class DexMetadataHelperTest { diff --git a/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java b/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java index 47554a68645a..47b14bbaa8fa 100644 --- a/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java +++ b/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java @@ -17,9 +17,10 @@ package android.content.res; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; import android.util.TypedValue; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import java.lang.reflect.InvocationTargetException; diff --git a/core/tests/coretests/src/android/content/res/ConfigurationTest.java b/core/tests/coretests/src/android/content/res/ConfigurationTest.java index 72b9197089d7..2fc3e36e7948 100644 --- a/core/tests/coretests/src/android/content/res/ConfigurationTest.java +++ b/core/tests/coretests/src/android/content/res/ConfigurationTest.java @@ -13,19 +13,18 @@ * License for the specific language governing permissions and limitations under * the License. */ -package android.content.res; -import org.junit.runner.RunWith; -import org.junit.Test; -import org.junit.runners.JUnit4; +package android.content.res; -import android.content.res.Configuration; -import android.support.test.filters.SmallTest; import android.platform.test.annotations.Presubmit; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; -import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Build/install/run: bit FrameworksCoreTests:android.content.res.ConfigurationTest diff --git a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java index 42ff2e94a24e..7ab9d7f4ffe1 100644 --- a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java +++ b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.content.res; import static android.content.res.FontResourcesParser.FamilyResourceEntry; @@ -26,9 +27,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.app.Instrumentation; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java b/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java index e85666eb1639..aa1a5341de57 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java @@ -13,14 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ + package android.content.res; import android.os.FileUtils; import android.os.LocaleList; -import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; import android.util.DisplayMetrics; -import android.view.Display; + +import androidx.test.filters.SmallTest; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java index b2ff9278d83b..a2dab996a8d7 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java @@ -13,18 +13,20 @@ * License for the specific language governing permissions and limitations under * the License. */ + package android.content.res; import android.annotation.NonNull; import android.app.ResourcesManager; import android.os.Binder; import android.os.LocaleList; -import android.support.test.filters.SmallTest; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.Display; import android.view.DisplayAdjustments; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; public class ResourcesManagerTest extends TestCase { diff --git a/core/tests/coretests/src/android/database/CursorWindowTest.java b/core/tests/coretests/src/android/database/CursorWindowTest.java index 075f5b7f1d6a..123da3e8703b 100644 --- a/core/tests/coretests/src/android/database/CursorWindowTest.java +++ b/core/tests/coretests/src/android/database/CursorWindowTest.java @@ -16,14 +16,14 @@ package android.database; -import android.test.suitebuilder.annotation.SmallTest; -import android.database.CursorWindow; import android.test.PerformanceTestCase; -import java.util.Arrays; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; +import java.util.Arrays; + public class CursorWindowTest extends TestCase implements PerformanceTestCase { public boolean isPerformanceOnly() { return false; diff --git a/core/tests/coretests/src/android/database/DatabaseCursorTest.java b/core/tests/coretests/src/android/database/DatabaseCursorTest.java index 3507223b68ab..eb4fd70a1136 100644 --- a/core/tests/coretests/src/android/database/DatabaseCursorTest.java +++ b/core/tests/coretests/src/android/database/DatabaseCursorTest.java @@ -18,10 +18,6 @@ package android.database; import android.content.ContentValues; import android.content.Context; -import android.database.Cursor; -import android.database.CursorIndexOutOfBoundsException; -import android.database.DataSetObserver; -import android.database.DatabaseUtils; import android.database.sqlite.SQLiteCursor; import android.database.sqlite.SQLiteCursorDriver; import android.database.sqlite.SQLiteDatabase; @@ -29,11 +25,12 @@ import android.database.sqlite.SQLiteQuery; import android.os.Looper; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java index 9d75c784fe41..49fb75bf6a45 100644 --- a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java +++ b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java @@ -25,16 +25,17 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDebug; import android.database.sqlite.SQLiteException; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import android.util.Pair; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; + import junit.framework.Assert; import java.io.File; diff --git a/core/tests/coretests/src/android/database/DatabaseLocaleTest.java b/core/tests/coretests/src/android/database/DatabaseLocaleTest.java index b32829412cb5..ee7936fb8857 100644 --- a/core/tests/coretests/src/android/database/DatabaseLocaleTest.java +++ b/core/tests/coretests/src/android/database/DatabaseLocaleTest.java @@ -17,17 +17,17 @@ package android.database; import android.database.sqlite.SQLiteDatabase; -import android.database.Cursor; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; import android.test.MoreAsserts; +import android.util.Log; -import java.util.ArrayList; -import java.util.Locale; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.Locale; + public class DatabaseLocaleTest extends TestCase { private SQLiteDatabase mDatabase; diff --git a/core/tests/coretests/src/android/database/DatabaseLockTest.java b/core/tests/coretests/src/android/database/DatabaseLockTest.java index 8d3cf5a13124..e8936c98392e 100644 --- a/core/tests/coretests/src/android/database/DatabaseLockTest.java +++ b/core/tests/coretests/src/android/database/DatabaseLockTest.java @@ -17,11 +17,13 @@ package android.database; import android.database.sqlite.SQLiteDatabase; -import android.test.suitebuilder.annotation.Suppress; +import android.test.AndroidTestCase; import android.util.Log; + +import androidx.test.filters.Suppress; + import java.io.File; import java.util.concurrent.atomic.AtomicInteger; -import android.test.AndroidTestCase; /* * This is a series of unit tests for database locks. diff --git a/core/tests/coretests/src/android/database/DatabaseStatementTest.java b/core/tests/coretests/src/android/database/DatabaseStatementTest.java index 895d715c8cc0..4b34650183e3 100644 --- a/core/tests/coretests/src/android/database/DatabaseStatementTest.java +++ b/core/tests/coretests/src/android/database/DatabaseStatementTest.java @@ -17,14 +17,14 @@ package android.database; import android.content.Context; -import android.database.Cursor; import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDoneException; import android.database.sqlite.SQLiteStatement; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; import java.io.File; diff --git a/core/tests/coretests/src/android/database/DatabaseStressTest.java b/core/tests/coretests/src/android/database/DatabaseStressTest.java index 30e46e7dfb90..bfea1fc61eb7 100644 --- a/core/tests/coretests/src/android/database/DatabaseStressTest.java +++ b/core/tests/coretests/src/android/database/DatabaseStressTest.java @@ -17,11 +17,11 @@ package android.database; import android.content.Context; -import android.database.sqlite.*; +import android.database.sqlite.SQLiteDatabase; +import android.test.AndroidTestCase; import android.util.Log; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.Suppress; +import androidx.test.filters.Suppress; import java.io.File; diff --git a/core/tests/coretests/src/android/database/DatabaseUtilsTest.java b/core/tests/coretests/src/android/database/DatabaseUtilsTest.java index 7c206d7eecf7..be156c8eb67a 100644 --- a/core/tests/coretests/src/android/database/DatabaseUtilsTest.java +++ b/core/tests/coretests/src/android/database/DatabaseUtilsTest.java @@ -20,7 +20,7 @@ import static android.database.DatabaseUtils.bindSelection; import static org.junit.Assert.assertEquals; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/database/RedactingCursorTest.java b/core/tests/coretests/src/android/database/RedactingCursorTest.java index 93998f3db05f..e2d2bae0e8b2 100644 --- a/core/tests/coretests/src/android/database/RedactingCursorTest.java +++ b/core/tests/coretests/src/android/database/RedactingCursorTest.java @@ -22,8 +22,9 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.net.Uri; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/database/SQLiteOpenHelperTest.java b/core/tests/coretests/src/android/database/SQLiteOpenHelperTest.java index 9ed3f11b548f..730a3cb45856 100644 --- a/core/tests/coretests/src/android/database/SQLiteOpenHelperTest.java +++ b/core/tests/coretests/src/android/database/SQLiteOpenHelperTest.java @@ -26,11 +26,12 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabaseConfiguration; import android.database.sqlite.SQLiteDebug; import android.database.sqlite.SQLiteOpenHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/database/run_newdb_perf_test.sh b/core/tests/coretests/src/android/database/run_newdb_perf_test.sh index c5b2c97b572f..95f1f83bea10 100755 --- a/core/tests/coretests/src/android/database/run_newdb_perf_test.sh +++ b/core/tests/coretests/src/android/database/run_newdb_perf_test.sh @@ -23,7 +23,7 @@ echo "Running benchmark $RUN_N times" for (( i=0; i<$RUN_N; i++ )) do - adb shell am instrument -e class 'android.database.NewDatabasePerformanceTestSuite' -w 'com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner' + adb shell am instrument -e class 'android.database.NewDatabasePerformanceTestSuite' -w 'com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner' done adb logcat -d > /tmp/testlogcat.txt diff --git a/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java b/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java index 551a58ed7cb5..5dbcb3c46b50 100644 --- a/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java +++ b/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java @@ -22,9 +22,10 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.database.DatabaseUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Test; diff --git a/core/tests/coretests/src/android/database/sqlite/SQLiteConnectionPoolTest.java b/core/tests/coretests/src/android/database/sqlite/SQLiteConnectionPoolTest.java index ed14a5348ab4..f1d27d4a13ab 100644 --- a/core/tests/coretests/src/android/database/sqlite/SQLiteConnectionPoolTest.java +++ b/core/tests/coretests/src/android/database/sqlite/SQLiteConnectionPoolTest.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.HandlerThread; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/database/sqlite/SQLiteCursorTest.java b/core/tests/coretests/src/android/database/sqlite/SQLiteCursorTest.java index c52cf6ec5e5f..78d3c417dcf8 100644 --- a/core/tests/coretests/src/android/database/sqlite/SQLiteCursorTest.java +++ b/core/tests/coretests/src/android/database/sqlite/SQLiteCursorTest.java @@ -23,7 +23,8 @@ import android.database.Cursor; import android.database.CursorWindow; import android.platform.test.annotations.Presubmit; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import java.io.File; import java.util.Arrays; diff --git a/core/tests/coretests/src/android/graphics/BitmapFactoryTest.java b/core/tests/coretests/src/android/graphics/BitmapFactoryTest.java index e9e2a4d098f0..564460e18294 100644 --- a/core/tests/coretests/src/android/graphics/BitmapFactoryTest.java +++ b/core/tests/coretests/src/android/graphics/BitmapFactoryTest.java @@ -17,14 +17,14 @@ package android.graphics; import android.os.ParcelFileDescriptor; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; - public class BitmapFactoryTest extends TestCase { // tests that we can decode bitmaps from MemoryFiles diff --git a/core/tests/coretests/src/android/graphics/BitmapTest.java b/core/tests/coretests/src/android/graphics/BitmapTest.java index 3666dddb0782..e79d2ae1e194 100644 --- a/core/tests/coretests/src/android/graphics/BitmapTest.java +++ b/core/tests/coretests/src/android/graphics/BitmapTest.java @@ -16,11 +16,10 @@ package android.graphics; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; - public class BitmapTest extends TestCase { @SmallTest diff --git a/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java b/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java index 6e38fb685887..8e9b38cc5a1f 100644 --- a/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java +++ b/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java @@ -19,8 +19,8 @@ package android.graphics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/graphics/ColorStateListTest.java b/core/tests/coretests/src/android/graphics/ColorStateListTest.java index 374d1421bdbc..1d34f9383818 100644 --- a/core/tests/coretests/src/android/graphics/ColorStateListTest.java +++ b/core/tests/coretests/src/android/graphics/ColorStateListTest.java @@ -19,7 +19,8 @@ package android.graphics; import android.content.res.ColorStateList; import android.content.res.Resources; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/graphics/FontFileUtilTest.java b/core/tests/coretests/src/android/graphics/FontFileUtilTest.java index 76267b23a0ca..1771671db26a 100644 --- a/core/tests/coretests/src/android/graphics/FontFileUtilTest.java +++ b/core/tests/coretests/src/android/graphics/FontFileUtilTest.java @@ -22,11 +22,12 @@ import android.content.Context; import android.content.res.AssetManager; import android.graphics.fonts.FontFileUtil; import android.graphics.fonts.FontVariationAxis; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.util.Log; import android.util.Pair; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import org.junit.Test; import java.io.File; diff --git a/core/tests/coretests/src/android/graphics/GraphicsPerformanceTests.java b/core/tests/coretests/src/android/graphics/GraphicsPerformanceTests.java index 164c1aa770bd..3cfeb2546940 100644 --- a/core/tests/coretests/src/android/graphics/GraphicsPerformanceTests.java +++ b/core/tests/coretests/src/android/graphics/GraphicsPerformanceTests.java @@ -20,7 +20,8 @@ import android.content.Context; import android.content.res.Resources; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.Suppress; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/graphics/PaintTest.java b/core/tests/coretests/src/android/graphics/PaintTest.java index b5ed01f708b1..bf56df1c9441 100644 --- a/core/tests/coretests/src/android/graphics/PaintTest.java +++ b/core/tests/coretests/src/android/graphics/PaintTest.java @@ -18,9 +18,9 @@ package android.graphics; import static org.junit.Assert.assertNotEquals; -import android.graphics.Paint; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.util.Arrays; import java.util.HashSet; diff --git a/core/tests/coretests/src/android/graphics/PathOffsetTest.java b/core/tests/coretests/src/android/graphics/PathOffsetTest.java index 950f8731bae1..6cc42f6a3efc 100644 --- a/core/tests/coretests/src/android/graphics/PathOffsetTest.java +++ b/core/tests/coretests/src/android/graphics/PathOffsetTest.java @@ -16,13 +16,13 @@ package android.graphics; +import static org.junit.Assert.assertTrue; import android.graphics.Bitmap.Config; import android.graphics.Path.Direction; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; -import static org.junit.Assert.assertTrue; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/graphics/PathTest.java b/core/tests/coretests/src/android/graphics/PathTest.java index 78e4959da92a..c6d6d1ff90d5 100644 --- a/core/tests/coretests/src/android/graphics/PathTest.java +++ b/core/tests/coretests/src/android/graphics/PathTest.java @@ -16,11 +16,10 @@ package android.graphics; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; - public class PathTest extends TestCase { @SmallTest diff --git a/core/tests/coretests/src/android/graphics/RectTest.java b/core/tests/coretests/src/android/graphics/RectTest.java index d31d7d54940c..2918f44ad65d 100644 --- a/core/tests/coretests/src/android/graphics/RectTest.java +++ b/core/tests/coretests/src/android/graphics/RectTest.java @@ -23,8 +23,9 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/graphics/ThreadBitmapTest.java b/core/tests/coretests/src/android/graphics/ThreadBitmapTest.java index 909a8d97df51..e1ca7dfb7cc2 100644 --- a/core/tests/coretests/src/android/graphics/ThreadBitmapTest.java +++ b/core/tests/coretests/src/android/graphics/ThreadBitmapTest.java @@ -16,7 +16,7 @@ package android.graphics; -import android.test.suitebuilder.annotation.LargeTest; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java b/core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java index 6fdb71fcbab0..c66bac6cc335 100644 --- a/core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java +++ b/core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java @@ -27,12 +27,13 @@ import android.graphics.fonts.Font; import android.graphics.fonts.FontCustomizationParser; import android.graphics.fonts.FontFamily; import android.graphics.fonts.SystemFonts; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.FontConfig; import android.util.ArrayMap; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/graphics/TypefaceTest.java b/core/tests/coretests/src/android/graphics/TypefaceTest.java index b0c7976f8014..2d16f826b243 100644 --- a/core/tests/coretests/src/android/graphics/TypefaceTest.java +++ b/core/tests/coretests/src/android/graphics/TypefaceTest.java @@ -22,13 +22,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.res.AssetManager; import android.content.res.Resources; -import android.graphics.Paint; -import android.graphics.Typeface; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java b/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java index 781e343e8139..3dc998709b8f 100644 --- a/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java +++ b/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package android.graphics.drawable; import android.content.res.Resources; @@ -11,11 +27,12 @@ import android.graphics.Path.Direction; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.Log; import android.util.PathParser; +import androidx.test.filters.LargeTest; + import org.junit.Test; import java.io.File; diff --git a/core/tests/coretests/src/android/graphics/drawable/DrawableWrapperTest.java b/core/tests/coretests/src/android/graphics/drawable/DrawableWrapperTest.java index 655efb5239eb..d0a6ff9251cc 100644 --- a/core/tests/coretests/src/android/graphics/drawable/DrawableWrapperTest.java +++ b/core/tests/coretests/src/android/graphics/drawable/DrawableWrapperTest.java @@ -24,8 +24,9 @@ import android.graphics.ColorFilter; import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuffXfermode; import android.graphics.Xfermode; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/graphics/drawable/IconTest.java b/core/tests/coretests/src/android/graphics/drawable/IconTest.java index 64fadc03f0bb..2bdcc284154b 100644 --- a/core/tests/coretests/src/android/graphics/drawable/IconTest.java +++ b/core/tests/coretests/src/android/graphics/drawable/IconTest.java @@ -25,9 +25,10 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Parcel; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import java.io.ByteArrayOutputStream; diff --git a/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java b/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java index f90ae340b2e9..0a25bd7e3f2c 100644 --- a/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java +++ b/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java @@ -23,8 +23,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java index dcc51e121b32..823fca5a68ad 100644 --- a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java +++ b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java @@ -22,10 +22,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Pair; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java index f30b1a29c781..daf613976358 100644 --- a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java +++ b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java @@ -22,15 +22,12 @@ import android.graphics.Color; import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; -import android.hardware.display.DisplayManager; -import android.hardware.display.VirtualDisplay; import android.media.Image; import android.media.ImageReader; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.DisplayMetrics; import android.util.Log; @@ -40,6 +37,8 @@ import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; import android.widget.ImageView; +import androidx.test.filters.LargeTest; + import java.nio.ByteBuffer; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/core/tests/coretests/src/android/metrics/LogMakerTest.java b/core/tests/coretests/src/android/metrics/LogMakerTest.java index 3be776deb9f1..aabfc2872269 100644 --- a/core/tests/coretests/src/android/metrics/LogMakerTest.java +++ b/core/tests/coretests/src/android/metrics/LogMakerTest.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.metrics; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/core/tests/coretests/src/android/metrics/MetricsReaderTest.java b/core/tests/coretests/src/android/metrics/MetricsReaderTest.java index 784a12fa1f57..96dac648c01e 100644 --- a/core/tests/coretests/src/android/metrics/MetricsReaderTest.java +++ b/core/tests/coretests/src/android/metrics/MetricsReaderTest.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.metrics; import android.metrics.MetricsReader.Event; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/core/tests/coretests/src/android/net/LocalSocketTest.java b/core/tests/coretests/src/android/net/LocalSocketTest.java index 1286b137cc1f..91722377df09 100644 --- a/core/tests/coretests/src/android/net/LocalSocketTest.java +++ b/core/tests/coretests/src/android/net/LocalSocketTest.java @@ -16,12 +16,9 @@ package android.net; -import android.net.Credentials; -import android.net.LocalServerSocket; -import android.net.LocalSocket; -import android.net.LocalSocketAddress; import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/net/NetworkKeyTest.java b/core/tests/coretests/src/android/net/NetworkKeyTest.java index fff23a04db9f..0f1c71d7c601 100644 --- a/core/tests/coretests/src/android/net/NetworkKeyTest.java +++ b/core/tests/coretests/src/android/net/NetworkKeyTest.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package android.net; import static org.junit.Assert.assertEquals; @@ -7,7 +23,8 @@ import static org.mockito.Mockito.when; import android.net.wifi.ScanResult; import android.net.wifi.WifiInfo; import android.net.wifi.WifiSsid; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java b/core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java index c6758ce1950d..29e212f4839e 100644 --- a/core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java +++ b/core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.net; import static android.net.NetworkPolicyManager.MASK_ALL_NETWORKS; diff --git a/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java b/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java index ff9816ad090c..3e45a79951d3 100644 --- a/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java +++ b/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package android.net; import static junit.framework.Assert.assertFalse; @@ -9,7 +25,8 @@ import static org.mockito.Matchers.eq; import android.Manifest.permission; import android.content.Context; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/net/SSLCertificateSocketFactoryTest.java b/core/tests/coretests/src/android/net/SSLCertificateSocketFactoryTest.java index 5cbf02a79083..bc12e727c5f0 100644 --- a/core/tests/coretests/src/android/net/SSLCertificateSocketFactoryTest.java +++ b/core/tests/coretests/src/android/net/SSLCertificateSocketFactoryTest.java @@ -19,7 +19,7 @@ package android.net; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/net/SSLSessionCacheTest.java b/core/tests/coretests/src/android/net/SSLSessionCacheTest.java index 11d066b3afb0..eec09e65a501 100644 --- a/core/tests/coretests/src/android/net/SSLSessionCacheTest.java +++ b/core/tests/coretests/src/android/net/SSLSessionCacheTest.java @@ -19,10 +19,10 @@ package android.net; import com.android.org.conscrypt.ClientSessionContext; import com.android.org.conscrypt.SSLClientSessionCache; -import org.mockito.Mockito; - import junit.framework.TestCase; +import org.mockito.Mockito; + import java.security.KeyManagementException; import java.security.SecureRandom; diff --git a/core/tests/coretests/src/android/net/ScoredNetworkTest.java b/core/tests/coretests/src/android/net/ScoredNetworkTest.java index 109f32e1a48e..d984d86e1147 100644 --- a/core/tests/coretests/src/android/net/ScoredNetworkTest.java +++ b/core/tests/coretests/src/android/net/ScoredNetworkTest.java @@ -16,11 +16,17 @@ package android.net; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import android.os.Bundle; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/net/SntpClientTest.java b/core/tests/coretests/src/android/net/SntpClientTest.java index d72738c6e32c..87edb6e01425 100644 --- a/core/tests/coretests/src/android/net/SntpClientTest.java +++ b/core/tests/coretests/src/android/net/SntpClientTest.java @@ -20,9 +20,10 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import libcore.util.HexEncoding; import org.junit.Before; diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java index ea0347d67ad7..a33de7bb2d9d 100644 --- a/core/tests/coretests/src/android/net/UriTest.java +++ b/core/tests/coretests/src/android/net/UriTest.java @@ -18,7 +18,8 @@ package android.net; import android.content.ContentUris; import android.os.Parcel; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/net/WebAddressTest.java b/core/tests/coretests/src/android/net/WebAddressTest.java index 6fcb97ea8b5f..70a62533d8e1 100644 --- a/core/tests/coretests/src/android/net/WebAddressTest.java +++ b/core/tests/coretests/src/android/net/WebAddressTest.java @@ -16,8 +16,8 @@ package android.net; -import android.net.WebAddress; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; public class WebAddressTest extends TestCase { diff --git a/core/tests/coretests/src/android/net/http/SslCertificateTest.java b/core/tests/coretests/src/android/net/http/SslCertificateTest.java index 6a30c6c5afdf..1beb1de0075c 100644 --- a/core/tests/coretests/src/android/net/http/SslCertificateTest.java +++ b/core/tests/coretests/src/android/net/http/SslCertificateTest.java @@ -17,12 +17,13 @@ package android.net.http; -import android.net.http.SslCertificate; -import android.test.suitebuilder.annotation.LargeTest; +import androidx.test.filters.LargeTest; + +import junit.framework.TestCase; + import java.io.ByteArrayInputStream; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import junit.framework.TestCase; public class SslCertificateTest extends TestCase { diff --git a/core/tests/coretests/src/android/os/AidlTest.java b/core/tests/coretests/src/android/os/AidlTest.java index bf11d56de045..4c5141537c6a 100644 --- a/core/tests/coretests/src/android/os/AidlTest.java +++ b/core/tests/coretests/src/android/os/AidlTest.java @@ -16,11 +16,10 @@ package android.os; -import android.os.IInterface; -import android.os.Parcel; -import android.os.Parcelable; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; + import com.google.android.collect.Lists; + import junit.framework.TestCase; import java.util.List; diff --git a/core/tests/coretests/src/android/os/BinderProxyCountingTest.java b/core/tests/coretests/src/android/os/BinderProxyCountingTest.java index 6cdb35abce5a..ce6ad87a310e 100644 --- a/core/tests/coretests/src/android/os/BinderProxyCountingTest.java +++ b/core/tests/coretests/src/android/os/BinderProxyCountingTest.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package android.os; import static org.junit.Assert.assertEquals; @@ -25,12 +24,13 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.aidl.IBpcCallbackObserver; import com.android.frameworks.coretests.aidl.IBpcTestAppCmdService; import com.android.frameworks.coretests.aidl.IBpcTestServiceCmdService; @@ -63,7 +63,7 @@ import java.util.function.Consumer; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class android.os.BinderProxyCountingTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner * * or * diff --git a/core/tests/coretests/src/android/os/BinderProxyTest.java b/core/tests/coretests/src/android/os/BinderProxyTest.java index 4c36b5c359a2..aceda2d0524b 100644 --- a/core/tests/coretests/src/android/os/BinderProxyTest.java +++ b/core/tests/coretests/src/android/os/BinderProxyTest.java @@ -19,7 +19,8 @@ package android.os; import android.annotation.Nullable; import android.content.Context; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; public class BinderProxyTest extends AndroidTestCase { private static class CountingListener implements Binder.ProxyTransactListener { diff --git a/core/tests/coretests/src/android/os/BinderTest.java b/core/tests/coretests/src/android/os/BinderTest.java index 6c9c3c111ff8..a354195c75a3 100644 --- a/core/tests/coretests/src/android/os/BinderTest.java +++ b/core/tests/coretests/src/android/os/BinderTest.java @@ -16,7 +16,7 @@ package android.os; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/os/BinderThreadPriorityService.java b/core/tests/coretests/src/android/os/BinderThreadPriorityService.java index 47a4483b8a29..ed42058d3ef4 100644 --- a/core/tests/coretests/src/android/os/BinderThreadPriorityService.java +++ b/core/tests/coretests/src/android/os/BinderThreadPriorityService.java @@ -18,7 +18,6 @@ package android.os; import android.app.Service; import android.content.Intent; -import android.text.TextUtils; import android.util.Log; /** diff --git a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java index 56e977c7d687..48c9df65da61 100644 --- a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java +++ b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; import java.io.File; diff --git a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java index 5664df6e9744..e16a3dbe4a26 100644 --- a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java +++ b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java @@ -24,9 +24,10 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/os/BrightnessLimit.java b/core/tests/coretests/src/android/os/BrightnessLimit.java index fabcf3d920a9..5a3724f7aa24 100644 --- a/core/tests/coretests/src/android/os/BrightnessLimit.java +++ b/core/tests/coretests/src/android/os/BrightnessLimit.java @@ -18,7 +18,6 @@ package android.os; import android.app.Activity; import android.hardware.display.DisplayManager; -import android.os.Bundle; import android.provider.Settings; import android.view.View; import android.view.View.OnClickListener; diff --git a/core/tests/coretests/src/android/os/BroadcasterTest.java b/core/tests/coretests/src/android/os/BroadcasterTest.java index 551ea8d7d5d4..b4c47af93355 100644 --- a/core/tests/coretests/src/android/os/BroadcasterTest.java +++ b/core/tests/coretests/src/android/os/BroadcasterTest.java @@ -16,11 +16,8 @@ package android.os; -import android.os.Broadcaster; -import android.os.Handler; -import android.os.Message; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.MediumTest; + import junit.framework.TestCase; public class BroadcasterTest extends TestCase { diff --git a/core/tests/coretests/src/android/os/BuildTest.java b/core/tests/coretests/src/android/os/BuildTest.java index 37586279d980..decc76869a53 100644 --- a/core/tests/coretests/src/android/os/BuildTest.java +++ b/core/tests/coretests/src/android/os/BuildTest.java @@ -16,9 +16,8 @@ package android.os; -import android.os.Build; -import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; +import androidx.test.filters.SmallTest; + import junit.framework.Assert; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/os/BundleTest.java b/core/tests/coretests/src/android/os/BundleTest.java index 9fcf96d6f3ae..e4dc99347802 100644 --- a/core/tests/coretests/src/android/os/BundleTest.java +++ b/core/tests/coretests/src/android/os/BundleTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/os/EnvironmentTest.java b/core/tests/coretests/src/android/os/EnvironmentTest.java index 5189df574a33..d98ceaf57dd9 100644 --- a/core/tests/coretests/src/android/os/EnvironmentTest.java +++ b/core/tests/coretests/src/android/os/EnvironmentTest.java @@ -25,8 +25,9 @@ import static android.os.Environment.classifyExternalStorageDirectory; import static org.junit.Assert.assertEquals; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/os/FileObserverTest.java b/core/tests/coretests/src/android/os/FileObserverTest.java index 93e27af44170..ece7645b7389 100644 --- a/core/tests/coretests/src/android/os/FileObserverTest.java +++ b/core/tests/coretests/src/android/os/FileObserverTest.java @@ -16,13 +16,14 @@ package android.os; -import com.google.android.collect.Lists; -import com.google.android.collect.Maps; - import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; +import androidx.test.filters.MediumTest; + +import com.google.android.collect.Lists; +import com.google.android.collect.Maps; + import java.io.File; import java.io.FileOutputStream; import java.util.Iterator; diff --git a/core/tests/coretests/src/android/os/FileUtilsTest.java b/core/tests/coretests/src/android/os/FileUtilsTest.java index 514ea0cc013e..5bce227cdf48 100644 --- a/core/tests/coretests/src/android/os/FileUtilsTest.java +++ b/core/tests/coretests/src/android/os/FileUtilsTest.java @@ -51,8 +51,9 @@ import static org.junit.Assert.fail; import android.content.Context; import android.os.FileUtils.MemoryPipe; import android.provider.DocumentsContract.Document; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import libcore.io.Streams; diff --git a/core/tests/coretests/src/android/os/HandlerTester.java b/core/tests/coretests/src/android/os/HandlerTester.java index a216a0bf7169..fa442f474d6e 100644 --- a/core/tests/coretests/src/android/os/HandlerTester.java +++ b/core/tests/coretests/src/android/os/HandlerTester.java @@ -16,10 +16,6 @@ package android.os; -import android.os.Handler; -import android.os.Looper; -import android.os.Message; - public abstract class HandlerTester extends Thread { public abstract void go(); public abstract void handleMessage(Message msg); diff --git a/core/tests/coretests/src/android/os/HandlerThreadTest.java b/core/tests/coretests/src/android/os/HandlerThreadTest.java index 9772aa427999..93cfc40d555e 100644 --- a/core/tests/coretests/src/android/os/HandlerThreadTest.java +++ b/core/tests/coretests/src/android/os/HandlerThreadTest.java @@ -16,13 +16,9 @@ package android.os; +import androidx.test.filters.MediumTest; + import junit.framework.TestCase; -import android.os.Handler; -import android.os.HandlerThread; -import android.os.Message; -import android.os.Process; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; public class HandlerThreadTest extends TestCase { private static final int TEST_WHAT = 1; diff --git a/core/tests/coretests/src/android/os/IdleHandlerTest.java b/core/tests/coretests/src/android/os/IdleHandlerTest.java index 6c0a862aa2ea..d8886c97838e 100644 --- a/core/tests/coretests/src/android/os/IdleHandlerTest.java +++ b/core/tests/coretests/src/android/os/IdleHandlerTest.java @@ -16,11 +16,10 @@ package android.os; -import android.os.Handler; -import android.os.Looper; -import android.os.Message; import android.os.MessageQueue.IdleHandler; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; + import junit.framework.TestCase; public class IdleHandlerTest extends TestCase { diff --git a/core/tests/coretests/src/android/os/LocaleListTest.java b/core/tests/coretests/src/android/os/LocaleListTest.java index 17ef7730f452..1f00a7a12c54 100644 --- a/core/tests/coretests/src/android/os/LocaleListTest.java +++ b/core/tests/coretests/src/android/os/LocaleListTest.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.os; -import android.test.suitebuilder.annotation.SmallTest; +package android.os; -import java.util.Locale; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; +import java.util.Locale; + public class LocaleListTest extends TestCase { @SmallTest public void testConstructor() throws Exception { diff --git a/core/tests/coretests/src/android/os/MemoryFileTest.java b/core/tests/coretests/src/android/os/MemoryFileTest.java index 20b298d639d2..05c2995fa158 100644 --- a/core/tests/coretests/src/android/os/MemoryFileTest.java +++ b/core/tests/coretests/src/android/os/MemoryFileTest.java @@ -17,8 +17,9 @@ package android.os; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.SmallTest; import java.io.IOException; import java.io.InputStream; diff --git a/core/tests/coretests/src/android/os/MessageQueueTest.java b/core/tests/coretests/src/android/os/MessageQueueTest.java index 1cd1020bfe3a..2c5588e6ed0d 100644 --- a/core/tests/coretests/src/android/os/MessageQueueTest.java +++ b/core/tests/coretests/src/android/os/MessageQueueTest.java @@ -16,11 +16,9 @@ package android.os; -import android.os.Handler; -import android.os.Message; -import android.os.SystemClock; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + import junit.framework.TestCase; @Suppress // Failing. diff --git a/core/tests/coretests/src/android/os/MessengerService.java b/core/tests/coretests/src/android/os/MessengerService.java index f15e13408084..db3347197d90 100644 --- a/core/tests/coretests/src/android/os/MessengerService.java +++ b/core/tests/coretests/src/android/os/MessengerService.java @@ -18,11 +18,6 @@ package android.os; import android.app.Service; import android.content.Intent; -import android.os.RemoteException; -import android.os.IBinder; -import android.os.Handler; -import android.os.Message; -import android.os.Messenger; public class MessengerService extends Service { private final Handler mHandler = new Handler() { diff --git a/core/tests/coretests/src/android/os/MessengerTest.java b/core/tests/coretests/src/android/os/MessengerTest.java index 473ffe2298b3..9143ff1d1017 100644 --- a/core/tests/coretests/src/android/os/MessengerTest.java +++ b/core/tests/coretests/src/android/os/MessengerTest.java @@ -20,13 +20,9 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.os.RemoteException; -import android.os.Handler; -import android.os.IBinder; -import android.os.Message; -import android.os.Messenger; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; public class MessengerTest extends AndroidTestCase { private Messenger mServiceMessenger; diff --git a/core/tests/coretests/src/android/os/OsTests.java b/core/tests/coretests/src/android/os/OsTests.java index 2b841269e5ae..08fb945857e9 100644 --- a/core/tests/coretests/src/android/os/OsTests.java +++ b/core/tests/coretests/src/android/os/OsTests.java @@ -16,12 +16,8 @@ package android.os; -import com.google.android.collect.Lists; import junit.framework.TestSuite; -import java.util.Enumeration; -import java.util.List; - public class OsTests { public static TestSuite suite() { TestSuite suite = new TestSuite(OsTests.class.getName()); diff --git a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java index 516dc0ab135c..a6b296d37f82 100644 --- a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java +++ b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java @@ -20,10 +20,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; import android.util.ArrayMap; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/os/PatternMatcherTest.java b/core/tests/coretests/src/android/os/PatternMatcherTest.java index 9645ccc11b76..82350cd5ffdf 100644 --- a/core/tests/coretests/src/android/os/PatternMatcherTest.java +++ b/core/tests/coretests/src/android/os/PatternMatcherTest.java @@ -1,9 +1,27 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package android.os; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; -import org.junit.runner.RunWith; + import org.junit.Test; +import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @RunWith(JUnit4.class) diff --git a/core/tests/coretests/src/android/os/PerformanceCollectorTest.java b/core/tests/coretests/src/android/os/PerformanceCollectorTest.java index 7533c84673de..38ad90f11a23 100644 --- a/core/tests/coretests/src/android/os/PerformanceCollectorTest.java +++ b/core/tests/coretests/src/android/os/PerformanceCollectorTest.java @@ -17,15 +17,16 @@ package android.os; import android.os.PerformanceCollector.PerformanceResultsWriter; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; + +import junit.framework.TestCase; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Random; -import junit.framework.TestCase; - public class PerformanceCollectorTest extends TestCase { private PerformanceCollector mPerfCollector; diff --git a/core/tests/coretests/src/android/os/PowerManagerTest.java b/core/tests/coretests/src/android/os/PowerManagerTest.java index a828f4418515..1b587dd92db0 100644 --- a/core/tests/coretests/src/android/os/PowerManagerTest.java +++ b/core/tests/coretests/src/android/os/PowerManagerTest.java @@ -21,10 +21,11 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Test; diff --git a/core/tests/coretests/src/android/os/PowerManagerVrTest.java b/core/tests/coretests/src/android/os/PowerManagerVrTest.java index e01e5fa4faee..5d2c65b0153c 100644 --- a/core/tests/coretests/src/android/os/PowerManagerVrTest.java +++ b/core/tests/coretests/src/android/os/PowerManagerVrTest.java @@ -19,16 +19,14 @@ package android.os; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; -import android.os.PowerManager; -import android.os.RemoteException; -import android.os.ServiceManager; import android.provider.Settings; -import android.service.dreams.IDreamManager; import android.service.dreams.DreamService; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import android.service.dreams.IDreamManager; import android.test.ActivityInstrumentationTestCase2; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; + /** * Tests dream aspects of PowerManager. */ diff --git a/core/tests/coretests/src/android/os/ProcessTest.java b/core/tests/coretests/src/android/os/ProcessTest.java index 1f5b7c829831..b749e715316a 100644 --- a/core/tests/coretests/src/android/os/ProcessTest.java +++ b/core/tests/coretests/src/android/os/ProcessTest.java @@ -17,14 +17,10 @@ package android.os; -import android.os.Process; -import android.os.UserHandle; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.MediumTest; import junit.framework.TestCase; - public class ProcessTest extends TestCase { @MediumTest diff --git a/core/tests/coretests/src/android/os/RedactingFileDescriptorTest.java b/core/tests/coretests/src/android/os/RedactingFileDescriptorTest.java index 9e1523165925..d5163e193510 100644 --- a/core/tests/coretests/src/android/os/RedactingFileDescriptorTest.java +++ b/core/tests/coretests/src/android/os/RedactingFileDescriptorTest.java @@ -24,10 +24,11 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.system.Os; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java b/core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java index 9e445541ad3a..8085993389bb 100644 --- a/core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java +++ b/core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.os; import android.app.ActivityManager; @@ -20,10 +21,10 @@ import android.app.VrManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import android.os.Process; import android.provider.Settings; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** * Tests ActivityManager#setPersistentVrThread and ActivityManager#setVrThread's diff --git a/core/tests/coretests/src/android/os/TestHandlerThread.java b/core/tests/coretests/src/android/os/TestHandlerThread.java index 7e84af363a86..8c0330b4bb45 100644 --- a/core/tests/coretests/src/android/os/TestHandlerThread.java +++ b/core/tests/coretests/src/android/os/TestHandlerThread.java @@ -16,11 +16,6 @@ package android.os; -import android.os.Handler; -import android.os.Looper; -import android.os.Message; -import android.os.MessageQueue.IdleHandler; - abstract class TestHandlerThread { private boolean mDone = false; private boolean mSuccess = false; diff --git a/core/tests/coretests/src/android/os/TestVrActivity.java b/core/tests/coretests/src/android/os/TestVrActivity.java index 33ff1645b37b..75df7c22fe65 100644 --- a/core/tests/coretests/src/android/os/TestVrActivity.java +++ b/core/tests/coretests/src/android/os/TestVrActivity.java @@ -17,7 +17,6 @@ package android.os; import android.app.Activity; -import android.os.Bundle; import android.service.vr.VrListenerService; import java.util.concurrent.CountDownLatch; diff --git a/core/tests/coretests/src/android/os/TraceTest.java b/core/tests/coretests/src/android/os/TraceTest.java index 1541553f36f1..5cad549d39bf 100644 --- a/core/tests/coretests/src/android/os/TraceTest.java +++ b/core/tests/coretests/src/android/os/TraceTest.java @@ -16,13 +16,13 @@ package android.os; -import android.os.Debug; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.filters.LargeTest; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + /** * This class is used to test the native tracing support. Run this test * while tracing on the emulator and then run traceview to view the trace. diff --git a/core/tests/coretests/src/android/os/UserHandleTest.java b/core/tests/coretests/src/android/os/UserHandleTest.java index af559fddd48a..4a1cdbfe3114 100644 --- a/core/tests/coretests/src/android/os/UserHandleTest.java +++ b/core/tests/coretests/src/android/os/UserHandleTest.java @@ -25,7 +25,7 @@ import static android.os.UserHandle.getUserId; import static org.junit.Assert.assertEquals; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/os/VintfObjectTest.java b/core/tests/coretests/src/android/os/VintfObjectTest.java index 44510c2379f5..af3660a6dab9 100644 --- a/core/tests/coretests/src/android/os/VintfObjectTest.java +++ b/core/tests/coretests/src/android/os/VintfObjectTest.java @@ -16,7 +16,6 @@ package android.os; -import junit.framework.Assert; import junit.framework.TestCase; public class VintfObjectTest extends TestCase { diff --git a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java index 3ec297c27a2a..62f2ac28a601 100644 --- a/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java +++ b/core/tests/coretests/src/android/os/storage/StorageManagerIntegrationTest.java @@ -19,7 +19,8 @@ package android.os.storage; import android.os.ParcelFileDescriptor; import android.os.ProxyFileDescriptorCallback; import android.system.ErrnoException; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/preference/ListPreferenceTest.java b/core/tests/coretests/src/android/preference/ListPreferenceTest.java index 72f62f167989..51dbb64244fc 100644 --- a/core/tests/coretests/src/android/preference/ListPreferenceTest.java +++ b/core/tests/coretests/src/android/preference/ListPreferenceTest.java @@ -16,10 +16,10 @@ package android.preference; -import android.preference.ListPreference; -import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; +import androidx.test.filters.LargeTest; + @LargeTest public class ListPreferenceTest extends AndroidTestCase { public void testListPreferenceSummaryFromEntries() { diff --git a/core/tests/coretests/src/android/preference/PreferenceIconSpaceTest.java b/core/tests/coretests/src/android/preference/PreferenceIconSpaceTest.java index 654474cba699..0deb77e60a51 100644 --- a/core/tests/coretests/src/android/preference/PreferenceIconSpaceTest.java +++ b/core/tests/coretests/src/android/preference/PreferenceIconSpaceTest.java @@ -16,20 +16,20 @@ package android.preference; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java index 5d12f7e43558..94d85e63cc5f 100644 --- a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java +++ b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java @@ -41,9 +41,10 @@ import android.print.test.services.PrintServiceCallbacks; import android.print.test.services.PrinterDiscoverySessionCallbacks; import android.print.test.services.StubbablePrinterDiscoverySession; import android.printservice.recommendation.IRecommendationsChangeListener; -import android.support.test.filters.LargeTest; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java index 800b86418163..17e9654b651a 100644 --- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java +++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java @@ -28,9 +28,10 @@ import android.content.ContentResolver; import android.os.Bundle; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Test; diff --git a/core/tests/coretests/src/android/provider/DocumentsProviderTest.java b/core/tests/coretests/src/android/provider/DocumentsProviderTest.java index 1465d0a98394..02a9adf4fb4d 100644 --- a/core/tests/coretests/src/android/provider/DocumentsProviderTest.java +++ b/core/tests/coretests/src/android/provider/DocumentsProviderTest.java @@ -20,9 +20,10 @@ import android.content.ContentProviderClient; import android.content.ContentResolver; import android.net.Uri; import android.provider.DocumentsContract.Path; -import android.support.test.filters.SmallTest; import android.test.ProviderTestCase2; +import androidx.test.filters.SmallTest; + import java.util.Arrays; /** diff --git a/core/tests/coretests/src/android/provider/FontsContractE2ETest.java b/core/tests/coretests/src/android/provider/FontsContractE2ETest.java index 29558696436d..7e02be85f01a 100644 --- a/core/tests/coretests/src/android/provider/FontsContractE2ETest.java +++ b/core/tests/coretests/src/android/provider/FontsContractE2ETest.java @@ -25,25 +25,25 @@ import static org.junit.Assert.assertSame; import android.app.Instrumentation; import android.content.Context; import android.content.pm.PackageInfo; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; import android.graphics.Typeface; import android.os.Handler; -import android.provider.FontsContract.Columns; import android.provider.FontsContract.FontFamilyResult; -import android.provider.FontsContract.FontInfo; -import android.provider.FontsContract; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; -import java.util.ArrayList; -import java.util.List; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; +import java.util.List; + @SmallTest @RunWith(AndroidJUnit4.class) public class FontsContractE2ETest { diff --git a/core/tests/coretests/src/android/provider/FontsContractTest.java b/core/tests/coretests/src/android/provider/FontsContractTest.java index d42d79e8fd82..c5d6f7fad3e8 100644 --- a/core/tests/coretests/src/android/provider/FontsContractTest.java +++ b/core/tests/coretests/src/android/provider/FontsContractTest.java @@ -13,31 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.provider; +import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_NOT_FOUND; +import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_UNAVAILABLE; +import static android.provider.FontsContract.Columns.RESULT_CODE_MALFORMED_QUERY; +import static android.provider.FontsContract.Columns.RESULT_CODE_OK; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static android.provider.FontsContract.Columns.RESULT_CODE_OK; -import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_NOT_FOUND; -import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_UNAVAILABLE; -import static android.provider.FontsContract.Columns.RESULT_CODE_MALFORMED_QUERY; - import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ProviderInfo; import android.content.pm.Signature; import android.database.MatrixCursor; import android.graphics.fonts.FontVariationAxis; import android.provider.FontsContract.FontInfo; -import android.support.test.filters.SmallTest; import android.test.ProviderTestCase2; import android.util.Base64; +import androidx.test.filters.SmallTest; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/core/tests/coretests/src/android/provider/MockFontProvider.java b/core/tests/coretests/src/android/provider/MockFontProvider.java index ad5b130ca90d..e527dec13baf 100644 --- a/core/tests/coretests/src/android/provider/MockFontProvider.java +++ b/core/tests/coretests/src/android/provider/MockFontProvider.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.provider; import static android.provider.FontsContract.Columns; @@ -21,16 +22,13 @@ import android.content.ContentProvider; import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; -import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; import android.database.Cursor; import android.database.MatrixCursor; -import android.graphics.fonts.FontVariationAxis; import android.net.Uri; -import android.os.CancellationSignal; import android.os.ParcelFileDescriptor; -import android.util.ArraySet; -import android.util.SparseArray; + +import com.android.internal.annotations.GuardedBy; import java.io.File; import java.io.FileNotFoundException; @@ -46,8 +44,6 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.android.internal.annotations.GuardedBy; - public class MockFontProvider extends ContentProvider { final static String AUTHORITY = "android.provider.fonts.font"; diff --git a/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java b/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java index 7458de5fd310..f84355f6755e 100644 --- a/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java +++ b/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java @@ -21,9 +21,9 @@ import android.content.ContentResolver; import android.database.Cursor; import android.net.Uri; import android.test.ProviderTestCase2; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; /** * ProviderTestCase that performs unit tests of SearchRecentSuggestionsProvider. diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index df4600e07047..667519c3908c 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -27,8 +27,9 @@ import static java.lang.reflect.Modifier.isPublic; import static java.lang.reflect.Modifier.isStatic; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/provider/SettingsProviderTest.java b/core/tests/coretests/src/android/provider/SettingsProviderTest.java index cb6f0e692082..a5f5f6733237 100644 --- a/core/tests/coretests/src/android/provider/SettingsProviderTest.java +++ b/core/tests/coretests/src/android/provider/SettingsProviderTest.java @@ -34,9 +34,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; import java.util.HashMap; import java.util.List; diff --git a/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java b/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java index b0d29bd1d8f0..08f9de602684 100644 --- a/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java +++ b/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java @@ -22,8 +22,9 @@ import static org.junit.Assert.fail; import android.platform.test.annotations.Presubmit; import android.provider.SettingsValidators.Validator; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/provider/SmsProviderTest.java b/core/tests/coretests/src/android/provider/SmsProviderTest.java index af4d1a66053a..67ac8ea8d49b 100644 --- a/core/tests/coretests/src/android/provider/SmsProviderTest.java +++ b/core/tests/coretests/src/android/provider/SmsProviderTest.java @@ -22,8 +22,9 @@ import android.database.Cursor; import android.net.Uri; import android.provider.Telephony.Sms; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.Suppress; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; import java.util.GregorianCalendar; diff --git a/core/tests/coretests/src/android/provider/TestFontsProvider.java b/core/tests/coretests/src/android/provider/TestFontsProvider.java index 46906dfa1284..c3457faf9af5 100644 --- a/core/tests/coretests/src/android/provider/TestFontsProvider.java +++ b/core/tests/coretests/src/android/provider/TestFontsProvider.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.provider; import static android.os.ParcelFileDescriptor.MODE_READ_ONLY; @@ -23,7 +24,6 @@ import android.content.ContentProvider; import android.content.ContentValues; import android.database.Cursor; import android.database.MatrixCursor; -import android.graphics.Typeface; import android.net.Uri; import android.os.ParcelFileDescriptor; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/KeyChainProtectionParamsTest.java b/core/tests/coretests/src/android/security/keystore/recovery/KeyChainProtectionParamsTest.java index 0c9c4c17171c..ce0bf30473f6 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/KeyChainProtectionParamsTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/KeyChainProtectionParamsTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/KeyChainSnapshotTest.java b/core/tests/coretests/src/android/security/keystore/recovery/KeyChainSnapshotTest.java index 61ab1526abc4..2a962c222371 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/KeyChainSnapshotTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/KeyChainSnapshotTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.google.common.collect.Lists; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/KeyDerivationParamsTest.java b/core/tests/coretests/src/android/security/keystore/recovery/KeyDerivationParamsTest.java index b6af9bbd772a..2b37b52c8bf9 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/KeyDerivationParamsTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/KeyDerivationParamsTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/RecoveryCertPathTest.java b/core/tests/coretests/src/android/security/keystore/recovery/RecoveryCertPathTest.java index dd8cd8dbd0c6..3b8f71585099 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/RecoveryCertPathTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/RecoveryCertPathTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java b/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java index a5a3ca90d9ac..2b15d73b6f01 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java @@ -20,8 +20,8 @@ import static android.security.keystore.recovery.TrustedRootCertificates.getRoot import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/WrappedApplicationKeyTest.java b/core/tests/coretests/src/android/security/keystore/recovery/WrappedApplicationKeyTest.java index 15afbddf6f02..8522e6203284 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/WrappedApplicationKeyTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/WrappedApplicationKeyTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java b/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java index 7f0eb43f23be..17486d51d1a1 100644 --- a/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java @@ -21,8 +21,8 @@ import static android.security.keystore.recovery.X509CertificateParsingUtils.dec import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java index e69d1e7505d1..d00d052db590 100644 --- a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java +++ b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.service.euicc; import static org.junit.Assert.assertArrayEquals; @@ -23,10 +24,11 @@ import static org.junit.Assert.assertTrue; import android.os.Parcel; import android.service.carrier.CarrierIdentifier; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.telephony.UiccAccessRule; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/service/notification/StatusBarNotificationTest.java b/core/tests/coretests/src/android/service/notification/StatusBarNotificationTest.java index 8a3ba8cc625b..4aa10007bf53 100644 --- a/core/tests/coretests/src/android/service/notification/StatusBarNotificationTest.java +++ b/core/tests/coretests/src/android/service/notification/StatusBarNotificationTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.service.notification; import static junit.framework.Assert.assertEquals; @@ -28,9 +29,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.metrics.LogMaker; import android.os.UserHandle; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/core/tests/coretests/src/android/service/settings/suggestions/MockSuggestionService.java b/core/tests/coretests/src/android/service/settings/suggestions/MockSuggestionService.java index ab541a15cdcc..9c8e86834bf6 100644 --- a/core/tests/coretests/src/android/service/settings/suggestions/MockSuggestionService.java +++ b/core/tests/coretests/src/android/service/settings/suggestions/MockSuggestionService.java @@ -16,16 +16,12 @@ package android.service.settings.suggestions; -import android.support.annotation.VisibleForTesting; - import java.util.ArrayList; import java.util.List; public class MockSuggestionService extends SuggestionService { - @VisibleForTesting static boolean sOnSuggestionLaunchedCalled; - @VisibleForTesting static boolean sOnSuggestionDismissedCalled; public static void reset() { diff --git a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionServiceTest.java b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionServiceTest.java index dca8c096dc59..64edda5ee879 100644 --- a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionServiceTest.java +++ b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionServiceTest.java @@ -21,10 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.rule.ServiceTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.rule.ServiceTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java index b0ec55d946e2..8c47fcbc8947 100644 --- a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java +++ b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Icon; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/text/AndroidCharacterTest.java b/core/tests/coretests/src/android/text/AndroidCharacterTest.java index 0c7e730e78e4..1c5986a838fc 100644 --- a/core/tests/coretests/src/android/text/AndroidCharacterTest.java +++ b/core/tests/coretests/src/android/text/AndroidCharacterTest.java @@ -19,7 +19,8 @@ package android.text; import static org.junit.Assert.assertArrayEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/core/tests/coretests/src/android/text/BidiFormatterTest.java b/core/tests/coretests/src/android/text/BidiFormatterTest.java index 1b936c7b1c1d..312fb68bbfc2 100644 --- a/core/tests/coretests/src/android/text/BidiFormatterTest.java +++ b/core/tests/coretests/src/android/text/BidiFormatterTest.java @@ -19,8 +19,9 @@ package android.text; import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java index c69f4f58b44e..cca1ad3a6dec 100644 --- a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java +++ b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java @@ -22,8 +22,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/DynamicLayoutTest.java b/core/tests/coretests/src/android/text/DynamicLayoutTest.java index ea954f65476d..699243b3f2b9 100644 --- a/core/tests/coretests/src/android/text/DynamicLayoutTest.java +++ b/core/tests/coretests/src/android/text/DynamicLayoutTest.java @@ -27,11 +27,12 @@ import static org.junit.Assert.assertTrue; import android.graphics.Canvas; import android.graphics.Paint; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.style.ReplacementSpan; import android.util.ArraySet; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/EmojiTest.java b/core/tests/coretests/src/android/text/EmojiTest.java index 313f1b6a6614..194899415e0d 100644 --- a/core/tests/coretests/src/android/text/EmojiTest.java +++ b/core/tests/coretests/src/android/text/EmojiTest.java @@ -21,8 +21,9 @@ import static org.junit.Assert.assertTrue; import android.icu.lang.UCharacterDirection; import android.icu.text.Bidi; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/FontFallbackSetup.java b/core/tests/coretests/src/android/text/FontFallbackSetup.java index 5592aac5a7c0..cc51ec3da1fd 100644 --- a/core/tests/coretests/src/android/text/FontFallbackSetup.java +++ b/core/tests/coretests/src/android/text/FontFallbackSetup.java @@ -24,9 +24,10 @@ import android.graphics.fonts.Font; import android.graphics.fonts.FontCustomizationParser; import android.graphics.fonts.FontFamily; import android.graphics.fonts.SystemFonts; -import android.support.test.InstrumentationRegistry; import android.util.ArrayMap; +import androidx.test.InstrumentationRegistry; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/core/tests/coretests/src/android/text/LayoutBidiCursorPathTest.java b/core/tests/coretests/src/android/text/LayoutBidiCursorPathTest.java index 1208d7ca194a..96e7fb9c8b16 100644 --- a/core/tests/coretests/src/android/text/LayoutBidiCursorPathTest.java +++ b/core/tests/coretests/src/android/text/LayoutBidiCursorPathTest.java @@ -22,12 +22,13 @@ import android.content.Context; import android.graphics.Path; import android.graphics.Typeface; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.method.MetaKeyKeyListener; import android.view.KeyEvent; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/LayoutTest.java b/core/tests/coretests/src/android/text/LayoutTest.java index 97937a45825e..990161a88c22 100644 --- a/core/tests/coretests/src/android/text/LayoutTest.java +++ b/core/tests/coretests/src/android/text/LayoutTest.java @@ -31,11 +31,12 @@ import android.graphics.Path; import android.graphics.Rect; import android.graphics.RectF; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.Layout.Alignment; import android.text.style.StrikethroughSpan; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/MeasuredParagraphTest.java b/core/tests/coretests/src/android/text/MeasuredParagraphTest.java index a0dca2c0dc4f..57bb4349c4fd 100644 --- a/core/tests/coretests/src/android/text/MeasuredParagraphTest.java +++ b/core/tests/coretests/src/android/text/MeasuredParagraphTest.java @@ -23,9 +23,10 @@ import static org.junit.Assert.assertNull; import android.content.Context; import android.graphics.Typeface; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/PackedIntVectorTest.java b/core/tests/coretests/src/android/text/PackedIntVectorTest.java index d9dc6fc44495..ba15b92012a7 100644 --- a/core/tests/coretests/src/android/text/PackedIntVectorTest.java +++ b/core/tests/coretests/src/android/text/PackedIntVectorTest.java @@ -19,8 +19,9 @@ package android.text; import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java index d0f2d46f9c2b..91b8c6ad0c53 100644 --- a/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java +++ b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java @@ -16,18 +16,18 @@ package android.text; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.style.BulletSpan; import android.text.style.QuoteSpan; import android.text.style.SubscriptSpan; import android.text.style.UnderlineSpan; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java index 6c05601a31fd..9149f7b1b216 100644 --- a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import android.annotation.NonNull; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.style.QuoteSpan; import android.text.style.UnderlineSpan; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/SpannableTest.java b/core/tests/coretests/src/android/text/SpannableTest.java index f3684286dbbb..d248a1f69030 100644 --- a/core/tests/coretests/src/android/text/SpannableTest.java +++ b/core/tests/coretests/src/android/text/SpannableTest.java @@ -19,10 +19,11 @@ package android.text; import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.MoreAsserts; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java index 380e3153ccda..ca4373361fa5 100644 --- a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import android.annotation.NonNull; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.style.QuoteSpan; import android.text.style.UnderlineSpan; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/SpannedTest.java b/core/tests/coretests/src/android/text/SpannedTest.java index 573757165101..3ab075509373 100644 --- a/core/tests/coretests/src/android/text/SpannedTest.java +++ b/core/tests/coretests/src/android/text/SpannedTest.java @@ -21,13 +21,14 @@ import static org.junit.Assert.assertEquals; import android.graphics.Typeface; import android.os.Parcel; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.style.CharacterStyle; import android.text.style.StyleSpan; import android.text.style.TextAppearanceSpan; import android.text.style.TypefaceSpan; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java index bf0d42788b72..32370b3e6e05 100644 --- a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java +++ b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java @@ -19,10 +19,11 @@ package android.text; import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java b/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java index 5cf54268e004..4221ac208948 100644 --- a/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java +++ b/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java @@ -19,11 +19,12 @@ package android.text; import static org.junit.Assert.fail; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.Layout.Directions; import android.text.StaticLayoutTest.LayoutBuilder; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/StaticLayoutTest.java b/core/tests/coretests/src/android/text/StaticLayoutTest.java index 25217125bbf4..b1c896ec2ce4 100644 --- a/core/tests/coretests/src/android/text/StaticLayoutTest.java +++ b/core/tests/coretests/src/android/text/StaticLayoutTest.java @@ -25,13 +25,14 @@ import android.graphics.Canvas; import android.graphics.Paint.FontMetricsInt; import android.os.LocaleList; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.Layout.Alignment; import android.text.method.EditorState; import android.text.style.LocaleSpan; import android.util.Log; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java b/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java index f6888e3adb75..0d42326d4bdb 100644 --- a/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java +++ b/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java @@ -19,10 +19,11 @@ package android.text; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.Layout.Alignment; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/TextLayoutTest.java b/core/tests/coretests/src/android/text/TextLayoutTest.java index 24020ceb0cd4..15fbc9e59508 100644 --- a/core/tests/coretests/src/android/text/TextLayoutTest.java +++ b/core/tests/coretests/src/android/text/TextLayoutTest.java @@ -17,8 +17,9 @@ package android.text; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/text/TextLineTest.java b/core/tests/coretests/src/android/text/TextLineTest.java index 2fe882c8f9f8..90ce305b3dab 100644 --- a/core/tests/coretests/src/android/text/TextLineTest.java +++ b/core/tests/coretests/src/android/text/TextLineTest.java @@ -25,14 +25,15 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Typeface; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.filters.Suppress; -import android.support.test.runner.AndroidJUnit4; import android.text.Layout.TabStops; import android.text.style.ReplacementSpan; import android.text.style.TabStopSpan; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/TextUtilsTest.java b/core/tests/coretests/src/android/text/TextUtilsTest.java index 72290bf10f9d..be6ef195fa96 100644 --- a/core/tests/coretests/src/android/text/TextUtilsTest.java +++ b/core/tests/coretests/src/android/text/TextUtilsTest.java @@ -26,15 +26,16 @@ import static org.junit.Assert.fail; import android.os.Parcel; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.LargeTest; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.MoreAsserts; import android.text.style.StyleSpan; import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; import android.view.View; +import androidx.test.filters.LargeTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.google.android.collect.Lists; import org.junit.Test; diff --git a/core/tests/coretests/src/android/text/VariationParserTest.java b/core/tests/coretests/src/android/text/VariationParserTest.java index fbd2412a35cc..0afe811f1ad6 100644 --- a/core/tests/coretests/src/android/text/VariationParserTest.java +++ b/core/tests/coretests/src/android/text/VariationParserTest.java @@ -21,8 +21,9 @@ import static org.junit.Assert.fail; import android.graphics.fonts.FontVariationAxis; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/format/DateFormatTest.java b/core/tests/coretests/src/android/text/format/DateFormatTest.java index 9000ed07d606..5a0a84db5905 100644 --- a/core/tests/coretests/src/android/text/format/DateFormatTest.java +++ b/core/tests/coretests/src/android/text/format/DateFormatTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/format/DateUtilsTest.java b/core/tests/coretests/src/android/text/format/DateUtilsTest.java index 872b71a5faa6..381c0512c532 100644 --- a/core/tests/coretests/src/android/text/format/DateUtilsTest.java +++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java @@ -22,8 +22,9 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.LocaleList; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/text/format/FormatterTest.java b/core/tests/coretests/src/android/text/format/FormatterTest.java index 82e4bff200fd..068d04798858 100644 --- a/core/tests/coretests/src/android/text/format/FormatterTest.java +++ b/core/tests/coretests/src/android/text/format/FormatterTest.java @@ -25,11 +25,12 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.format.Formatter.BytesResult; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/text/format/TimeTest.java b/core/tests/coretests/src/android/text/format/TimeTest.java index d563f2e2383b..ac0041119640 100644 --- a/core/tests/coretests/src/android/text/format/TimeTest.java +++ b/core/tests/coretests/src/android/text/format/TimeTest.java @@ -21,12 +21,13 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.filters.Suppress; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; import android.util.TimeFormatException; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/method/BackspaceTest.java b/core/tests/coretests/src/android/text/method/BackspaceTest.java index df4609f5a728..ddae652cec05 100644 --- a/core/tests/coretests/src/android/text/method/BackspaceTest.java +++ b/core/tests/coretests/src/android/text/method/BackspaceTest.java @@ -17,15 +17,16 @@ package android.text.method; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.InputType; import android.util.KeyUtils; import android.view.KeyEvent; import android.widget.EditText; import android.widget.TextView.BufferType; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/method/EditorState.java b/core/tests/coretests/src/android/text/method/EditorState.java index 12bb8c839e60..4eff7a49ac7b 100644 --- a/core/tests/coretests/src/android/text/method/EditorState.java +++ b/core/tests/coretests/src/android/text/method/EditorState.java @@ -21,8 +21,6 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import android.graphics.Canvas; -import android.graphics.Paint; import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java index 45a501077128..45b63e03c27e 100644 --- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java +++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java @@ -17,15 +17,16 @@ package android.text.method; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.InputType; import android.util.KeyUtils; import android.view.KeyEvent; import android.widget.EditText; import android.widget.TextView.BufferType; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/method/WordIteratorTest.java b/core/tests/coretests/src/android/text/method/WordIteratorTest.java index 684586387255..cc345f5785df 100644 --- a/core/tests/coretests/src/android/text/method/WordIteratorTest.java +++ b/core/tests/coretests/src/android/text/method/WordIteratorTest.java @@ -22,8 +22,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/style/UnderlineSpanTest.java b/core/tests/coretests/src/android/text/style/UnderlineSpanTest.java index 3d7e5bab15f3..a0d2f856d093 100644 --- a/core/tests/coretests/src/android/text/style/UnderlineSpanTest.java +++ b/core/tests/coretests/src/android/text/style/UnderlineSpanTest.java @@ -16,17 +16,17 @@ package android.text.style; - import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.SpannableString; import android.text.Spanned; import android.text.StaticLayout; import android.text.TextPaint; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/text/util/LinkifyTest.java b/core/tests/coretests/src/android/text/util/LinkifyTest.java index be3a0be079bf..107ecd716b5a 100644 --- a/core/tests/coretests/src/android/text/util/LinkifyTest.java +++ b/core/tests/coretests/src/android/text/util/LinkifyTest.java @@ -23,9 +23,6 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.res.Configuration; import android.os.LocaleList; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.Spannable; import android.text.SpannableString; import android.text.method.LinkMovementMethod; @@ -33,6 +30,10 @@ import android.text.style.URLSpan; import android.util.Patterns; import android.widget.TextView; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/transition/AutoTransitionTest.java b/core/tests/coretests/src/android/transition/AutoTransitionTest.java index 834fb7aa72a5..deae967a3e72 100644 --- a/core/tests/coretests/src/android/transition/AutoTransitionTest.java +++ b/core/tests/coretests/src/android/transition/AutoTransitionTest.java @@ -16,16 +16,16 @@ package android.transition; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; - -import org.junit.Test; -import org.junit.runner.RunWith; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + @RunWith(AndroidJUnit4.class) public class AutoTransitionTest { @Test diff --git a/core/tests/coretests/src/android/transition/FadeTransitionTest.java b/core/tests/coretests/src/android/transition/FadeTransitionTest.java index 22365bac64a2..2077d9443e7a 100644 --- a/core/tests/coretests/src/android/transition/FadeTransitionTest.java +++ b/core/tests/coretests/src/android/transition/FadeTransitionTest.java @@ -22,13 +22,14 @@ import android.app.Activity; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; import android.transition.Transition.TransitionListener; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import java.util.concurrent.CountDownLatch; diff --git a/core/tests/coretests/src/android/transition/SlideTransitionTest.java b/core/tests/coretests/src/android/transition/SlideTransitionTest.java index 8b9ec74be8df..046e49dffab1 100644 --- a/core/tests/coretests/src/android/transition/SlideTransitionTest.java +++ b/core/tests/coretests/src/android/transition/SlideTransitionTest.java @@ -19,18 +19,18 @@ package android.transition; import android.animation.AnimatorSetActivity; import android.app.Activity; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - public class SlideTransitionTest extends ActivityInstrumentationTestCase2<AnimatorSetActivity> { Activity mActivity; diff --git a/core/tests/coretests/src/android/transition/TransitionTest.java b/core/tests/coretests/src/android/transition/TransitionTest.java index 7e629f944684..f59c406f7f74 100644 --- a/core/tests/coretests/src/android/transition/TransitionTest.java +++ b/core/tests/coretests/src/android/transition/TransitionTest.java @@ -19,7 +19,6 @@ package android.transition; import android.animation.AnimatorSetActivity; import android.app.Activity; import android.graphics.Rect; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.transition.Transition.EpicenterCallback; import android.util.ArrayMap; @@ -27,6 +26,8 @@ import android.view.View; import android.view.animation.AccelerateInterpolator; import android.widget.TextView; +import androidx.test.filters.LargeTest; + import com.android.frameworks.coretests.R; import java.lang.reflect.Field; diff --git a/core/tests/coretests/src/android/util/ArrayMapTest.java b/core/tests/coretests/src/android/util/ArrayMapTest.java index f0cc7f77fe63..b212cf6b0803 100644 --- a/core/tests/coretests/src/android/util/ArrayMapTest.java +++ b/core/tests/coretests/src/android/util/ArrayMapTest.java @@ -14,10 +14,10 @@ package android.util; -import android.support.test.filters.LargeTest; -import android.util.ArrayMap; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; + import org.junit.Test; import java.util.ConcurrentModificationException; diff --git a/core/tests/coretests/src/android/util/Base64Test.java b/core/tests/coretests/src/android/util/Base64Test.java index af608c3ae259..15c51af0b3e1 100644 --- a/core/tests/coretests/src/android/util/Base64Test.java +++ b/core/tests/coretests/src/android/util/Base64Test.java @@ -16,7 +16,7 @@ package android.util; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/DataUnitTest.java b/core/tests/coretests/src/android/util/DataUnitTest.java index 4eae8b45e94b..ec296b76c374 100644 --- a/core/tests/coretests/src/android/util/DataUnitTest.java +++ b/core/tests/coretests/src/android/util/DataUnitTest.java @@ -16,7 +16,7 @@ package android.util; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/DayOfMonthCursorTest.java b/core/tests/coretests/src/android/util/DayOfMonthCursorTest.java index 4c5ad76d8193..572e9b062097 100644 --- a/core/tests/coretests/src/android/util/DayOfMonthCursorTest.java +++ b/core/tests/coretests/src/android/util/DayOfMonthCursorTest.java @@ -16,10 +16,11 @@ package android.util; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; import java.util.Calendar; -import android.test.suitebuilder.annotation.SmallTest; /** * Unit tests for {@link DayOfMonthCursor}. diff --git a/core/tests/coretests/src/android/util/InternalSelectionView.java b/core/tests/coretests/src/android/util/InternalSelectionView.java index a0fb0f18a4fa..4a1baef8077a 100644 --- a/core/tests/coretests/src/android/util/InternalSelectionView.java +++ b/core/tests/coretests/src/android/util/InternalSelectionView.java @@ -16,19 +16,16 @@ package android.util; -import com.android.frameworks.coretests.R; - -import android.view.View; -import android.view.KeyEvent; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Paint; import android.graphics.Canvas; -import android.graphics.Rect; import android.graphics.Color; -import android.util.AttributeSet; - +import android.graphics.Paint; +import android.graphics.Rect; +import android.view.KeyEvent; +import android.view.View; +import com.android.frameworks.coretests.R; /** * A view that has a known number of selectable rows, and maintains a notion of which diff --git a/core/tests/coretests/src/android/util/KeyUtils.java b/core/tests/coretests/src/android/util/KeyUtils.java index 593f72742ea6..612643e12db0 100644 --- a/core/tests/coretests/src/android/util/KeyUtils.java +++ b/core/tests/coretests/src/android/util/KeyUtils.java @@ -17,16 +17,10 @@ package android.util; import android.app.Instrumentation; -import android.os.SystemClock; import android.test.ActivityInstrumentationTestCase; -import android.test.InstrumentationTestCase; -import android.view.Gravity; import android.view.KeyCharacterMap; import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.View; import android.view.ViewConfiguration; -import android.view.ViewGroup; /** * Reusable methods for generating key events. diff --git a/core/tests/coretests/src/android/util/KeyValueListParserTest.java b/core/tests/coretests/src/android/util/KeyValueListParserTest.java index 038f0b7efaa3..f65c4c7c0bdf 100644 --- a/core/tests/coretests/src/android/util/KeyValueListParserTest.java +++ b/core/tests/coretests/src/android/util/KeyValueListParserTest.java @@ -19,8 +19,9 @@ package android.util; import static org.junit.Assert.assertEquals; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/util/ListUtil.java b/core/tests/coretests/src/android/util/ListUtil.java index 2a7cb96bebfe..3748cf8e1405 100644 --- a/core/tests/coretests/src/android/util/ListUtil.java +++ b/core/tests/coretests/src/android/util/ListUtil.java @@ -20,13 +20,11 @@ import android.app.Instrumentation; import android.view.KeyEvent; import android.widget.ListView; - /** * Various useful stuff for instrumentation testing listview. */ public class ListUtil { - private final ListView mListView; private final Instrumentation mInstrumentation; diff --git a/core/tests/coretests/src/android/util/LocalLogTest.java b/core/tests/coretests/src/android/util/LocalLogTest.java index 5144c85e72a2..6cdcb5e542dc 100644 --- a/core/tests/coretests/src/android/util/LocalLogTest.java +++ b/core/tests/coretests/src/android/util/LocalLogTest.java @@ -16,7 +16,7 @@ package android.util; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/LogNullabilityTest.java b/core/tests/coretests/src/android/util/LogNullabilityTest.java index 3f4776d8b4fc..370885d3d4ac 100644 --- a/core/tests/coretests/src/android/util/LogNullabilityTest.java +++ b/core/tests/coretests/src/android/util/LogNullabilityTest.java @@ -19,8 +19,8 @@ package android.util; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/util/LogTest.java b/core/tests/coretests/src/android/util/LogTest.java index 30c81b0c7228..d783c127d8c4 100644 --- a/core/tests/coretests/src/android/util/LogTest.java +++ b/core/tests/coretests/src/android/util/LogTest.java @@ -16,13 +16,12 @@ package android.util; -import junit.framework.Assert; -import junit.framework.TestCase; - import android.os.SystemProperties; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.Suppress; -import android.util.Log; + +import androidx.test.filters.Suppress; + +import junit.framework.TestCase; //This is an empty TestCase. @Suppress diff --git a/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java b/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java index 3f03db9dc1fb..a1d48e689427 100644 --- a/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java +++ b/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java @@ -16,7 +16,7 @@ package android.util; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/LruCacheTest.java b/core/tests/coretests/src/android/util/LruCacheTest.java index 5a97158a85d1..1928bfdfc61d 100644 --- a/core/tests/coretests/src/android/util/LruCacheTest.java +++ b/core/tests/coretests/src/android/util/LruCacheTest.java @@ -16,12 +16,13 @@ package android.util; +import junit.framework.TestCase; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; -import junit.framework.TestCase; public final class LruCacheTest extends TestCase { private int expectedCreateCount; diff --git a/core/tests/coretests/src/android/util/MonthDisplayHelperTest.java b/core/tests/coretests/src/android/util/MonthDisplayHelperTest.java index 55da665c7b34..30d5f778e945 100644 --- a/core/tests/coretests/src/android/util/MonthDisplayHelperTest.java +++ b/core/tests/coretests/src/android/util/MonthDisplayHelperTest.java @@ -16,12 +16,12 @@ package android.util; -import android.test.suitebuilder.annotation.SmallTest; - -import java.util.Calendar; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; +import java.util.Calendar; + /** * Unit tests for {@link MonthDisplayHelper}. */ diff --git a/core/tests/coretests/src/android/util/OrientationUtil.java b/core/tests/coretests/src/android/util/OrientationUtil.java index ecdca5d608c4..0361194dad2b 100644 --- a/core/tests/coretests/src/android/util/OrientationUtil.java +++ b/core/tests/coretests/src/android/util/OrientationUtil.java @@ -19,7 +19,6 @@ package android.util; import android.app.Activity; import android.app.Instrumentation; import android.content.pm.ActivityInfo; - import android.test.ActivityInstrumentationTestCase2; import com.android.internal.util.Preconditions; diff --git a/core/tests/coretests/src/android/util/PatternsTest.java b/core/tests/coretests/src/android/util/PatternsTest.java index 360b8756f264..6cea2f3c92bd 100644 --- a/core/tests/coretests/src/android/util/PatternsTest.java +++ b/core/tests/coretests/src/android/util/PatternsTest.java @@ -13,15 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.util; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; + +import junit.framework.TestCase; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.TestCase; - public class PatternsTest extends TestCase { // Tests for Patterns.TOP_LEVEL_DOMAIN diff --git a/core/tests/coretests/src/android/util/RecurrenceRuleTest.java b/core/tests/coretests/src/android/util/RecurrenceRuleTest.java index 39d492d65415..caa12083fafb 100644 --- a/core/tests/coretests/src/android/util/RecurrenceRuleTest.java +++ b/core/tests/coretests/src/android/util/RecurrenceRuleTest.java @@ -16,7 +16,7 @@ package android.util; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/SparseLongArrayTest.java b/core/tests/coretests/src/android/util/SparseLongArrayTest.java index 5a5e893d1472..df2d752e04b9 100644 --- a/core/tests/coretests/src/android/util/SparseLongArrayTest.java +++ b/core/tests/coretests/src/android/util/SparseLongArrayTest.java @@ -19,9 +19,10 @@ package android.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.annotation.NonNull; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import android.annotation.NonNull; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/util/StateSetTest.java b/core/tests/coretests/src/android/util/StateSetTest.java index e481ce04c82f..b5d62704ba29 100644 --- a/core/tests/coretests/src/android/util/StateSetTest.java +++ b/core/tests/coretests/src/android/util/StateSetTest.java @@ -16,8 +16,9 @@ package android.util; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; -import android.test.suitebuilder.annotation.SmallTest; /** * Tests for {@link StateSet} diff --git a/core/tests/coretests/src/android/util/TimestampedValueTest.java b/core/tests/coretests/src/android/util/TimestampedValueTest.java index 03b4abd9b7a3..6e3ab796c5d3 100644 --- a/core/tests/coretests/src/android/util/TimestampedValueTest.java +++ b/core/tests/coretests/src/android/util/TimestampedValueTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.fail; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/util/TimingsTraceLogTest.java b/core/tests/coretests/src/android/util/TimingsTraceLogTest.java index 7bb4ab835e4f..77d05524d7cf 100644 --- a/core/tests/coretests/src/android/util/TimingsTraceLogTest.java +++ b/core/tests/coretests/src/android/util/TimingsTraceLogTest.java @@ -19,8 +19,9 @@ package android.util; import static org.junit.Assert.assertTrue; import android.os.Trace; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,7 +29,6 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; - /** * Tests for {@link TimingsTraceLog}. * <p>Usage: bit FrameworksCoreTests:android.util.TimingsTraceLogTest diff --git a/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java b/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java index ca12a153044d..fc082353fffb 100644 --- a/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java +++ b/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java @@ -16,12 +16,12 @@ package android.util; -import junit.framework.Assert; - import android.test.InstrumentationTestCase; import android.test.TouchUtils; import android.view.View; +import junit.framework.Assert; + /** * When entering touch mode via touch, the tests can be flaky. These asserts * are more flexible (allowing up to MAX_ATTEMPTS touches to enter touch mode via touch or diff --git a/core/tests/coretests/src/android/view/BigCache.java b/core/tests/coretests/src/android/view/BigCache.java index 21821763456a..6a1bcaaf2d00 100644 --- a/core/tests/coretests/src/android/view/BigCache.java +++ b/core/tests/coretests/src/android/view/BigCache.java @@ -16,16 +16,12 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; import android.widget.LinearLayout; import android.widget.ScrollView; -import android.view.ViewGroup; -import android.view.View; -import android.view.Display; -import android.view.ViewConfiguration; + +import com.android.frameworks.coretests.R; /** * This activity contains two Views, one as big as the screen, one much larger. The large one diff --git a/core/tests/coretests/src/android/view/BigCacheTest.java b/core/tests/coretests/src/android/view/BigCacheTest.java index 8c2c865201aa..ed4b996b1d08 100644 --- a/core/tests/coretests/src/android/view/BigCacheTest.java +++ b/core/tests/coretests/src/android/view/BigCacheTest.java @@ -16,14 +16,12 @@ package android.view; -import android.view.BigCache; -import com.android.frameworks.coretests.R; - -import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.View; -import android.view.ViewConfiguration; import android.graphics.Bitmap; +import android.test.ActivityInstrumentationTestCase; + +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; /** * Builds the drawing cache of two Views, one smaller than the maximum cache size, diff --git a/core/tests/coretests/src/android/view/BitmapDrawable.java b/core/tests/coretests/src/android/view/BitmapDrawable.java index f7bad84d6ddd..42c176f6b676 100644 --- a/core/tests/coretests/src/android/view/BitmapDrawable.java +++ b/core/tests/coretests/src/android/view/BitmapDrawable.java @@ -16,19 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.AbsoluteLayout; -import android.widget.Button; -import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; + +import com.android.frameworks.coretests.R; public class BitmapDrawable extends Activity { @Override diff --git a/core/tests/coretests/src/android/view/CreateViewTest.java b/core/tests/coretests/src/android/view/CreateViewTest.java index 16656f688640..520f83f60836 100644 --- a/core/tests/coretests/src/android/view/CreateViewTest.java +++ b/core/tests/coretests/src/android/view/CreateViewTest.java @@ -16,16 +16,17 @@ package android.view; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; + import android.content.Context; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.test.filters.SmallTest; + public class CreateViewTest extends AndroidTestCase implements PerformanceTestCase { public boolean isPerformanceOnly() { diff --git a/core/tests/coretests/src/android/view/Disabled.java b/core/tests/coretests/src/android/view/Disabled.java index d3c7470bd0f9..ce90039f360f 100644 --- a/core/tests/coretests/src/android/view/Disabled.java +++ b/core/tests/coretests/src/android/view/Disabled.java @@ -16,13 +16,12 @@ package android.view; -import com.android.frameworks.coretests.R; - +import android.app.Activity; import android.os.Bundle; -import android.widget.Button; -import android.view.View; import android.view.View.OnClickListener; -import android.app.Activity; +import android.widget.Button; + +import com.android.frameworks.coretests.R; /** * Exercise View's disabled state. diff --git a/core/tests/coretests/src/android/view/DisabledLongpressTest.java b/core/tests/coretests/src/android/view/DisabledLongpressTest.java index faa0865c5a1c..a9fec01c8b34 100644 --- a/core/tests/coretests/src/android/view/DisabledLongpressTest.java +++ b/core/tests/coretests/src/android/view/DisabledLongpressTest.java @@ -18,11 +18,12 @@ package android.view; import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.util.KeyUtils; import android.view.View.OnLongClickListener; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/DisabledTest.java b/core/tests/coretests/src/android/view/DisabledTest.java index 291a11c289b7..8922e5fda206 100644 --- a/core/tests/coretests/src/android/view/DisabledTest.java +++ b/core/tests/coretests/src/android/view/DisabledTest.java @@ -18,12 +18,11 @@ package android.view; import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.KeyEvent; -import android.view.View; import android.widget.Button; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/DisplayCutoutTest.java b/core/tests/coretests/src/android/view/DisplayCutoutTest.java index 8e4f2cd2fbff..dd50af877bbb 100644 --- a/core/tests/coretests/src/android/view/DisplayCutoutTest.java +++ b/core/tests/coretests/src/android/view/DisplayCutoutTest.java @@ -33,17 +33,17 @@ import android.graphics.Insets; import android.graphics.Rect; import android.os.Parcel; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.DisplayCutout.ParcelableWrapper; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; import java.util.Arrays; import java.util.Collections; - @RunWith(AndroidJUnit4.class) @SmallTest @Presubmit diff --git a/core/tests/coretests/src/android/view/DrawableBgMinSize.java b/core/tests/coretests/src/android/view/DrawableBgMinSize.java index 58bfb8a77064..ba9ba008b2ef 100644 --- a/core/tests/coretests/src/android/view/DrawableBgMinSize.java +++ b/core/tests/coretests/src/android/view/DrawableBgMinSize.java @@ -16,12 +16,9 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.view.View; import android.view.View.OnClickListener; import android.widget.AbsoluteLayout; import android.widget.Button; @@ -30,6 +27,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import com.android.frameworks.coretests.R; + /** * Views should obey their background {@link Drawable}'s minimum size * requirements ({@link Drawable#getMinimumHeight()} and diff --git a/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java b/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java index e705c87a6675..1735e8cb037f 100644 --- a/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java +++ b/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java @@ -16,14 +16,9 @@ package android.view; -import com.android.frameworks.coretests.R; -import android.view.DrawableBgMinSize; -import android.test.TouchUtils; -import android.test.suitebuilder.annotation.MediumTest; - import android.graphics.drawable.Drawable; import android.test.ActivityInstrumentationTestCase; -import android.view.View; +import android.test.TouchUtils; import android.widget.AbsoluteLayout; import android.widget.Button; import android.widget.FrameLayout; @@ -31,6 +26,10 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link DrawableBgMinSize} exercises Views to obey their background drawable's * minimum sizes. diff --git a/core/tests/coretests/src/android/view/FocusFinderTest.java b/core/tests/coretests/src/android/view/FocusFinderTest.java index 2732a04b44d5..b35c64a09ade 100644 --- a/core/tests/coretests/src/android/view/FocusFinderTest.java +++ b/core/tests/coretests/src/android/view/FocusFinderTest.java @@ -18,7 +18,8 @@ package android.view; import android.graphics.Rect; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; public class FocusFinderTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/view/GlobalFocusChange.java b/core/tests/coretests/src/android/view/GlobalFocusChange.java index 041c0ded366f..ee92b64f3947 100644 --- a/core/tests/coretests/src/android/view/GlobalFocusChange.java +++ b/core/tests/coretests/src/android/view/GlobalFocusChange.java @@ -16,12 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.ViewTreeObserver; -import android.view.View; + +import com.android.frameworks.coretests.R; public class GlobalFocusChange extends Activity implements ViewTreeObserver.OnGlobalFocusChangeListener { public View mOldFocus; diff --git a/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java b/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java index dab7b90a447d..960654a926ce 100644 --- a/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java +++ b/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java @@ -17,13 +17,13 @@ package android.view; import android.test.ActivityInstrumentationTestCase; -import android.test.FlakyTest; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.Suppress; -import android.view.View; -import android.view.KeyEvent; + +import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + import com.android.frameworks.coretests.R; @Suppress // Flaky @@ -50,7 +50,7 @@ public class GlobalFocusChangeTest extends ActivityInstrumentationTestCase<Globa super.tearDown(); } - @FlakyTest(tolerance = 4) + @FlakyTest @LargeTest public void testFocusChange() throws Exception { sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT); @@ -62,7 +62,7 @@ public class GlobalFocusChangeTest extends ActivityInstrumentationTestCase<Globa assertSame(mRight, mActivity.mNewFocus); } - @FlakyTest(tolerance = 4) + @FlakyTest @MediumTest public void testEnterTouchMode() throws Exception { assertTrue(mLeft.isFocused()); @@ -73,7 +73,7 @@ public class GlobalFocusChangeTest extends ActivityInstrumentationTestCase<Globa assertSame(null, mActivity.mNewFocus); } - @FlakyTest(tolerance = 4) + @FlakyTest @MediumTest public void testLeaveTouchMode() throws Exception { assertTrue(mLeft.isFocused()); diff --git a/core/tests/coretests/src/android/view/HandlerActionQueueTest.java b/core/tests/coretests/src/android/view/HandlerActionQueueTest.java index fd8f23abc45c..bedb75bb7472 100644 --- a/core/tests/coretests/src/android/view/HandlerActionQueueTest.java +++ b/core/tests/coretests/src/android/view/HandlerActionQueueTest.java @@ -17,7 +17,8 @@ package android.view; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; public class HandlerActionQueueTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/view/Include.java b/core/tests/coretests/src/android/view/Include.java index e90c48471c83..4b6aefb112e6 100644 --- a/core/tests/coretests/src/android/view/Include.java +++ b/core/tests/coretests/src/android/view/Include.java @@ -16,10 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; + +import com.android.frameworks.coretests.R; /** * Exercise <include /> tag in XML files. diff --git a/core/tests/coretests/src/android/view/IncludeTest.java b/core/tests/coretests/src/android/view/IncludeTest.java index cdcfa3ce5478..e4905597d16a 100644 --- a/core/tests/coretests/src/android/view/IncludeTest.java +++ b/core/tests/coretests/src/android/view/IncludeTest.java @@ -16,13 +16,11 @@ package android.view; -import android.view.Include; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.View; -import android.view.ViewGroup; + +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; public class IncludeTest extends ActivityInstrumentationTestCase<Include> { public IncludeTest() { diff --git a/core/tests/coretests/src/android/view/InflateTest.java b/core/tests/coretests/src/android/view/InflateTest.java index cb4f8e2399b1..939d6eaba3c9 100644 --- a/core/tests/coretests/src/android/view/InflateTest.java +++ b/core/tests/coretests/src/android/view/InflateTest.java @@ -20,13 +20,11 @@ import android.content.Context; import android.content.res.Resources; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; -import android.test.suitebuilder.annotation.SmallTest; import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import com.android.frameworks.coretests.R; -import java.util.Map; +import androidx.test.filters.SmallTest; + +import com.android.frameworks.coretests.R; public class InflateTest extends AndroidTestCase implements PerformanceTestCase { private LayoutInflater mInflater; diff --git a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java index 81ca9109c643..7f00ad9ed2f2 100644 --- a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java +++ b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java @@ -18,7 +18,9 @@ package android.view; import static android.view.InsetsState.TYPE_NAVIGATION_BAR; import static android.view.InsetsState.TYPE_TOP_BAR; + import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,12 +29,13 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.graphics.RectF; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.FlakyTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; import android.view.SurfaceControl.Transaction; import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams; +import androidx.test.filters.FlakyTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/InsetsControllerTest.java b/core/tests/coretests/src/android/view/InsetsControllerTest.java index d3d274a64682..d44745121a22 100644 --- a/core/tests/coretests/src/android/view/InsetsControllerTest.java +++ b/core/tests/coretests/src/android/view/InsetsControllerTest.java @@ -17,18 +17,20 @@ package android.view; import static android.view.InsetsState.TYPE_TOP_BAR; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; + import static org.mockito.Mockito.mock; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.FlakyTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.FlakyTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; @Presubmit @FlakyTest(detail = "Promote once confirmed non-flaky") diff --git a/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java b/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java index 6d0f98433168..82cd2131ab4e 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java @@ -17,6 +17,7 @@ package android.view; import static android.view.InsetsState.TYPE_TOP_BAR; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.reset; @@ -24,10 +25,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.FlakyTest; -import android.support.test.runner.AndroidJUnit4; import android.view.SurfaceControl.Transaction; +import androidx.test.filters.FlakyTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/InsetsSourceTest.java b/core/tests/coretests/src/android/view/InsetsSourceTest.java index ed472d2a7f64..98ab3e785d0a 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceTest.java @@ -17,13 +17,15 @@ package android.view; import static android.view.InsetsState.TYPE_NAVIGATION_BAR; + import static junit.framework.Assert.assertEquals; import android.graphics.Insets; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.FlakyTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.FlakyTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/InsetsStateTest.java b/core/tests/coretests/src/android/view/InsetsStateTest.java index 95af525c3746..9857b7a1e035 100644 --- a/core/tests/coretests/src/android/view/InsetsStateTest.java +++ b/core/tests/coretests/src/android/view/InsetsStateTest.java @@ -24,20 +24,23 @@ import static android.view.InsetsState.TYPE_SIDE_BAR_1; import static android.view.InsetsState.TYPE_SIDE_BAR_2; import static android.view.InsetsState.TYPE_SIDE_BAR_3; import static android.view.InsetsState.TYPE_TOP_BAR; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertNotEquals; import android.graphics.Insets; import android.graphics.Rect; import android.os.Parcel; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.FlakyTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseIntArray; import android.view.WindowInsets.Type; +import androidx.test.filters.FlakyTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/KeyEventTest.java b/core/tests/coretests/src/android/view/KeyEventTest.java index b9d95e542f11..88d3bdbe3c92 100644 --- a/core/tests/coretests/src/android/view/KeyEventTest.java +++ b/core/tests/coretests/src/android/view/KeyEventTest.java @@ -20,8 +20,8 @@ import static android.view.Display.INVALID_DISPLAY; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/ListContextMenu.java b/core/tests/coretests/src/android/view/ListContextMenu.java index 1b4ece6b8eef..e333b9638d25 100644 --- a/core/tests/coretests/src/android/view/ListContextMenu.java +++ b/core/tests/coretests/src/android/view/ListContextMenu.java @@ -16,24 +16,17 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.content.Context; import android.os.Bundle; import android.util.Log; -import android.view.ContextMenu; -import android.view.Menu; -import android.view.MenuItem; -import android.view.SubMenu; -import android.view.View; -import android.view.ViewGroup; -import android.view.LayoutInflater; import android.view.ContextMenu.ContextMenuInfo; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.TextView; +import com.android.frameworks.coretests.R; + /** * Exercises context menus in lists */ diff --git a/core/tests/coretests/src/android/view/Longpress.java b/core/tests/coretests/src/android/view/Longpress.java index e8e6f13e30e9..86fa9e54afd3 100644 --- a/core/tests/coretests/src/android/view/Longpress.java +++ b/core/tests/coretests/src/android/view/Longpress.java @@ -16,11 +16,11 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class Longpress extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/core/tests/coretests/src/android/view/LongpressTest.java b/core/tests/coretests/src/android/view/LongpressTest.java index d3d7589ae641..4dfecd0b2055 100644 --- a/core/tests/coretests/src/android/view/LongpressTest.java +++ b/core/tests/coretests/src/android/view/LongpressTest.java @@ -18,11 +18,12 @@ package android.view; import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.util.KeyUtils; import android.view.View.OnLongClickListener; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/MenuTest.java b/core/tests/coretests/src/android/view/MenuTest.java index 116b38a6551b..794769cc032f 100644 --- a/core/tests/coretests/src/android/view/MenuTest.java +++ b/core/tests/coretests/src/android/view/MenuTest.java @@ -17,7 +17,8 @@ package android.view; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.frameworks.coretests.R; import com.android.internal.view.menu.MenuBuilder; diff --git a/core/tests/coretests/src/android/view/Merge.java b/core/tests/coretests/src/android/view/Merge.java index bdacd819d2e8..8020e4b07815 100644 --- a/core/tests/coretests/src/android/view/Merge.java +++ b/core/tests/coretests/src/android/view/Merge.java @@ -16,13 +16,11 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; import android.widget.LinearLayout; -import android.view.ViewGroup; -import android.view.LayoutInflater; + +import com.android.frameworks.coretests.R; /** * Exercise <merge /> tag in XML files. diff --git a/core/tests/coretests/src/android/view/MergeTest.java b/core/tests/coretests/src/android/view/MergeTest.java index acfee7eca036..eccc9cb23e2a 100644 --- a/core/tests/coretests/src/android/view/MergeTest.java +++ b/core/tests/coretests/src/android/view/MergeTest.java @@ -16,11 +16,9 @@ package android.view; -import android.view.Merge; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.ViewGroup; + +import androidx.test.filters.MediumTest; public class MergeTest extends ActivityInstrumentationTestCase<Merge> { public MergeTest() { diff --git a/core/tests/coretests/src/android/view/MotionEventTest.java b/core/tests/coretests/src/android/view/MotionEventTest.java index 023526f7e37f..cadf37e0c53c 100644 --- a/core/tests/coretests/src/android/view/MotionEventTest.java +++ b/core/tests/coretests/src/android/view/MotionEventTest.java @@ -22,11 +22,12 @@ import static android.view.MotionEvent.TOOL_TYPE_FINGER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/MutateDrawable.java b/core/tests/coretests/src/android/view/MutateDrawable.java index 39b57894696f..1ec525d6fe9e 100644 --- a/core/tests/coretests/src/android/view/MutateDrawable.java +++ b/core/tests/coretests/src/android/view/MutateDrawable.java @@ -18,8 +18,9 @@ package android.view; import android.app.Activity; import android.os.Bundle; -import android.widget.LinearLayout; import android.widget.Button; +import android.widget.LinearLayout; + import com.android.frameworks.coretests.R; public class MutateDrawable extends Activity { diff --git a/core/tests/coretests/src/android/view/MutateDrawableTest.java b/core/tests/coretests/src/android/view/MutateDrawableTest.java index 74e011d28508..d63ffb17208f 100644 --- a/core/tests/coretests/src/android/view/MutateDrawableTest.java +++ b/core/tests/coretests/src/android/view/MutateDrawableTest.java @@ -17,9 +17,8 @@ package android.view; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.View; -import android.view.MutateDrawable; + +import androidx.test.filters.MediumTest; public class MutateDrawableTest extends ActivityInstrumentationTestCase2<MutateDrawable> { private View mFirstButton; diff --git a/core/tests/coretests/src/android/view/PinchZoomAction.java b/core/tests/coretests/src/android/view/PinchZoomAction.java index 97fe980e01dc..bec9b557a40d 100644 --- a/core/tests/coretests/src/android/view/PinchZoomAction.java +++ b/core/tests/coretests/src/android/view/PinchZoomAction.java @@ -30,8 +30,6 @@ import android.support.test.espresso.UiController; import android.support.test.espresso.ViewAction; import android.support.test.espresso.action.Swiper; import android.support.test.espresso.util.HumanReadables; -import android.view.MotionEvent; -import android.view.View; import org.hamcrest.Matcher; diff --git a/core/tests/coretests/src/android/view/PopupWindowVisibility.java b/core/tests/coretests/src/android/view/PopupWindowVisibility.java index 85ce04fae71b..e6430d3cea32 100644 --- a/core/tests/coretests/src/android/view/PopupWindowVisibility.java +++ b/core/tests/coretests/src/android/view/PopupWindowVisibility.java @@ -18,7 +18,6 @@ package android.view; import android.app.Activity; import android.os.Bundle; -import android.view.View; import android.view.View.OnClickListener; import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; diff --git a/core/tests/coretests/src/android/view/PreDrawListener.java b/core/tests/coretests/src/android/view/PreDrawListener.java index 60bbee483173..77bd36c9001a 100644 --- a/core/tests/coretests/src/android/view/PreDrawListener.java +++ b/core/tests/coretests/src/android/view/PreDrawListener.java @@ -20,15 +20,12 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.util.AttributeSet; -import android.view.View; -import android.view.ViewTreeObserver; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.LinearLayout; import com.android.frameworks.coretests.R; - /** * Tests views with popupWindows becoming invisible */ diff --git a/core/tests/coretests/src/android/view/RenderNodeAnimatorTest.java b/core/tests/coretests/src/android/view/RenderNodeAnimatorTest.java index b52d98c906c4..786c22bf04f6 100644 --- a/core/tests/coretests/src/android/view/RenderNodeAnimatorTest.java +++ b/core/tests/coretests/src/android/view/RenderNodeAnimatorTest.java @@ -21,10 +21,11 @@ import static org.junit.Assert.assertNull; import android.app.Activity; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.InstrumentationRegistry; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; import org.junit.Rule; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/RunQueue.java b/core/tests/coretests/src/android/view/RunQueue.java index 85dd32e720bd..75444339a1aa 100644 --- a/core/tests/coretests/src/android/view/RunQueue.java +++ b/core/tests/coretests/src/android/view/RunQueue.java @@ -19,8 +19,7 @@ package android.view; import android.app.Activity; import android.os.Bundle; import android.widget.TextView; -import android.view.View; -import android.view.ViewTreeObserver; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/RunQueueTest.java b/core/tests/coretests/src/android/view/RunQueueTest.java index d69860beace4..f42f5902a5c3 100644 --- a/core/tests/coretests/src/android/view/RunQueueTest.java +++ b/core/tests/coretests/src/android/view/RunQueueTest.java @@ -17,7 +17,8 @@ package android.view; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; public class RunQueueTest extends ActivityInstrumentationTestCase<RunQueue> { public RunQueueTest() { diff --git a/core/tests/coretests/src/android/view/ScaleGesture.java b/core/tests/coretests/src/android/view/ScaleGesture.java index a954a4a497e2..235b2244e3f8 100644 --- a/core/tests/coretests/src/android/view/ScaleGesture.java +++ b/core/tests/coretests/src/android/view/ScaleGesture.java @@ -16,16 +16,11 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.util.Log; -import android.util.TypedValue; -import android.view.MotionEvent; -import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener; -import android.widget.TextView; + +import com.android.frameworks.coretests.R; public class ScaleGesture extends Activity { private ScaleGestureDetector mScaleGestureDetector; diff --git a/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java b/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java index fba8eae6c3dd..199013513bb3 100644 --- a/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java +++ b/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java @@ -16,26 +16,22 @@ package android.view; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.matcher.ViewMatchers.withId; + import android.content.Context; -import android.support.test.filters.LargeTest; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.test.ActivityInstrumentationTestCase2; import android.util.DisplayMetrics; -import android.view.PinchZoomAction; -import android.view.ScaleGesture; -import android.view.WindowManager; import android.widget.TextView; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; + import com.android.frameworks.coretests.R; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; - -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.Espresso.onView; @LargeTest public class ScaleGestureDetectorTest extends ActivityInstrumentationTestCase2<ScaleGesture> { diff --git a/core/tests/coretests/src/android/view/SetTagsTest.java b/core/tests/coretests/src/android/view/SetTagsTest.java index 373dce68d495..16997139d83f 100644 --- a/core/tests/coretests/src/android/view/SetTagsTest.java +++ b/core/tests/coretests/src/android/view/SetTagsTest.java @@ -16,12 +16,13 @@ package android.view; -import com.android.frameworks.coretests.R; -import android.test.suitebuilder.annotation.MediumTest; - import android.test.ActivityInstrumentationTestCase2; import android.widget.Button; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * Exercises {@link android.view.View}'s tags property. */ diff --git a/core/tests/coretests/src/android/view/StubbedView.java b/core/tests/coretests/src/android/view/StubbedView.java index 612095c4e43d..c96b9b704a54 100644 --- a/core/tests/coretests/src/android/view/StubbedView.java +++ b/core/tests/coretests/src/android/view/StubbedView.java @@ -16,11 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; import android.app.Activity; -import android.view.View; +import android.os.Bundle; + +import com.android.frameworks.coretests.R; /** * Exercise <ViewStub /> tag in XML files. diff --git a/core/tests/coretests/src/android/view/VelocityTest.java b/core/tests/coretests/src/android/view/VelocityTest.java index 7f32208659be..c116f4dc8a43 100644 --- a/core/tests/coretests/src/android/view/VelocityTest.java +++ b/core/tests/coretests/src/android/view/VelocityTest.java @@ -16,16 +16,17 @@ package android.view; -import android.test.suitebuilder.annotation.Suppress; -import junit.framework.Assert; - import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + +import junit.framework.Assert; + /** * Exercises {@link android.view.VelocityTracker} to compute correct velocity.<br> * To launch this test, use :<br> diff --git a/core/tests/coretests/src/android/view/ViewAttachTest.java b/core/tests/coretests/src/android/view/ViewAttachTest.java index aa8f8d82e725..1a8dd9909b03 100644 --- a/core/tests/coretests/src/android/view/ViewAttachTest.java +++ b/core/tests/coretests/src/android/view/ViewAttachTest.java @@ -16,16 +16,13 @@ package android.view; -import android.content.Context; import android.content.pm.ActivityInfo; import android.graphics.PixelFormat; import android.os.SystemClock; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.view.View; -import android.view.ViewGroup; -import android.view.WindowManager; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.LargeTest; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/view/ViewAttachTestActivity.java b/core/tests/coretests/src/android/view/ViewAttachTestActivity.java index 59e25aee7dc5..bcbc8134c226 100644 --- a/core/tests/coretests/src/android/view/ViewAttachTestActivity.java +++ b/core/tests/coretests/src/android/view/ViewAttachTestActivity.java @@ -16,11 +16,11 @@ package android.view; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class ViewAttachTestActivity extends Activity { public static final String TAG = "OnAttachedTest"; @Override diff --git a/core/tests/coretests/src/android/view/ViewAttachView.java b/core/tests/coretests/src/android/view/ViewAttachView.java index 5af2d8f33cab..2f3ff8f8769e 100644 --- a/core/tests/coretests/src/android/view/ViewAttachView.java +++ b/core/tests/coretests/src/android/view/ViewAttachView.java @@ -22,7 +22,6 @@ import android.graphics.Color; import android.os.SystemClock; import android.util.AttributeSet; import android.util.Log; -import android.view.View; /** * A View that will throw a RuntimeException if onAttachedToWindow and diff --git a/core/tests/coretests/src/android/view/ViewCaptureTest.java b/core/tests/coretests/src/android/view/ViewCaptureTest.java index 4405934e62e5..218047c5f45e 100644 --- a/core/tests/coretests/src/android/view/ViewCaptureTest.java +++ b/core/tests/coretests/src/android/view/ViewCaptureTest.java @@ -21,14 +21,15 @@ import static org.junit.Assert.assertTrue; import android.app.Activity; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.support.test.filters.SmallTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseIntArray; import android.view.ViewDebug.CanvasProvider; import android.view.ViewDebug.HardwareCanvasProvider; import android.view.ViewDebug.SoftwareCanvasProvider; +import androidx.test.filters.SmallTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import org.junit.Assert; diff --git a/core/tests/coretests/src/android/view/ViewCaptureTestActivity.java b/core/tests/coretests/src/android/view/ViewCaptureTestActivity.java index 20e3eb585435..2f51c2459af9 100644 --- a/core/tests/coretests/src/android/view/ViewCaptureTestActivity.java +++ b/core/tests/coretests/src/android/view/ViewCaptureTestActivity.java @@ -19,6 +19,7 @@ package android.view; import android.annotation.Nullable; import android.app.Activity; import android.os.Bundle; + import com.android.frameworks.coretests.R; public class ViewCaptureTestActivity extends Activity { diff --git a/core/tests/coretests/src/android/view/ViewGroupAttributesTest.java b/core/tests/coretests/src/android/view/ViewGroupAttributesTest.java index b4ef0e7e76bd..c24cd35ff256 100644 --- a/core/tests/coretests/src/android/view/ViewGroupAttributesTest.java +++ b/core/tests/coretests/src/android/view/ViewGroupAttributesTest.java @@ -18,7 +18,8 @@ package android.view; import android.content.Context; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; public class ViewGroupAttributesTest extends AndroidTestCase { diff --git a/core/tests/coretests/src/android/view/ViewGroupChildren.java b/core/tests/coretests/src/android/view/ViewGroupChildren.java index f39720b269b3..d5d98793499e 100644 --- a/core/tests/coretests/src/android/view/ViewGroupChildren.java +++ b/core/tests/coretests/src/android/view/ViewGroupChildren.java @@ -16,12 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; -import android.widget.Button; -import android.view.View; import android.app.Activity; +import android.os.Bundle; + +import com.android.frameworks.coretests.R; /** * Exercise ViewGroup's ability to add and remove children. diff --git a/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java b/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java index d1665ef8cf14..07cb2a144f32 100644 --- a/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java +++ b/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java @@ -16,18 +16,16 @@ package android.view; -import com.android.frameworks.coretests.R; -import android.view.ViewGroupChildren; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; -import android.test.UiThreadTest; -import android.view.View; -import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * Exercises {@link android.view.ViewGroup}'s ability to add/remove children. */ diff --git a/core/tests/coretests/src/android/view/ViewGroupTransientViewTest.java b/core/tests/coretests/src/android/view/ViewGroupTransientViewTest.java index 93ad41f08b06..54524b2c8e70 100644 --- a/core/tests/coretests/src/android/view/ViewGroupTransientViewTest.java +++ b/core/tests/coretests/src/android/view/ViewGroupTransientViewTest.java @@ -22,12 +22,13 @@ import static junit.framework.Assert.fail; import android.app.Activity; import android.content.Context; import android.graphics.Canvas; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.widget.FrameLayout; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/ViewInvalidateTest.java b/core/tests/coretests/src/android/view/ViewInvalidateTest.java index 115504b50adf..c25a2deb2a05 100644 --- a/core/tests/coretests/src/android/view/ViewInvalidateTest.java +++ b/core/tests/coretests/src/android/view/ViewInvalidateTest.java @@ -21,24 +21,30 @@ import static junit.framework.Assert.assertFalse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.Activity; import android.content.Context; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.LargeTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import android.view.ViewTreeObserver.OnDrawListener; import android.widget.FrameLayout; -import com.android.compatibility.common.util.WidgetTestUtils; +import androidx.test.InstrumentationRegistry; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.LargeTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * Test of invalidates, drawing, and the flags that support them */ @@ -281,4 +287,42 @@ public class ViewInvalidateTest { View.PFLAG_DRAWN); assertTrue(getViewRoot(mParent).mIsAnimating); } + + /** Copied from cts/common/device-side/util. */ + static class WidgetTestUtils { + public static void runOnMainAndDrawSync(@NonNull final ActivityTestRule activityTestRule, + @NonNull final View view, @Nullable final Runnable runner) throws Throwable { + final CountDownLatch latch = new CountDownLatch(1); + + activityTestRule.runOnUiThread(() -> { + final OnDrawListener listener = new OnDrawListener() { + @Override + public void onDraw() { + // posting so that the sync happens after the draw that's about to happen + view.post(() -> { + activityTestRule.getActivity().getWindow().getDecorView() + .getViewTreeObserver().removeOnDrawListener(this); + latch.countDown(); + }); + } + }; + + activityTestRule.getActivity().getWindow().getDecorView() + .getViewTreeObserver().addOnDrawListener(listener); + + if (runner != null) { + runner.run(); + } + view.invalidate(); + }); + + try { + Assert.assertTrue("Expected draw pass occurred within 5 seconds", + latch.await(5, TimeUnit.SECONDS)); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + + } } diff --git a/core/tests/coretests/src/android/view/ViewRootImplTest.java b/core/tests/coretests/src/android/view/ViewRootImplTest.java index ca6d6cfedb76..9a5784774d1c 100644 --- a/core/tests/coretests/src/android/view/ViewRootImplTest.java +++ b/core/tests/coretests/src/android/view/ViewRootImplTest.java @@ -23,9 +23,10 @@ import android.content.Context; import android.graphics.Insets; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/ViewStubTest.java b/core/tests/coretests/src/android/view/ViewStubTest.java index ebd52a6d7774..504a4eca29a2 100644 --- a/core/tests/coretests/src/android/view/ViewStubTest.java +++ b/core/tests/coretests/src/android/view/ViewStubTest.java @@ -16,14 +16,12 @@ package android.view; -import android.view.StubbedView; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.UiThreadTest; -import android.view.View; -import android.view.ViewStub; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; public class ViewStubTest extends ActivityInstrumentationTestCase<StubbedView> { public ViewStubTest() { diff --git a/core/tests/coretests/src/android/view/ViewTransientStateTest.java b/core/tests/coretests/src/android/view/ViewTransientStateTest.java index 36ea01deea22..3f73b0712d55 100644 --- a/core/tests/coretests/src/android/view/ViewTransientStateTest.java +++ b/core/tests/coretests/src/android/view/ViewTransientStateTest.java @@ -18,12 +18,11 @@ package android.view; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; -import com.android.frameworks.coretests.R; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; -import static org.junit.Assert.assertFalse; +import com.android.frameworks.coretests.R; /** * Exercise set View's transient state diff --git a/core/tests/coretests/src/android/view/Visibility.java b/core/tests/coretests/src/android/view/Visibility.java index 031568c5a446..8e3de4e4a6a3 100644 --- a/core/tests/coretests/src/android/view/Visibility.java +++ b/core/tests/coretests/src/android/view/Visibility.java @@ -16,12 +16,11 @@ package android.view; -import com.android.frameworks.coretests.R; - +import android.app.Activity; import android.os.Bundle; import android.widget.Button; -import android.view.View; -import android.app.Activity; + +import com.android.frameworks.coretests.R; /** * Exercise View's ability to change their visibility: GONE, INVISIBLE and diff --git a/core/tests/coretests/src/android/view/VisibilityCallback.java b/core/tests/coretests/src/android/view/VisibilityCallback.java index f98a0a882764..c9659737e479 100644 --- a/core/tests/coretests/src/android/view/VisibilityCallback.java +++ b/core/tests/coretests/src/android/view/VisibilityCallback.java @@ -16,16 +16,15 @@ package android.view; +import android.app.Activity; import android.content.Context; +import android.os.Bundle; import android.util.AttributeSet; import android.util.Log; +import android.widget.Button; import android.widget.TextView; -import com.android.frameworks.coretests.R; -import android.os.Bundle; -import android.widget.Button; -import android.view.View; -import android.app.Activity; +import com.android.frameworks.coretests.R; /** * Exercise View's ability to change their visibility: GONE, INVISIBLE and diff --git a/core/tests/coretests/src/android/view/VisibilityCallbackTest.java b/core/tests/coretests/src/android/view/VisibilityCallbackTest.java index ec956d24f29c..d7c7b4c0094f 100644 --- a/core/tests/coretests/src/android/view/VisibilityCallbackTest.java +++ b/core/tests/coretests/src/android/view/VisibilityCallbackTest.java @@ -17,12 +17,12 @@ package android.view; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/VisibilityTest.java b/core/tests/coretests/src/android/view/VisibilityTest.java index 29c1c8a428e7..83a77024cc43 100644 --- a/core/tests/coretests/src/android/view/VisibilityTest.java +++ b/core/tests/coretests/src/android/view/VisibilityTest.java @@ -20,11 +20,12 @@ import static android.view.KeyEvent.KEYCODE_DPAD_CENTER; import static android.view.KeyEvent.KEYCODE_DPAD_LEFT; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.Button; import android.widget.TextView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/view/WindowInsetsTest.java b/core/tests/coretests/src/android/view/WindowInsetsTest.java index 1513a1a7d222..15a96a144dd5 100644 --- a/core/tests/coretests/src/android/view/WindowInsetsTest.java +++ b/core/tests/coretests/src/android/view/WindowInsetsTest.java @@ -17,18 +17,18 @@ package android.view; import static android.view.WindowInsets.Type.ime; -import static android.view.WindowInsets.Type.indexOf; import static android.view.WindowInsets.Type.sideBars; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.graphics.Insets; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.WindowInsets.Builder; -import android.view.WindowInsets.Type; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/ZeroSized.java b/core/tests/coretests/src/android/view/ZeroSized.java index f2a6b3ef3f6d..9e2dfcb8e3d4 100644 --- a/core/tests/coretests/src/android/view/ZeroSized.java +++ b/core/tests/coretests/src/android/view/ZeroSized.java @@ -16,10 +16,10 @@ package android.view; -import com.android.frameworks.coretests.R; - -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; + +import com.android.frameworks.coretests.R; /** * This activity contains Views with various widths and heights. The goal is to exercise the diff --git a/core/tests/coretests/src/android/view/ZeroSizedTest.java b/core/tests/coretests/src/android/view/ZeroSizedTest.java index 193fc9842e8d..946bf6866d26 100644 --- a/core/tests/coretests/src/android/view/ZeroSizedTest.java +++ b/core/tests/coretests/src/android/view/ZeroSizedTest.java @@ -16,13 +16,12 @@ package android.view; -import android.view.ZeroSized; -import com.android.frameworks.coretests.R; - -import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.view.View; import android.graphics.Bitmap; +import android.test.ActivityInstrumentationTestCase; + +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; /** * Builds the drawing cache of Views of various dimension. The assumption is that diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java index 7f675ffffee5..a88968bfd089 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java @@ -28,10 +28,11 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityEventTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityEventTest.java index 3e03414367bd..46c96c94dc11 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityEventTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityEventTest.java @@ -21,7 +21,8 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java index 318d122b3f2f..ab24f89015c7 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java @@ -22,10 +22,12 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.os.Bundle; import android.os.RemoteException; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import libcore.util.EmptyArray; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java index 506e5447a239..0ed690ceeef4 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java @@ -25,11 +25,12 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import android.os.Parcel; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.util.ArraySet; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.util.CollectionUtils; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java b/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java index 4814c61abe7c..11f4e3cf9304 100644 --- a/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java +++ b/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java @@ -14,7 +14,7 @@ package android.view.accessibility; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java b/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java index 7619af23375f..33bc59349230 100644 --- a/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java +++ b/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.autofill; import static com.google.common.truth.Truth.assertThat; diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java index 73cceaeee547..a2f0eba0b831 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.contentcapture; import static com.google.common.truth.Truth.assertThat; diff --git a/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java b/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java index bbfe01c379f1..099f41d10e27 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.contentcapture; import static com.google.common.truth.Truth.assertThat; @@ -24,7 +25,6 @@ import android.graphics.Matrix; import android.os.Bundle; import android.os.LocaleList; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; import android.view.View; import android.view.ViewStructure.HtmlInfo; import android.view.autofill.AutofillId; @@ -32,6 +32,8 @@ import android.view.autofill.AutofillValue; import android.view.contentcapture.ViewNode.ViewStructureImpl; import android.widget.FrameLayout; +import androidx.test.InstrumentationRegistry; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java index 0fd0136a85ed..ace6611a52c5 100644 --- a/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java @@ -28,11 +28,12 @@ import static org.junit.Assert.assertTrue; import android.graphics.Matrix; import android.graphics.RectF; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.TextUtils; import android.view.inputmethod.CursorAnchorInfo.Builder; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java index 1b00e0939688..f24e232765c4 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java @@ -26,9 +26,10 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodManagerTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodManagerTest.java index 55e5e3698f33..9f259a841319 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodManagerTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodManagerTest.java @@ -20,11 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.WindowManager; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java index 8df18480ed5a..e2fb46af5b64 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java @@ -19,10 +19,11 @@ package android.view.inputmethod; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java index c76359ee39bc..1e0e1235161c 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java @@ -23,10 +23,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java b/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java index 8c96b588d08f..453ad72b64dc 100644 --- a/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java @@ -23,10 +23,11 @@ import static org.junit.Assert.assertTrue; import android.graphics.RectF; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.inputmethod.SparseRectFArray.SparseRectFArrayBuilder; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/menu/ContextMenuTest.java b/core/tests/coretests/src/android/view/menu/ContextMenuTest.java index 657a7fc7b798..ba85d765ceda 100644 --- a/core/tests/coretests/src/android/view/menu/ContextMenuTest.java +++ b/core/tests/coretests/src/android/view/menu/ContextMenuTest.java @@ -18,7 +18,6 @@ package android.view.menu; import android.content.Context; import android.graphics.Point; -import android.support.test.filters.MediumTest; import android.test.ActivityInstrumentationTestCase; import android.util.PollingCheck; import android.view.Display; @@ -26,6 +25,8 @@ import android.view.View; import android.view.WindowManager; import android.widget.espresso.ContextMenuUtils; +import androidx.test.filters.MediumTest; + @MediumTest public class ContextMenuTest extends ActivityInstrumentationTestCase<ContextMenuActivity> { diff --git a/core/tests/coretests/src/android/view/menu/MenuLayout.java b/core/tests/coretests/src/android/view/menu/MenuLayout.java index 356c9482de41..33ee5158bc12 100644 --- a/core/tests/coretests/src/android/view/menu/MenuLayout.java +++ b/core/tests/coretests/src/android/view/menu/MenuLayout.java @@ -16,8 +16,6 @@ package android.view.menu; -import android.view.menu.MenuScenario.Params; - import android.os.Bundle; import android.view.Menu; import android.widget.Button; diff --git a/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java index 8ed0d86d850d..ff9f166afb5f 100644 --- a/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java +++ b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java @@ -16,13 +16,10 @@ package android.view.menu; +import android.test.ActivityInstrumentationTestCase; import android.util.KeyUtils; -import com.android.internal.view.menu.IconMenuView; -import com.android.internal.view.menu.MenuBuilder; -import android.content.pm.ActivityInfo; -import android.support.test.filters.LargeTest; -import android.test.ActivityInstrumentationTestCase; +import androidx.test.filters.LargeTest; @LargeTest public class MenuLayoutLandscapeTest extends ActivityInstrumentationTestCase<MenuLayoutLandscape> { diff --git a/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java index ccf12643593b..360be5343a2b 100644 --- a/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java +++ b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java @@ -16,11 +16,11 @@ package android.view.menu; -import android.content.pm.ActivityInfo; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; import android.util.KeyUtils; +import androidx.test.filters.LargeTest; + @LargeTest public class MenuLayoutPortraitTest extends ActivityInstrumentationTestCase<MenuLayoutPortrait> { private static final String LONG_TITLE = "Really really really really really really really really really really long title"; diff --git a/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java b/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java index 82ad858ba3a9..c18e36136990 100644 --- a/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java +++ b/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java @@ -16,17 +16,12 @@ package android.view.menu; -import android.view.menu.MenuWith1Item; -import android.util.KeyUtils; -import com.android.internal.view.menu.MenuBuilder; - -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.TouchUtils; - import android.test.ActivityInstrumentationTestCase; +import android.util.KeyUtils; import android.view.KeyEvent; -import android.view.View; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; public class MenuWith1ItemTest extends ActivityInstrumentationTestCase<MenuWith1Item> { private MenuWith1Item mActivity; diff --git a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java index 4a6c093e3bd1..780e15ab885e 100644 --- a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java @@ -22,8 +22,9 @@ import static android.view.textclassifier.ConversationActions.Message.PERSON_USE import static com.google.common.truth.Truth.assertThat; import android.app.Person; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.google.android.textclassifier.ActionsSuggestionsModel; diff --git a/core/tests/coretests/src/android/view/textclassifier/FakeContextBuilder.java b/core/tests/coretests/src/android/view/textclassifier/FakeContextBuilder.java index 018085698d0c..fef6583f4f98 100644 --- a/core/tests/coretests/src/android/view/textclassifier/FakeContextBuilder.java +++ b/core/tests/coretests/src/android/view/textclassifier/FakeContextBuilder.java @@ -21,6 +21,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.ContextWrapper; @@ -29,9 +30,8 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.test.InstrumentationRegistry; -import androidx.annotation.Nullable; +import androidx.test.InstrumentationRegistry; import com.google.common.base.Preconditions; diff --git a/core/tests/coretests/src/android/view/textclassifier/IntentFactoryTest.java b/core/tests/coretests/src/android/view/textclassifier/IntentFactoryTest.java index aaadefb90ece..3fc8e4c2eecd 100644 --- a/core/tests/coretests/src/android/view/textclassifier/IntentFactoryTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/IntentFactoryTest.java @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.textclassifier; import static com.google.common.truth.Truth.assertThat; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.google.android.textclassifier.AnnotatorModel; diff --git a/core/tests/coretests/src/android/view/textclassifier/ModelFileManagerTest.java b/core/tests/coretests/src/android/view/textclassifier/ModelFileManagerTest.java index 88d162b34144..74b8e3b49f7b 100644 --- a/core/tests/coretests/src/android/view/textclassifier/ModelFileManagerTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/ModelFileManagerTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.textclassifier; import static com.google.common.truth.Truth.assertThat; @@ -20,9 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.os.LocaleList; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/android/view/textclassifier/SelectionEventTest.java b/core/tests/coretests/src/android/view/textclassifier/SelectionEventTest.java index a3c6179792b1..46e3a4c26dde 100644 --- a/core/tests/coretests/src/android/view/textclassifier/SelectionEventTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/SelectionEventTest.java @@ -19,8 +19,9 @@ package android.view.textclassifier; import static org.junit.Assert.assertEquals; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassificationConstantsTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassificationConstantsTest.java index 54007fb98e67..9662182b8cf8 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassificationConstantsTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassificationConstantsTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java index a3f69d93ad44..4fcd51c9be1d 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java @@ -26,9 +26,10 @@ import android.content.Context; import android.content.Intent; import android.os.LocaleList; import android.service.textclassifier.TextClassifierService; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java index aaf7312fe0e6..99c959ef57e4 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java @@ -32,11 +32,12 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.LocaleList; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java index ec6101c09b7b..7009fb2ea758 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java @@ -24,11 +24,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.Intent; import android.os.LocaleList; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.text.Spannable; import android.text.SpannableString; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextLanguageTest.java b/core/tests/coretests/src/android/view/textclassifier/TextLanguageTest.java index 1dcaed6f6a1e..d0d32e3a507a 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextLanguageTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextLanguageTest.java @@ -21,8 +21,9 @@ import static org.junit.Assert.assertEquals; import android.icu.util.ULocale; import android.os.Bundle; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextLinksTest.java b/core/tests/coretests/src/android/view/textclassifier/TextLinksTest.java index f022d040246b..b9cc8f4ba4a0 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextLinksTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextLinksTest.java @@ -21,10 +21,11 @@ import static org.junit.Assert.assertEquals; import android.os.Bundle; import android.os.LocaleList; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/TextSelectionTest.java b/core/tests/coretests/src/android/view/textclassifier/TextSelectionTest.java index 2ea49f7d21be..30cc4e8990e0 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextSelectionTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextSelectionTest.java @@ -21,8 +21,9 @@ import static org.junit.Assert.assertEquals; import android.os.Bundle; import android.os.LocaleList; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java b/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java index 8e4f02c668b7..5e8e5823eefa 100644 --- a/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java @@ -23,13 +23,14 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import android.metrics.LogMaker; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; import android.view.textclassifier.GenerateLinksLogger; import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextLinks; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/core/tests/coretests/src/android/view/textclassifier/logging/TextClassifierEventTronLoggerTest.java b/core/tests/coretests/src/android/view/textclassifier/logging/TextClassifierEventTronLoggerTest.java index 0597a89e87d4..b1b74160ecd5 100644 --- a/core/tests/coretests/src/android/view/textclassifier/logging/TextClassifierEventTronLoggerTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/logging/TextClassifierEventTronLoggerTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package android.view.textclassifier.logging; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_TEXT_SELECTION_SMART_SHARE; @@ -24,13 +25,14 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ import static com.google.common.truth.Truth.assertThat; import android.metrics.LogMaker; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.textclassifier.ConversationAction; import android.view.textclassifier.TextClassificationContext; import android.view.textclassifier.TextClassifierEvent; import android.view.textclassifier.TextClassifierEventTronLogger; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.logging.MetricsLogger; import org.junit.Before; diff --git a/core/tests/coretests/src/android/view/textservice/SpellCheckerSubtypeTest.java b/core/tests/coretests/src/android/view/textservice/SpellCheckerSubtypeTest.java index 4a1c414234bd..638d894b114a 100644 --- a/core/tests/coretests/src/android/view/textservice/SpellCheckerSubtypeTest.java +++ b/core/tests/coretests/src/android/view/textservice/SpellCheckerSubtypeTest.java @@ -16,15 +16,16 @@ package android.view.textservice; +import static android.test.MoreAsserts.assertNotEqual; + import android.os.Parcel; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.util.Arrays; import java.util.Locale; -import static android.test.MoreAsserts.assertNotEqual; - /** * TODO: Most of part can be, and probably should be, moved to CTS. */ diff --git a/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java b/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java index 4f31c4ee72a4..6edc1628b163 100644 --- a/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java +++ b/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java @@ -24,18 +24,14 @@ import static org.junit.Assert.assertTrue; import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetManager; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; import android.view.ViewGroup.OnHierarchyChangeListener; -import com.android.frameworks.coretests.R; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; -import java.util.ArrayList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; -import java.util.concurrent.Future; +import com.android.frameworks.coretests.R; import org.junit.Before; import org.junit.Rule; @@ -43,6 +39,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; +import java.util.ArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executor; +import java.util.concurrent.Future; + /** * Tests for AppWidgetHostView */ diff --git a/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java index 8e73b521cdfc..01e82a5a9f7f 100644 --- a/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java +++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java @@ -18,7 +18,8 @@ package android.widget; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase2; -import android.test.FlakyTest; + +import androidx.test.filters.FlakyTest; // TODO: tests fail intermittently. Add back MediumTest annotation when fixed public class AutoCompleteTextViewCallbacks @@ -32,7 +33,7 @@ public class AutoCompleteTextViewCallbacks /** Test that the initial popup of the suggestions does not select anything. */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupNoSelection() throws Exception { AutoCompleteTextViewSimple theActivity = getActivity(); AutoCompleteTextView textView = theActivity.getTextView(); @@ -57,7 +58,7 @@ public class AutoCompleteTextViewCallbacks } /** Test that arrow-down into the popup calls the onSelected callback. */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupEnterSelection() throws Exception { final AutoCompleteTextViewSimple theActivity = getActivity(); AutoCompleteTextView textView = theActivity.getTextView(); @@ -106,7 +107,7 @@ public class AutoCompleteTextViewCallbacks } /** Test that arrow-up out of the popup calls the onNothingSelected callback */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupLeaveSelection() { final AutoCompleteTextViewSimple theActivity = getActivity(); AutoCompleteTextView textView = theActivity.getTextView(); diff --git a/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java index ee0abaea027a..21e4184e8e4d 100644 --- a/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java +++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java @@ -18,8 +18,8 @@ package android.widget; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase2; -import android.test.FlakyTest; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.FlakyTest; /** * A collection of tests on aspects of the AutoCompleteTextView's popup @@ -41,7 +41,7 @@ public class AutoCompleteTextViewPopup } /** Test that we can move the selection and it responds as expected */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupSetListSelection() throws Throwable { AutoCompleteTextViewSimple theActivity = getActivity(); final AutoCompleteTextView textView = theActivity.getTextView(); @@ -73,7 +73,7 @@ public class AutoCompleteTextViewPopup } /** Test that we can look at the selection as we move around */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupGetListSelection() throws Throwable { AutoCompleteTextViewSimple theActivity = getActivity(); final AutoCompleteTextView textView = theActivity.getTextView(); @@ -100,7 +100,7 @@ public class AutoCompleteTextViewPopup } /** Test that we can clear the selection */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupClearListSelection() throws Throwable { AutoCompleteTextViewSimple theActivity = getActivity(); final AutoCompleteTextView textView = theActivity.getTextView(); @@ -133,7 +133,7 @@ public class AutoCompleteTextViewPopup } /** Make sure we handle an empty adapter properly */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupNavigateNoAdapter() throws Throwable { AutoCompleteTextViewSimple theActivity = getActivity(); final AutoCompleteTextView textView = theActivity.getTextView(); @@ -167,7 +167,7 @@ public class AutoCompleteTextViewPopup } /** Test the show/hide behavior of the drop-down. */ - @FlakyTest(tolerance=3) + @FlakyTest public void testPopupShow() throws Throwable { AutoCompleteTextViewSimple theActivity = getActivity(); final AutoCompleteTextView textView = theActivity.getTextView(); diff --git a/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java index b4e05aa26de7..063bec5fa7cc 100644 --- a/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java +++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java @@ -16,8 +16,6 @@ package android.widget; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.util.Log; @@ -25,6 +23,8 @@ import android.view.View; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemSelectedListener; +import com.android.frameworks.coretests.R; + public class AutoCompleteTextViewSimple extends Activity implements OnItemClickListener, OnItemSelectedListener { diff --git a/core/tests/coretests/src/android/widget/DatePickerActivity.java b/core/tests/coretests/src/android/widget/DatePickerActivity.java index c3b25a1a5a8c..9e455b223865 100644 --- a/core/tests/coretests/src/android/widget/DatePickerActivity.java +++ b/core/tests/coretests/src/android/widget/DatePickerActivity.java @@ -18,6 +18,7 @@ package android.widget; import android.app.Activity; import android.os.Bundle; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/widget/DatePickerFocusTest.java b/core/tests/coretests/src/android/widget/DatePickerFocusTest.java index be85450be429..f0672304d90e 100644 --- a/core/tests/coretests/src/android/widget/DatePickerFocusTest.java +++ b/core/tests/coretests/src/android/widget/DatePickerFocusTest.java @@ -19,11 +19,12 @@ package android.widget; import android.app.Activity; import android.app.Instrumentation; import android.os.SystemClock; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.view.KeyEvent; import android.view.View; +import androidx.test.filters.LargeTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/widget/DateTimeViewTest.java b/core/tests/coretests/src/android/widget/DateTimeViewTest.java index 40a6b7a43f53..d0bd4b8b0bd5 100644 --- a/core/tests/coretests/src/android/widget/DateTimeViewTest.java +++ b/core/tests/coretests/src/android/widget/DateTimeViewTest.java @@ -16,10 +16,10 @@ package android.widget; -import android.support.test.InstrumentationRegistry; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/widget/EditorCursorTest.java b/core/tests/coretests/src/android/widget/EditorCursorTest.java index 9186827b38f3..e4f55df6f683 100644 --- a/core/tests/coretests/src/android/widget/EditorCursorTest.java +++ b/core/tests/coretests/src/android/widget/EditorCursorTest.java @@ -31,10 +31,11 @@ import static org.hamcrest.Matchers.sameInstance; import android.app.Activity; import android.app.Instrumentation; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/widget/ListViewTest.java b/core/tests/coretests/src/android/widget/ListViewTest.java index 449b696fb008..254af2aed768 100644 --- a/core/tests/coretests/src/android/widget/ListViewTest.java +++ b/core/tests/coretests/src/android/widget/ListViewTest.java @@ -16,20 +16,19 @@ package android.widget; -import android.test.suitebuilder.annotation.Suppress; -import com.google.android.collect.Lists; - -import junit.framework.Assert; - import android.content.Context; import android.content.res.Resources; import android.test.InstrumentationTestCase; import android.test.mock.MockContext; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ListView; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + +import com.google.android.collect.Lists; + +import junit.framework.Assert; import java.util.List; diff --git a/core/tests/coretests/src/android/widget/RadioGroupActivity.java b/core/tests/coretests/src/android/widget/RadioGroupActivity.java index c87aa3ad609d..dd3b30a7b326 100644 --- a/core/tests/coretests/src/android/widget/RadioGroupActivity.java +++ b/core/tests/coretests/src/android/widget/RadioGroupActivity.java @@ -17,11 +17,11 @@ package android.widget; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class RadioGroupActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java b/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java index 1ab362835bbe..18c1ea164ebb 100644 --- a/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java +++ b/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java @@ -16,12 +16,13 @@ package android.widget; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase2; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; /** * Exercises {@link android.widget.RadioGroup}'s check feature. diff --git a/core/tests/coretests/src/android/widget/RemoteViewsAdapterTest.java b/core/tests/coretests/src/android/widget/RemoteViewsAdapterTest.java index 06b860a96117..da53f6d94f49 100644 --- a/core/tests/coretests/src/android/widget/RemoteViewsAdapterTest.java +++ b/core/tests/coretests/src/android/widget/RemoteViewsAdapterTest.java @@ -38,11 +38,12 @@ import android.database.DataSetObserver; import android.os.Handler; import android.os.Looper; import android.os.RemoteException; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import com.android.internal.widget.IRemoteViewsFactory; diff --git a/core/tests/coretests/src/android/widget/RemoteViewsTest.java b/core/tests/coretests/src/android/widget/RemoteViewsTest.java index 36792bbf6fb6..8cb7e1b95245 100644 --- a/core/tests/coretests/src/android/widget/RemoteViewsTest.java +++ b/core/tests/coretests/src/android/widget/RemoteViewsTest.java @@ -32,12 +32,13 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Binder; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; import android.view.ViewGroup; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import org.junit.Before; diff --git a/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java b/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java index 2add22105681..74aad9afa359 100644 --- a/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java +++ b/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java @@ -22,7 +22,8 @@ import static java.util.function.Function.identity; import android.graphics.PointF; import android.graphics.RectF; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java b/core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java index 1731c08df018..a79b30dbbe1a 100644 --- a/core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java +++ b/core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java @@ -16,14 +16,15 @@ package android.widget; -import android.test.suitebuilder.annotation.Suppress; -import com.google.android.collect.Lists; - import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + +import com.google.android.collect.Lists; import java.util.ArrayList; import java.util.Random; diff --git a/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java b/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java index eafe42723780..483270e1f9ab 100644 --- a/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java +++ b/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java @@ -36,13 +36,13 @@ import static android.widget.espresso.SuggestionsPopupwindowUtils.clickSuggestio import static android.widget.espresso.SuggestionsPopupwindowUtils.onSuggestionsPopup; import static android.widget.espresso.TextViewActions.clickOnTextAtIndex; import static android.widget.espresso.TextViewActions.longPressOnTextAtIndex; + import static org.hamcrest.Matchers.is; + import android.content.res.TypedArray; import android.support.test.espresso.NoMatchingViewException; import android.support.test.espresso.ViewAssertion; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; import android.text.Selection; import android.text.Spannable; import android.text.Spanned; @@ -51,6 +51,8 @@ import android.text.style.SuggestionSpan; import android.text.style.TextAppearanceSpan; import android.view.View; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java index ff4a7dafc627..41fa08b7e0e2 100644 --- a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java +++ b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java @@ -43,14 +43,15 @@ import static android.widget.espresso.TextViewAssertions.hasInsertionPointerAtIn import static android.widget.espresso.TextViewAssertions.hasSelection; import android.app.Activity; -import android.support.test.filters.MediumTest; -import android.support.test.filters.Suppress; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.view.MotionEvent; import android.view.textclassifier.TextClassificationManager; import android.view.textclassifier.TextClassifier; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import org.junit.Before; diff --git a/core/tests/coretests/src/android/widget/TextViewActivityTest.java b/core/tests/coretests/src/android/widget/TextViewActivityTest.java index 90758ba7c418..9d93421b1783 100644 --- a/core/tests/coretests/src/android/widget/TextViewActivityTest.java +++ b/core/tests/coretests/src/android/widget/TextViewActivityTest.java @@ -27,10 +27,8 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; import static android.widget.espresso.CustomViewActions.longPressAtRelativeCoordinates; import static android.widget.espresso.DragHandleUtils.onHandleView; -import static android.widget.espresso.FloatingToolbarEspressoUtils - .assertFloatingToolbarContainsItem; -import static android.widget.espresso.FloatingToolbarEspressoUtils - .assertFloatingToolbarDoesNotContainItem; +import static android.widget.espresso.FloatingToolbarEspressoUtils.assertFloatingToolbarContainsItem; +import static android.widget.espresso.FloatingToolbarEspressoUtils.assertFloatingToolbarDoesNotContainItem; import static android.widget.espresso.FloatingToolbarEspressoUtils.assertFloatingToolbarIsDisplayed; import static android.widget.espresso.FloatingToolbarEspressoUtils.assertFloatingToolbarItemIndex; import static android.widget.espresso.FloatingToolbarEspressoUtils.clickFloatingToolbarItem; @@ -62,13 +60,8 @@ import android.app.Activity; import android.app.Instrumentation; import android.content.ClipData; import android.content.ClipboardManager; -import android.support.test.InstrumentationRegistry; import android.support.test.espresso.action.EspressoKey; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; -import android.test.suitebuilder.annotation.Suppress; import android.text.InputType; import android.text.Selection; import android.text.Spannable; @@ -85,6 +78,12 @@ import android.view.textclassifier.TextLinks; import android.view.textclassifier.TextLinksParams; import android.widget.espresso.CustomViewActions.RelativeCoordinatesProvider; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import org.junit.Before; diff --git a/core/tests/coretests/src/android/widget/TextViewFallbackLineSpacingTest.java b/core/tests/coretests/src/android/widget/TextViewFallbackLineSpacingTest.java index e9d1d3e00e8a..113db9d7a2b7 100644 --- a/core/tests/coretests/src/android/widget/TextViewFallbackLineSpacingTest.java +++ b/core/tests/coretests/src/android/widget/TextViewFallbackLineSpacingTest.java @@ -21,8 +21,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import android.app.Activity; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; import android.text.DynamicLayout; import android.text.FontFallbackSetup; import android.text.Layout; @@ -31,6 +29,9 @@ import android.util.TypedValue; import android.view.View; import android.widget.TextView.BufferType; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; + import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/widget/TextViewPerformanceTest.java b/core/tests/coretests/src/android/widget/TextViewPerformanceTest.java index cf173fb78a32..a769ea40b4f2 100644 --- a/core/tests/coretests/src/android/widget/TextViewPerformanceTest.java +++ b/core/tests/coretests/src/android/widget/TextViewPerformanceTest.java @@ -20,14 +20,15 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.SpannedString; import android.view.View; import android.view.ViewGroup; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/android/widget/TextViewTest.java b/core/tests/coretests/src/android/widget/TextViewTest.java index 1c5610b1bc7d..585360fdd2f3 100644 --- a/core/tests/coretests/src/android/widget/TextViewTest.java +++ b/core/tests/coretests/src/android/widget/TextViewTest.java @@ -27,11 +27,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.Paint; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import android.text.GetChars; import android.text.Layout; import android.text.PrecomputedText; @@ -40,6 +35,12 @@ import android.text.Spannable; import android.view.View; import android.widget.TextView.BufferType; +import androidx.test.InstrumentationRegistry; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java b/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java index 75da6fef46ff..85a4509c18a3 100644 --- a/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java +++ b/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java @@ -16,12 +16,11 @@ package android.widget.focus; -import android.util.InternalSelectionView; - import android.app.Activity; import android.os.Bundle; -import android.widget.LinearLayout; +import android.util.InternalSelectionView; import android.view.ViewGroup; +import android.widget.LinearLayout; /** * {@link android.view.FocusFinder#findNextFocus(android.view.ViewGroup, android.view.View, int)} diff --git a/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java b/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java index f6b0520fbadb..fe6d3c8393f1 100644 --- a/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java +++ b/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java @@ -16,13 +16,13 @@ package android.widget.focus; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.view.ViewGroup; import android.widget.Button; +import com.android.frameworks.coretests.R; + public class DescendantFocusability extends Activity { public ViewGroup beforeDescendants; diff --git a/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java b/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java index 2af42ac193c0..1c570df94f59 100644 --- a/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java +++ b/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java @@ -16,15 +16,14 @@ package android.widget.focus; -import android.widget.focus.DescendantFocusability; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.UiThreadTest; import android.test.TouchUtils; import android.view.ViewGroup; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class DescendantFocusabilityTest extends ActivityInstrumentationTestCase<DescendantFocusability> { private DescendantFocusability a; diff --git a/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java b/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java index b3d5ec5e5099..0cb80cebffc7 100644 --- a/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java +++ b/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java @@ -16,13 +16,13 @@ package android.widget.focus; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.widget.LinearLayout; -import android.widget.Button; import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; + +import com.android.frameworks.coretests.R; /** * Exercises cases where elements of the UI are removed (and diff --git a/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java b/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java index a1b7bcbf6487..6c46d08bc223 100644 --- a/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java +++ b/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java @@ -16,15 +16,15 @@ package android.widget.focus; -import android.widget.focus.FocusAfterRemoval; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.Button; -import android.widget.LinearLayout; import android.view.KeyEvent; import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; + +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; /** * {@link FocusAfterRemoval} is set up to exercise cases where the views that diff --git a/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java b/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java index 8f8f184a0c9c..26dc23398366 100644 --- a/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java +++ b/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java @@ -16,14 +16,13 @@ package android.widget.focus; -import android.widget.focus.AdjacentVerticalRectLists; -import android.util.InternalSelectionView; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; +import android.util.InternalSelectionView; import android.view.KeyEvent; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * {@link android.view.FocusFinder#findNextFocus(android.view.ViewGroup, android.view.View, int)} * and diff --git a/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java index dcbddefef870..b7974e38555a 100644 --- a/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java +++ b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java @@ -17,10 +17,10 @@ package android.widget.focus; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.view.View; -import android.widget.focus.GoneParentFocusedChild; + +import androidx.test.filters.MediumTest; /** * When a parent is GONE, key events shouldn't go to its children, even if they diff --git a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java index 11cac1e5b1ea..aab91194cfd7 100644 --- a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java +++ b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java @@ -17,12 +17,12 @@ package android.widget.focus; import android.app.Activity; -import android.widget.LinearLayout; -import android.widget.Button; -import android.widget.TextView; +import android.content.Context; import android.os.Bundle; import android.view.ViewGroup; -import android.content.Context; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; public class HorizontalFocusSearch extends Activity { diff --git a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java index 43986eed9b14..855a32192555 100644 --- a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java +++ b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java @@ -16,17 +16,16 @@ package android.widget.focus; -import android.widget.focus.HorizontalFocusSearch; +import static android.widget.focus.VerticalFocusSearchTest.FocusSearchAlg; +import static android.widget.focus.VerticalFocusSearchTest.NewFocusSearchAlg; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.LinearLayout; -import android.widget.Button; import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; -import static android.widget.focus.VerticalFocusSearchTest.FocusSearchAlg; -import static android.widget.focus.VerticalFocusSearchTest.NewFocusSearchAlg; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; /** * Tests that focus searching works on a horizontal linear layout of buttons of diff --git a/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java b/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java index acd632f3402b..ec234bc616df 100644 --- a/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java +++ b/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java @@ -21,6 +21,7 @@ import android.os.Bundle; import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; + import com.android.frameworks.coretests.R; public class LinearLayoutGrid extends Activity { diff --git a/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java b/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java index 89cb8bb6943e..c81317c003b4 100644 --- a/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java +++ b/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java @@ -17,11 +17,11 @@ package android.widget.focus; import android.test.SingleLaunchActivityTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.FocusFinder; import android.view.View; import android.view.ViewGroup; -import android.widget.focus.LinearLayoutGrid; + +import androidx.test.filters.MediumTest; /** * Tests focus searching between buttons within a grid that are touching, for example, diff --git a/core/tests/coretests/src/android/widget/focus/ListOfButtons.java b/core/tests/coretests/src/android/widget/focus/ListOfButtons.java index 308861d3d9df..5663ed2094f7 100644 --- a/core/tests/coretests/src/android/widget/focus/ListOfButtons.java +++ b/core/tests/coretests/src/android/widget/focus/ListOfButtons.java @@ -16,8 +16,6 @@ package android.widget.focus; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.content.Context; import android.os.Bundle; @@ -26,6 +24,8 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.Button; +import com.android.frameworks.coretests.R; + /** * A layout with a ListView containing buttons. */ diff --git a/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java b/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java index bec6f80ddbce..4cf4a3abeb68 100644 --- a/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java +++ b/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java @@ -16,17 +16,17 @@ package android.widget.focus; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.focus.ListOfButtons; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListAdapter; -import android.widget.Button; -import android.widget.ListView; import android.view.KeyEvent; import android.view.View; +import android.widget.Button; +import android.widget.ListAdapter; +import android.widget.ListView; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + +import com.android.frameworks.coretests.R; /** * Tests that focus works as expected when navigating into and out of diff --git a/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java b/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java index c2e7a26b5909..936c9999e7f8 100644 --- a/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java +++ b/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java @@ -21,7 +21,12 @@ import android.content.Context; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import android.widget.*; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.ListView; + import com.google.android.collect.Lists; import java.util.List; diff --git a/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java b/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java index 53b866c92ef8..73e4ea8f718d 100644 --- a/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java +++ b/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java @@ -19,11 +19,11 @@ package android.widget.focus; import android.app.Activity; import android.graphics.Point; import android.os.Bundle; +import android.util.InternalSelectionView; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ListView; -import android.util.InternalSelectionView; /** * A list of {@link InternalSelectionView}s paramatarized by the number of items, diff --git a/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java index b9082011f8b4..8accf21c2adc 100644 --- a/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java +++ b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java @@ -27,9 +27,10 @@ import android.widget.BaseAdapter; import android.widget.Button; import android.widget.TextView; -import com.google.android.collect.Lists; import com.android.frameworks.coretests.R; +import com.google.android.collect.Lists; + import java.util.List; public class ListWithFooterViewAndNewLabels extends ListActivity { diff --git a/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java index 57dbb78cbcfd..d0fcde5fd49c 100644 --- a/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java +++ b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java @@ -16,14 +16,13 @@ package android.widget.focus; -import android.widget.focus.ListWithFooterViewAndNewLabels; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; import android.widget.Button; import android.widget.ListAdapter; import android.widget.ListView; +import com.android.frameworks.coretests.R; + public class ListWithFooterViewAndNewLabelsTest extends ActivityInstrumentationTestCase<ListWithFooterViewAndNewLabels> { diff --git a/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java index 5c891f90bc2f..50a8614a1992 100644 --- a/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java +++ b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java @@ -16,19 +16,20 @@ package android.widget.focus; -import com.android.frameworks.coretests.R; -import com.google.android.collect.Lists; - import android.app.ListActivity; -import android.os.Bundle; -import android.widget.ArrayAdapter; -import android.widget.LinearLayout; -import android.widget.TextView; import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.LayoutInflater; import android.webkit.WebView; +import android.widget.ArrayAdapter; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.frameworks.coretests.R; + +import com.google.android.collect.Lists; import java.util.List; diff --git a/core/tests/coretests/src/android/widget/focus/RequestFocus.java b/core/tests/coretests/src/android/widget/focus/RequestFocus.java index 4daf0b4206b0..5042efd371e5 100644 --- a/core/tests/coretests/src/android/widget/focus/RequestFocus.java +++ b/core/tests/coretests/src/android/widget/focus/RequestFocus.java @@ -16,13 +16,13 @@ package android.widget.focus; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.os.Handler; import android.widget.Button; +import com.android.frameworks.coretests.R; + /** * Exercises cases where elements of the UI are requestFocus()ed. */ diff --git a/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java index cdfa21755344..bc770c502a2b 100644 --- a/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java +++ b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java @@ -21,16 +21,18 @@ import static org.mockito.Mockito.mock; import android.os.Handler; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.util.AndroidRuntimeException; import android.view.View; import android.view.View.OnFocusChangeListener; import android.view.ViewTreeObserver.OnGlobalFocusChangeListener; import android.widget.Button; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; + import org.mockito.InOrder; /** diff --git a/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java b/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java index 06cb75db28c2..e6e76ccc2caf 100644 --- a/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java +++ b/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java @@ -18,12 +18,12 @@ package android.widget.focus; import android.graphics.Rect; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.util.InternalSelectionView; import android.view.KeyEvent; import android.widget.ListView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; /** * TODO: extract base test case that launches {@link ListOfInternalSelectionViews} with diff --git a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java index 4a809e0cc881..2ca9f6da6404 100644 --- a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java +++ b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java @@ -17,13 +17,13 @@ package android.widget.focus; import android.app.Activity; +import android.content.Context; import android.os.Bundle; -import android.widget.LinearLayout; -import android.widget.Button; -import android.widget.TextView; import android.view.Gravity; import android.view.ViewGroup; -import android.content.Context; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; /** * Holds a few buttons of various sizes and horizontal placements in a diff --git a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java index f01422ebfc52..319756cc5876 100644 --- a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java +++ b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java @@ -16,17 +16,16 @@ package android.widget.focus; -import android.widget.focus.VerticalFocusSearch; - -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.Suppress; import android.view.FocusFinder; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; + /** * Tests that focus searching works on a vertical linear layout of buttons of * various widths and horizontal placements. diff --git a/core/tests/coretests/src/android/widget/gridview/GridDelete.java b/core/tests/coretests/src/android/widget/gridview/GridDelete.java index 57ae8f39fa09..b040f69545f1 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridDelete.java +++ b/core/tests/coretests/src/android/widget/gridview/GridDelete.java @@ -16,6 +16,7 @@ package android.widget.gridview; +import android.util.GridScenario; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -23,8 +24,6 @@ import android.widget.BaseAdapter; import android.widget.GridView; import android.widget.ListAdapter; -import android.util.GridScenario; - import java.util.ArrayList; /** diff --git a/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java b/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java index 21ca655390a7..5247009e693b 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java @@ -17,10 +17,9 @@ package android.widget.gridview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.GridView; -import android.widget.gridview.GridInHorizontal; +import androidx.test.filters.MediumTest; public class GridInHorizontalTest extends ActivityInstrumentationTestCase<GridInHorizontal> { diff --git a/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java b/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java index a674db25f708..290f70ee639b 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java @@ -17,10 +17,9 @@ package android.widget.gridview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.GridView; -import android.widget.gridview.GridInVertical; +import androidx.test.filters.MediumTest; public class GridInVerticalTest extends ActivityInstrumentationTestCase<GridInVertical> { diff --git a/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java b/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java index ecd4b1cbbad3..d2ae7cfc6b25 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java @@ -17,9 +17,10 @@ package android.widget.gridview; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.GridView; +import androidx.test.filters.MediumTest; + public class GridPaddingTest extends ActivityInstrumentationTestCase2<GridPadding> { private GridView mGridView; diff --git a/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java b/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java index 53eeb48212ce..466c55f8117c 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java @@ -19,12 +19,13 @@ package android.widget.gridview; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.AbsListView; import android.widget.GridView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class GridScrollListenerTest extends ActivityInstrumentationTestCase<GridScrollListener> implements AbsListView.OnScrollListener { private GridScrollListener mActivity; diff --git a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java index 0e362b69b057..db4f2dc224fc 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java @@ -16,13 +16,13 @@ package android.widget.gridview; -import android.util.GridScenario; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; +import android.util.GridScenario; import android.widget.GridView; +import androidx.test.filters.MediumTest; + public class GridSetSelectionBaseTest<T extends GridScenario> extends ActivityInstrumentationTestCase<T> { private T mActivity; private GridView mGridView; diff --git a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java index 67396451898c..17a60449e766 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java @@ -16,8 +16,6 @@ package android.widget.gridview; -import android.widget.gridview.GridSetSelectionMany; - public class GridSetSelectionManyTest extends GridSetSelectionBaseTest<GridSetSelectionMany> { public GridSetSelectionManyTest() { super(GridSetSelectionMany.class); diff --git a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java index 46922b97f6fd..a71f732c207f 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java @@ -16,8 +16,6 @@ package android.widget.gridview; -import android.widget.gridview.GridSetSelectionStackFromBottomMany; - public class GridSetSelectionStackFromBottomManyTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottomMany> { public GridSetSelectionStackFromBottomManyTest() { super(GridSetSelectionStackFromBottomMany.class); diff --git a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java index 67dd6f10a86e..4e6e8aa58912 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java @@ -16,8 +16,6 @@ package android.widget.gridview; -import android.widget.gridview.GridSetSelectionStackFromBottom; - public class GridSetSelectionStackFromBottomTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottom> { public GridSetSelectionStackFromBottomTest() { super(GridSetSelectionStackFromBottom.class); diff --git a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java index 2127b3cd4f1a..68802fe22f95 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java @@ -16,8 +16,6 @@ package android.widget.gridview; -import android.widget.gridview.GridSetSelection; - public class GridSetSelectionTest extends GridSetSelectionBaseTest<GridSetSelection> { public GridSetSelectionTest() { super(GridSetSelection.class); diff --git a/core/tests/coretests/src/android/widget/gridview/GridSimple.java b/core/tests/coretests/src/android/widget/gridview/GridSimple.java index 7c2c696f2b56..67bb7511122a 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSimple.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSimple.java @@ -18,12 +18,11 @@ package android.widget.gridview; import android.graphics.drawable.PaintDrawable; import android.os.Bundle; +import android.util.GridScenario; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import android.util.GridScenario; - public class GridSimple extends GridScenario { @Override protected void init(Params params) { diff --git a/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java b/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java index 3b2504ebe3be..0f67522894cc 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java @@ -17,10 +17,9 @@ package android.widget.gridview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.GridView; -import android.widget.gridview.GridSingleColumn; +import androidx.test.filters.MediumTest; public class GridSingleColumnTest extends ActivityInstrumentationTestCase<GridSingleColumn> { private GridSingleColumn mActivity; diff --git a/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java index 640737ec1c85..a3696164526e 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java @@ -16,11 +16,10 @@ package android.widget.gridview; -import android.widget.gridview.GridStackFromBottomMany; - -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.GridView; import android.test.ActivityInstrumentationTestCase; +import android.widget.GridView; + +import androidx.test.filters.MediumTest; public class GridStackFromBottomManyTest extends ActivityInstrumentationTestCase<GridStackFromBottomMany> { private GridStackFromBottomMany mActivity; diff --git a/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java index 8fec241dd304..da1b6384d212 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java +++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java @@ -16,12 +16,11 @@ package android.widget.gridview; -import android.widget.gridview.GridStackFromBottom; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.GridView; +import androidx.test.filters.MediumTest; + public class GridStackFromBottomTest extends ActivityInstrumentationTestCase<GridStackFromBottom> { private GridStackFromBottom mActivity; private GridView mGridView; diff --git a/core/tests/coretests/src/android/widget/gridview/GridThrasher.java b/core/tests/coretests/src/android/widget/gridview/GridThrasher.java index ad89bb6ab90c..34c19c37b702 100644 --- a/core/tests/coretests/src/android/widget/gridview/GridThrasher.java +++ b/core/tests/coretests/src/android/widget/gridview/GridThrasher.java @@ -16,20 +16,20 @@ package android.widget.gridview; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.Handler; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.LayoutInflater; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.GridView; import android.widget.TextView; +import com.android.frameworks.coretests.R; + import java.util.Random; /** diff --git a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java index ca789aff672e..ab5fcfaf29ad 100644 --- a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java +++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java @@ -17,14 +17,14 @@ package android.widget.gridview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.View; import android.widget.GridView; - import android.widget.gridview.GridSimple; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * Tests setting the selection in touch mode */ diff --git a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java index 9a8d3074890b..e312873d4ae1 100644 --- a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java +++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java @@ -16,14 +16,14 @@ package android.widget.gridview.touch; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; +import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; +import android.view.View; +import android.widget.GridView; import android.widget.gridview.GridStackFromBottomMany; -import android.widget.GridView; -import android.view.View; -import android.test.ActivityInstrumentationTestCase; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; public class GridTouchStackFromBottomManyTest extends ActivityInstrumentationTestCase<GridStackFromBottomMany> { private GridStackFromBottomMany mActivity; diff --git a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java index d8d4e435d2c7..c98c10a603f4 100644 --- a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java +++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java @@ -16,13 +16,13 @@ package android.widget.gridview.touch; -import android.widget.gridview.GridStackFromBottom; -import android.test.TouchUtils; -import android.test.suitebuilder.annotation.MediumTest; - import android.test.ActivityInstrumentationTestCase; -import android.widget.GridView; +import android.test.TouchUtils; import android.view.View; +import android.widget.GridView; +import android.widget.gridview.GridStackFromBottom; + +import androidx.test.filters.MediumTest; public class GridTouchStackFromBottomTest extends ActivityInstrumentationTestCase<GridStackFromBottom> { private GridStackFromBottom mActivity; diff --git a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java index 55a66d9c2af2..0d3092cbc2f3 100644 --- a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java +++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java @@ -18,16 +18,16 @@ package android.widget.gridview.touch; import android.content.Context; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.Gravity; import android.view.View; import android.view.ViewConfiguration; import android.widget.GridView; - import android.widget.gridview.GridVerticalSpacingStackFromBottom; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrumentationTestCase<GridVerticalSpacingStackFromBottom> { private GridVerticalSpacingStackFromBottom mActivity; private GridView mGridView; diff --git a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java index bae4ee7293e6..e831e62be179 100644 --- a/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java +++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java @@ -17,16 +17,16 @@ package android.widget.gridview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.Gravity; import android.view.View; import android.view.ViewConfiguration; import android.widget.GridView; - import android.widget.gridview.GridVerticalSpacing; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCase<GridVerticalSpacing> { private GridVerticalSpacing mActivity; private GridView mGridView; diff --git a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java index 9791e36f038d..d159be865372 100644 --- a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java +++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java @@ -16,11 +16,10 @@ package android.widget.layout.frame; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class FrameLayoutGravity extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java index fe4e93286bc5..0cab660f68d6 100644 --- a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java +++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java @@ -16,12 +16,13 @@ package android.widget.layout.frame; +import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; -import android.app.Activity; import android.view.View; -import android.widget.layout.frame.FrameLayoutGravity; + +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; public class FrameLayoutGravityTest extends ActivityInstrumentationTestCase<FrameLayoutGravity> { diff --git a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java index 81b3ea13fc6b..8c54557819d0 100644 --- a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java +++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java @@ -16,11 +16,10 @@ package android.widget.layout.frame; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class FrameLayoutMargin extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java index c052d659c0f2..4973078f9752 100644 --- a/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java +++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java @@ -16,13 +16,14 @@ package android.widget.layout.frame; +import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; -import android.app.Activity; import android.view.View; import android.view.ViewGroup; -import android.widget.layout.frame.FrameLayoutMargin; + +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; public class FrameLayoutMarginTest extends ActivityInstrumentationTestCase<FrameLayoutMargin> { diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java index 766dd0a76366..79a34e5d1f5e 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java @@ -16,11 +16,10 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class BaselineAlignmentCenterGravity extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java index 079e9d079ee5..60b7c2f5e8df 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java @@ -18,13 +18,13 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; import android.view.View; import android.widget.Button; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; -import android.widget.layout.linear.BaselineAlignmentCenterGravity; public class BaselineAlignmentCenterGravityTest extends ActivityInstrumentationTestCase<BaselineAlignmentCenterGravity> { private Button mButton1; diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java index c3bfe3a30ee8..a429b758d748 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java @@ -18,12 +18,12 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; import android.view.View; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; -import android.widget.layout.linear.HorizontalOrientationVerticalAlignment; public class BaselineAlignmentSpinnerButton extends ActivityInstrumentationTestCase<HorizontalOrientationVerticalAlignment> { private View mSpinner; diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java index 5ed5e71d65a7..f33feb0c91a8 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java @@ -16,12 +16,12 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.view.View; +import com.android.frameworks.coretests.R; + public class BaselineAlignmentZeroWidthAndWeight extends Activity { @Override protected void onCreate(Bundle icicle) { diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java index 2dd2bb8aa382..443b0f7d6ef0 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java @@ -16,16 +16,15 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; -import android.widget.layout.linear.BaselineAlignmentZeroWidthAndWeight; -import android.widget.layout.linear.ExceptionTextView; - import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + public class BaselineAlignmentZeroWidthAndWeightTest extends ActivityInstrumentationTestCase<BaselineAlignmentZeroWidthAndWeight> { private Button mShowButton; diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java index c9ad83174e63..9d9131675004 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java @@ -16,11 +16,10 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class BaselineButtons extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java index 6f1fc90c001b..ac3c5d8de53c 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java @@ -18,12 +18,12 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; import android.widget.ImageButton; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; -import android.widget.layout.linear.BaselineButtons; public class BaselineButtonsTest extends ActivityInstrumentationTestCase<BaselineButtons> { private View mCurrentTime; diff --git a/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java b/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java index 6129b5b4c7e9..c68450188456 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java +++ b/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java @@ -21,7 +21,6 @@ import android.text.BoringLayout; import android.util.AttributeSet; import android.widget.EditText; - /** * A special EditText that sets {@link #isFailed()} to true as its internal makeNewLayout() method is called * with a width lower than 0. This is used to fail the unit test in diff --git a/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java b/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java index 50aa5b721eca..c8a5f3451d17 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java +++ b/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java @@ -16,12 +16,12 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.widget.TextView; +import com.android.frameworks.coretests.R; + public class FillInWrap extends Activity { @Override protected void onCreate(Bundle icicle) { diff --git a/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java b/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java index f16180248a5e..0e69efc1349e 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java @@ -18,9 +18,10 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; public class FillInWrapTest extends ActivityInstrumentationTestCase<FillInWrap> { diff --git a/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java b/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java index 9f937a97b5a6..255f7b37dba6 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java +++ b/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java @@ -16,11 +16,10 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class HorizontalOrientationVerticalAlignment extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java b/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java index 83331caa6069..a0745dd1aa45 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java +++ b/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java @@ -16,14 +16,14 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; +import com.android.frameworks.coretests.R; + public class LLEditTextThenButton extends Activity { private EditText mEditText; private Button mButton; diff --git a/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java index ab2f060eafc2..115306225e75 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java +++ b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java @@ -18,10 +18,10 @@ package android.widget.layout.linear; import android.app.Activity; import android.os.Bundle; -import android.os.RemoteException; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; + import com.android.frameworks.coretests.R; /** diff --git a/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java index 77f564db0ef6..0aca699e3c83 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java +++ b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java @@ -22,5 +22,4 @@ package android.widget.layout.linear; */ public class LLOfButtons2 extends LLOfButtons1 { - } diff --git a/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java index 90db788e45eb..5d372450f5ac 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java +++ b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java @@ -16,11 +16,11 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class LinearLayoutEditTexts extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java index d5998b7c954d..966ed6dab8b9 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java @@ -16,13 +16,13 @@ package android.widget.layout.linear; -import android.widget.layout.linear.LinearLayoutEditTexts; -import com.android.frameworks.coretests.R; - +import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; -import android.app.Activity; + +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; public class LinearLayoutEditTextsTest extends ActivityInstrumentationTestCase<LinearLayoutEditTexts> { private View mChild; diff --git a/core/tests/coretests/src/android/widget/layout/linear/Weight.java b/core/tests/coretests/src/android/widget/layout/linear/Weight.java index 20edd7c7e31d..3722a14f86fe 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/Weight.java +++ b/core/tests/coretests/src/android/widget/layout/linear/Weight.java @@ -16,11 +16,11 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + public class Weight extends Activity { @Override protected void onCreate(Bundle icicle) { diff --git a/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java b/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java index 2e421daeaf1c..144600beddf6 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java +++ b/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java @@ -16,11 +16,10 @@ package android.widget.layout.linear; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; -import android.view.View; + +import com.android.frameworks.coretests.R; public class WeightSum extends Activity { @Override diff --git a/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java b/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java index f9a94cedd4a2..1d07db236436 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java @@ -18,11 +18,11 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; -import android.widget.layout.linear.WeightSum; public class WeightSumTest extends ActivityInstrumentationTestCase<WeightSum> { private View mChild; diff --git a/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java b/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java index 1c42e7ccb9be..db524958db47 100644 --- a/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java +++ b/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java @@ -18,13 +18,13 @@ package android.widget.layout.linear; import android.app.Activity; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; -import android.test.suitebuilder.annotation.Suppress; import android.view.View; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + import com.android.frameworks.coretests.R; -import android.widget.layout.linear.Weight; @Suppress // Failing. public class WeightTest extends ActivityInstrumentationTestCase<Weight> { diff --git a/core/tests/coretests/src/android/widget/layout/table/AddColumn.java b/core/tests/coretests/src/android/widget/layout/table/AddColumn.java index 400c32c0fed5..b407941b411c 100644 --- a/core/tests/coretests/src/android/widget/layout/table/AddColumn.java +++ b/core/tests/coretests/src/android/widget/layout/table/AddColumn.java @@ -16,8 +16,6 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; import android.view.View; @@ -26,6 +24,8 @@ import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; +import com.android.frameworks.coretests.R; + /** * This test adds an extra row with an extra column in the table. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java b/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java index bfb4d172f6c3..08ae0301da13 100644 --- a/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java @@ -16,16 +16,16 @@ package android.widget.layout.table; -import android.widget.layout.table.AddColumn; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; import android.widget.TableLayout; import android.widget.TableRow; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.AddColumn} is * setup to exercise the case of adding row programmatically in a table. diff --git a/core/tests/coretests/src/android/widget/layout/table/CellSpan.java b/core/tests/coretests/src/android/widget/layout/table/CellSpan.java index d91cf56eba2e..3102ac1f109d 100644 --- a/core/tests/coretests/src/android/widget/layout/table/CellSpan.java +++ b/core/tests/coretests/src/android/widget/layout/table/CellSpan.java @@ -16,11 +16,11 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + /** * Exercise table layout with cells spanning. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java b/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java index 331ec4575395..aa8e66cb0c67 100644 --- a/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java @@ -16,13 +16,13 @@ package android.widget.layout.table; -import android.widget.layout.table.CellSpan; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.CellSpan} is * setup to exercise tables in which cells use spanning. diff --git a/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java b/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java index 435815a40d06..c587f74e97f2 100644 --- a/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java +++ b/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java @@ -16,11 +16,11 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + /** * Exercise table layout with cells having a fixed width and height. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java b/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java index b20ec84ba8aa..7d02453d4e54 100644 --- a/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java @@ -16,13 +16,13 @@ package android.widget.layout.table; -import android.widget.layout.table.FixedWidth; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.FixedWidth} is * setup to exercise tables in which cells use fixed width and height. diff --git a/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java index 1444f60f4aa9..6f5148be98b7 100644 --- a/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java +++ b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java @@ -16,11 +16,11 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + /** * Exercise table layout with cells using a horizontal gravity. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java index 964df823fd55..73e8334e5224 100644 --- a/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java @@ -16,14 +16,14 @@ package android.widget.layout.table; -import android.widget.layout.table.HorizontalGravity; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; import android.view.View; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.HorizontalGravity} is * setup to exercise tables in which cells use horizontal gravity. diff --git a/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java b/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java index 4fdb37894cb8..9055b329a2a6 100644 --- a/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java +++ b/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java @@ -16,11 +16,11 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + /** * Exercise table layout with cells using a vertical gravity. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java b/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java index 1d6be3f01c79..f14fa1c2d7da 100644 --- a/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java @@ -16,15 +16,15 @@ package android.widget.layout.table; -import android.widget.layout.table.VerticalGravity; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.test.ViewAsserts; import android.view.View; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.VerticalGravity} is * setup to exercise tables in which cells use vertical gravity. diff --git a/core/tests/coretests/src/android/widget/layout/table/Weight.java b/core/tests/coretests/src/android/widget/layout/table/Weight.java index 6d4d51d93a8f..5c0824769d7a 100644 --- a/core/tests/coretests/src/android/widget/layout/table/Weight.java +++ b/core/tests/coretests/src/android/widget/layout/table/Weight.java @@ -16,11 +16,11 @@ package android.widget.layout.table; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import com.android.frameworks.coretests.R; + /** * Exercise table layout with cells having a weight. */ diff --git a/core/tests/coretests/src/android/widget/layout/table/WeightTest.java b/core/tests/coretests/src/android/widget/layout/table/WeightTest.java index b6655735d38c..fcf3de20e1d8 100644 --- a/core/tests/coretests/src/android/widget/layout/table/WeightTest.java +++ b/core/tests/coretests/src/android/widget/layout/table/WeightTest.java @@ -16,13 +16,13 @@ package android.widget.layout.table; -import android.widget.layout.table.Weight; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + /** * {@link android.widget.layout.table.Weight} is * setup to exercise tables in which cells use a weight. diff --git a/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java index a386ebd3d941..cd76d70acdaf 100644 --- a/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java +++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java @@ -16,8 +16,6 @@ package android.widget.listview; -import android.view.Gravity; - import android.util.ListScenario; /** diff --git a/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java index 519816c731a5..e048e3eb98a0 100644 --- a/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java +++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java @@ -16,8 +16,6 @@ package android.widget.listview; -import android.view.Gravity; - import android.util.ListScenario; /** diff --git a/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java index e1171eb0982e..bd8dbe43947b 100644 --- a/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java @@ -17,10 +17,9 @@ package android.widget.listview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.ListView; -import android.widget.listview.ListBottomGravityMany; +import androidx.test.filters.MediumTest; public class ListBottomGravityManyTest extends ActivityInstrumentationTestCase<ListBottomGravityMany> { private ListBottomGravityMany mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java index c595f62bd858..8da7358c04f6 100644 --- a/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java @@ -17,10 +17,9 @@ package android.widget.listview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.ListView; -import android.widget.listview.ListBottomGravity; +import androidx.test.filters.MediumTest; public class ListBottomGravityTest extends ActivityInstrumentationTestCase<ListBottomGravity> { private ListBottomGravity mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java b/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java index bbed73c65af2..86407411c2d0 100644 --- a/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java +++ b/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java @@ -16,10 +16,10 @@ package android.widget.listview; -import android.util.ListItemFactory; import static android.util.ListItemFactory.Slot; -import android.util.ListScenario; +import android.util.ListItemFactory; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; import android.widget.Button; diff --git a/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java b/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java index 258d3efc0c01..81d71a91edc3 100644 --- a/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java @@ -19,12 +19,13 @@ package android.widget.listview; import android.app.Instrumentation; import android.content.Intent; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class ListEmptyViewTest extends ActivityInstrumentationTestCase<ListWithEmptyView> { private ListWithEmptyView mActivity; private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/ListFilter.java b/core/tests/coretests/src/android/widget/listview/ListFilter.java index c2ac90e7c47c..1cda71714ca5 100644 --- a/core/tests/coretests/src/android/widget/listview/ListFilter.java +++ b/core/tests/coretests/src/android/widget/listview/ListFilter.java @@ -25,7 +25,6 @@ import android.widget.Button; import com.android.frameworks.coretests.R; - /** * Tests hiding and showing the list filter by hiding and showing an ancestor of the * ListView diff --git a/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java b/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java index bf18a13dc4f1..10b4a79f40aa 100644 --- a/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java @@ -17,10 +17,11 @@ package android.widget.listview; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListView; -import android.widget.ListAdapter; import android.widget.ArrayAdapter; +import android.widget.ListAdapter; +import android.widget.ListView; + +import androidx.test.filters.MediumTest; public class ListFocusableTest extends ActivityInstrumentationTestCase<ListTopGravity> { private ListTopGravity mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListGetCheckItemIdsTest.java b/core/tests/coretests/src/android/widget/listview/ListGetCheckItemIdsTest.java index 33d61a093ad4..c691ed753301 100644 --- a/core/tests/coretests/src/android/widget/listview/ListGetCheckItemIdsTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListGetCheckItemIdsTest.java @@ -17,10 +17,11 @@ package android.widget.listview; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.ListView; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; + import java.util.Arrays; /** diff --git a/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java b/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java index 1f59c30f20b8..74eda3b850b9 100644 --- a/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java +++ b/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java @@ -16,11 +16,10 @@ package android.widget.listview; -import android.view.View; -import android.view.ViewGroup; - import android.util.ListItemFactory; import android.util.ListScenario; +import android.view.View; +import android.view.ViewGroup; /** * List that has different view types diff --git a/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java b/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java index 01b39db92a7d..dbd58d7363a8 100644 --- a/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java @@ -18,12 +18,11 @@ package android.widget.listview; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.ListView; -import android.widget.listview.ListHeterogeneous; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; public class ListHeterogeneousTest extends ActivityInstrumentationTestCase<ListHeterogeneous> { private ListHeterogeneous mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java b/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java index 2ff65de9d523..e98de9c1204c 100644 --- a/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java +++ b/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java @@ -16,11 +16,11 @@ package android.widget.listview; -import android.util.ListItemFactory; import static android.util.ListItemFactory.Slot; -import android.util.ListScenario; import android.content.Context; +import android.util.ListItemFactory; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; import android.widget.Button; diff --git a/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java b/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java index a373a5b19be3..6622c0d21eb2 100644 --- a/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java +++ b/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java @@ -18,10 +18,7 @@ package android.widget.listview; import android.app.Activity; import android.os.Bundle; -import android.os.Handler; import android.widget.ArrayAdapter; -import android.widget.GridView; -import android.widget.TextView; import android.widget.ListView; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java b/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java index 3643f794effd..d8508ecafee5 100644 --- a/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java @@ -16,8 +16,6 @@ package android.widget.listview; -import android.widget.listview.ListInHorizontal; - public class ListInHorizontalTest extends ListUnspecifiedMeasure<ListInHorizontal> { public ListInHorizontalTest() { super(ListInHorizontal.class); diff --git a/core/tests/coretests/src/android/widget/listview/ListInVertical.java b/core/tests/coretests/src/android/widget/listview/ListInVertical.java index 3b4885a9589d..4ecf25d6a818 100644 --- a/core/tests/coretests/src/android/widget/listview/ListInVertical.java +++ b/core/tests/coretests/src/android/widget/listview/ListInVertical.java @@ -18,10 +18,7 @@ package android.widget.listview; import android.app.Activity; import android.os.Bundle; -import android.os.Handler; import android.widget.ArrayAdapter; -import android.widget.GridView; -import android.widget.TextView; import android.widget.ListView; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java b/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java index 85864294573f..5e385a33b057 100644 --- a/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java @@ -16,8 +16,6 @@ package android.widget.listview; -import android.widget.listview.ListInVertical; - public class ListInVerticalTest extends ListUnspecifiedMeasure<ListInVertical> { public ListInVerticalTest() { super(ListInVertical.class); diff --git a/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java b/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java index d5da28e75c4a..0ec7a2431b93 100644 --- a/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java +++ b/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java @@ -16,13 +16,14 @@ package android.widget.listview; +import android.util.ListItemFactory; +import android.util.ListScenario; import android.view.View; - import android.view.ViewGroup; - import com.google.android.collect.Sets; - import android.util.ListScenario; - import android.util.ListItemFactory; +import android.view.ViewGroup; - import java.util.Set; +import com.google.android.collect.Sets; + +import java.util.Set; /** * List that interleaves focusable items. diff --git a/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java index f7c01b1ea975..3159e53eabc5 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java @@ -16,12 +16,10 @@ package android.widget.listview; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.TextView; import android.util.ListItemFactory; import android.util.ListScenario; +import android.view.View; +import android.view.ViewGroup; /** * A list where the items may befocusable, but the second item isn't actually focusabe. diff --git a/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java index b529b2e7b0e8..861e2a919052 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java @@ -16,8 +16,8 @@ package android.widget.listview; -import android.util.ListScenario; import android.util.ListItemFactory; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; diff --git a/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java index 59987ec4702b..e9c9c1dd586c 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java @@ -16,10 +16,10 @@ package android.widget.listview; -import android.view.View; -import android.view.ViewGroup; import android.util.ListItemFactory; import android.util.ListScenario; +import android.view.View; +import android.view.ViewGroup; /** * A list where each item is tall with buttons that are farther apart than the screen diff --git a/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java b/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java index ea2c5f2caf13..2a0e013be616 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java @@ -17,13 +17,13 @@ package android.widget.listview; import android.content.Context; +import android.util.InternalSelectionView; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import android.util.InternalSelectionView; -import android.util.ListScenario; /** * Each item is an internal selection view, a button, and some filler diff --git a/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java b/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java index 73eb0a8f8e63..91ff06b3f670 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java @@ -18,13 +18,13 @@ package android.widget.listview; import android.graphics.Rect; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; -import android.view.View; import android.view.KeyEvent; +import android.view.View; import android.widget.ListView; -import android.widget.listview.ListOfThinItems; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; public class ListItemRequestRectAboveThinFirstItemTest extends ActivityInstrumentationTestCase<ListOfThinItems> { diff --git a/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java b/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java index a5fe17ac7603..d80fd90de53e 100644 --- a/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java +++ b/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java @@ -17,13 +17,12 @@ package android.widget.listview; import android.content.Context; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.TextView; -import android.util.ListScenario; - /** * A list where each item expands by 1.5 when selected. */ diff --git a/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java b/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java index 12b5ef4067ed..54f302c8178c 100644 --- a/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java +++ b/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java @@ -20,14 +20,13 @@ import android.app.ListActivity; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; -import android.provider.Settings; import android.provider.Contacts.People; +import android.provider.Settings; import android.view.View; import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; import android.widget.ListAdapter; import android.widget.SimpleCursorAdapter; -import android.widget.AdapterView.OnItemClickListener; - public class ListManagedCursor extends ListActivity implements OnItemClickListener { diff --git a/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java b/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java index bc3776cfb02e..8e0b6fe7ef55 100644 --- a/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java @@ -18,11 +18,12 @@ package android.widget.listview; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; +import android.test.TouchUtils; import android.view.KeyEvent; import android.widget.ListView; -import android.test.TouchUtils; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; /** * Tests restoring the scroll position in a list with a managed cursor. diff --git a/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java b/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java index 919ef69fc8a2..70b9081128a0 100644 --- a/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java +++ b/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java @@ -16,12 +16,11 @@ package android.widget.listview; +import android.util.ListScenario; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.util.ListScenario; - /** * Each list item has two focusables that are close enough together that * it shouldn't require panning to move focus. diff --git a/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java b/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java index 76814fb480cd..075712efe64a 100644 --- a/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java +++ b/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java @@ -18,11 +18,11 @@ package android.widget.listview; import android.app.Activity; import android.os.Bundle; +import android.view.View; +import android.view.ViewDebug; import android.widget.ArrayAdapter; -import android.widget.ListView; import android.widget.ImageButton; -import android.view.ViewDebug; -import android.view.View; +import android.widget.ListView; import com.android.frameworks.coretests.R; diff --git a/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java b/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java index 896bd19d311f..be14de8986d8 100644 --- a/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java @@ -16,12 +16,11 @@ package android.widget.listview; -import android.widget.listview.ListItemFocusablesClose; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; +import androidx.test.filters.MediumTest; + public class ListRetainsFocusAcrossLayoutsTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> { public ListRetainsFocusAcrossLayoutsTest() { diff --git a/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java b/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java index 7b29a66c22fa..28addd6431ae 100644 --- a/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java @@ -19,12 +19,13 @@ package android.widget.listview; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.AbsListView; import android.widget.ListView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class ListScrollListenerTest extends ActivityInstrumentationTestCase<ListScrollListener> implements AbsListView.OnScrollListener { private ListScrollListener mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListSetSelection.java b/core/tests/coretests/src/android/widget/listview/ListSetSelection.java index 6c2e26401eed..af8e899a867a 100644 --- a/core/tests/coretests/src/android/widget/listview/ListSetSelection.java +++ b/core/tests/coretests/src/android/widget/listview/ListSetSelection.java @@ -16,12 +16,12 @@ package android.widget.listview; +import android.os.Bundle; import android.util.ListScenario; import android.view.KeyEvent; import android.view.View; -import android.os.Bundle; -import android.widget.LinearLayout; import android.widget.Button; +import android.widget.LinearLayout; /** * List of 1,000 items used to test calls to setSelection() in touch mode. diff --git a/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java b/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java index 4cef16470609..2caca1309d0c 100644 --- a/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java @@ -17,10 +17,11 @@ package android.widget.listview; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.ListView; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; + /** * Basic tests of setting & clearing the selection */ diff --git a/core/tests/coretests/src/android/widget/listview/ListSimple.java b/core/tests/coretests/src/android/widget/listview/ListSimple.java index 6accae1c3ef1..f53638eb8ff1 100644 --- a/core/tests/coretests/src/android/widget/listview/ListSimple.java +++ b/core/tests/coretests/src/android/widget/listview/ListSimple.java @@ -16,11 +16,10 @@ package android.widget.listview; +import android.os.Bundle; import android.util.ListScenario; - import android.view.View; import android.view.ViewGroup; -import android.os.Bundle; import android.widget.TextView; public class ListSimple extends ListScenario { diff --git a/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java b/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java index 95f09f6e78bc..c4e9fe941b72 100644 --- a/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java +++ b/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java @@ -16,17 +16,17 @@ package android.widget.listview; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.content.Context; import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.LayoutInflater; import android.widget.BaseAdapter; import android.widget.TextView; +import com.android.frameworks.coretests.R; + /** * Exercises moving focus into the list from the side */ diff --git a/core/tests/coretests/src/android/widget/listview/ListThrasher.java b/core/tests/coretests/src/android/widget/listview/ListThrasher.java index 0237a9551ce5..d82f68d11c92 100644 --- a/core/tests/coretests/src/android/widget/listview/ListThrasher.java +++ b/core/tests/coretests/src/android/widget/listview/ListThrasher.java @@ -16,19 +16,19 @@ package android.widget.listview; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.content.Context; import android.os.Bundle; import android.os.Handler; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.LayoutInflater; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.TextView; +import com.android.frameworks.coretests.R; + import java.util.Random; /** diff --git a/core/tests/coretests/src/android/widget/listview/ListTopGravity.java b/core/tests/coretests/src/android/widget/listview/ListTopGravity.java index 986cc5713db0..31339e9ee9c2 100644 --- a/core/tests/coretests/src/android/widget/listview/ListTopGravity.java +++ b/core/tests/coretests/src/android/widget/listview/ListTopGravity.java @@ -16,8 +16,6 @@ package android.widget.listview; -import android.view.Gravity; - import android.util.ListScenario; /** diff --git a/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java b/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java index 199d069e16ef..0fc87ea063ed 100644 --- a/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java +++ b/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java @@ -16,13 +16,14 @@ package android.widget.listview; -import com.android.frameworks.coretests.R; - -import android.test.ActivityInstrumentationTestCase; import android.app.Activity; -import android.test.suitebuilder.annotation.MediumTest; +import android.test.ActivityInstrumentationTestCase; import android.widget.ListView; +import androidx.test.filters.MediumTest; + +import com.android.frameworks.coretests.R; + public class ListUnspecifiedMeasure<T extends Activity> extends ActivityInstrumentationTestCase<T> { private T mActivity; private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java b/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java index 5ab2757deae7..63941f1c967d 100644 --- a/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java +++ b/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java @@ -18,12 +18,12 @@ package android.widget.listview; import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.Button; import android.widget.ListView; +import androidx.test.filters.MediumTest; + import com.android.frameworks.coretests.R; -import android.widget.listview.ListViewHeight; public class ListViewHeightTest extends ActivityInstrumentationTestCase<ListViewHeight> { private ListViewHeight mActivity; diff --git a/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java b/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java index 348ea1b75578..10ba8b73cd02 100644 --- a/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java +++ b/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java @@ -16,8 +16,6 @@ package android.widget.listview; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.database.Cursor; import android.os.Bundle; @@ -32,6 +30,8 @@ import android.widget.ListView; import android.widget.SimpleCursorAdapter; import android.widget.Toast; +import com.android.frameworks.coretests.R; + /** * See 1080989. You need some contacts for this adapter. */ diff --git a/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java b/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java index 74dd06c1ba71..52273fdc98a0 100644 --- a/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java +++ b/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java @@ -16,8 +16,6 @@ package android.widget.listview; -import com.android.frameworks.coretests.R; - import android.app.ListActivity; import android.content.Context; import android.os.Bundle; @@ -26,6 +24,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.ArrayAdapter; +import com.android.frameworks.coretests.R; + /** * Tests using an empty view with a list */ diff --git a/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java b/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java index aea091ae9cf3..6030582a2445 100644 --- a/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java +++ b/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java @@ -16,9 +16,8 @@ package android.widget.listview; -import android.util.ListScenario; - import android.os.Bundle; +import android.util.ListScenario; import android.widget.Button; import android.widget.ListAdapter; import android.widget.ListView; diff --git a/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java b/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java index 26e1d5d88e1e..13e770cd4e47 100644 --- a/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java +++ b/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java @@ -16,8 +16,8 @@ package android.widget.listview; -import android.widget.TextView; import android.util.ListScenario; +import android.widget.TextView; /** * The header text view echos the value of the selected item by using (indirectly) diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java index ec8ab7e77357..22c28c29b322 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java @@ -17,13 +17,14 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; import android.util.ListUtil; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.listview.ListInterleaveFocusables; +import androidx.test.filters.MediumTest; + public class ListInterleaveFocusablesTest extends ActivityInstrumentationTestCase2<ListInterleaveFocusables> { private ListView mListView; private ListUtil mListUtil; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java index 82f48801111e..c645b7c5b767 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java @@ -17,11 +17,12 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListView; import android.view.KeyEvent; +import android.widget.ListView; import android.widget.listview.ListItemFocusableAboveUnfocusable; +import androidx.test.filters.MediumTest; + public class ListItemFocusableAboveUnfocusableTest extends ActivityInstrumentationTestCase<ListItemFocusableAboveUnfocusable> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java index 3b30ebe766cb..c7525b33d6de 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java @@ -17,12 +17,13 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.listview.ListItemFocusablesClose; +import androidx.test.filters.MediumTest; + public class ListItemFocusablesCloseTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> { private ListView mListView; private int mListTop; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java index 475930df37e3..4bb2206984da 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java @@ -17,7 +17,6 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -25,6 +24,8 @@ import android.widget.Button; import android.widget.ListView; import android.widget.listview.ListItemFocusablesFarApart; +import androidx.test.filters.MediumTest; + public class ListItemFocusablesFarApartTest extends ActivityInstrumentationTestCase<ListItemFocusablesFarApart> { private ListView mListView; private int mListTop; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java index 91a1eba124de..76052914e027 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java @@ -17,13 +17,14 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.ListView; import android.view.KeyEvent; +import android.widget.ListView; import android.widget.listview.ListItemsExpandOnSelection; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListItemsExpandOnSelectionTest extends ActivityInstrumentationTestCase<ListItemsExpandOnSelection> { private ListView mListView; private int mListTop; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java index 5bc121a907ae..fdae4833532a 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java @@ -17,12 +17,13 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListView; -import android.view.View; import android.view.KeyEvent; +import android.view.View; +import android.widget.ListView; import android.widget.listview.ListLastItemPartiallyVisible; +import androidx.test.filters.MediumTest; + public class ListLastItemPartiallyVisibleTest extends ActivityInstrumentationTestCase<ListLastItemPartiallyVisible> { private ListView mListView; private int mListBottom; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java index bda71d0d3fe6..d44b130164f2 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java @@ -17,14 +17,15 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.TextView; import android.widget.listview.ListOfItemsShorterThanScreen; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListOfItemsShorterThanScreenTest extends ActivityInstrumentationTestCase<ListOfItemsShorterThanScreen> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java index 213544526170..1decdadd7fb8 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java @@ -17,13 +17,14 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.listview.ListOfItemsTallerThanScreen; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListOfItemsTallerThanScreenTest extends ActivityInstrumentationTestCase2<ListOfItemsTallerThanScreen> { diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java index ef70b5ae46a5..67808f1945f9 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java @@ -17,13 +17,14 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.ListUtil; import android.view.KeyEvent; import android.widget.ListView; import android.widget.listview.ListOfShortShortTallShortShort; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListOfShortShortTallShortShortTest extends ActivityInstrumentationTestCase2<ListOfShortShortTallShortShort> { private ListView mListView; private ListUtil mListUtil; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java index c958591e8c2e..f9aa6dc13b6c 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java @@ -17,11 +17,12 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListView; import android.view.KeyEvent; +import android.widget.ListView; import android.widget.listview.ListOfShortTallShort; +import androidx.test.filters.MediumTest; + public class ListOfShortTallShortTest extends ActivityInstrumentationTestCase<ListOfShortTallShort> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java index c191d71aaf6e..6bd1cb5557a6 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java @@ -17,14 +17,15 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.listview.ListOfThinItems; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListOfThinItemsTest extends ActivityInstrumentationTestCase<ListOfThinItems> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java index 9a8e63421d61..60bc1155bc00 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java @@ -16,12 +16,13 @@ package android.widget.listview.arrowscroll; -import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.view.KeyEvent; +import android.widget.AdapterView; import android.widget.ListView; import android.widget.listview.ListWithFirstScreenUnSelectable; -import android.widget.AdapterView; + +import androidx.test.filters.LargeTest; @LargeTest public class ListWithFirstScreenUnSelectableTest diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java index 56ca00987dc2..a60054e2e821 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java @@ -17,12 +17,13 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.ListView; import android.widget.listview.ListWithNoFadingEdge; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + public class ListWithNoFadingEdgeTest extends ActivityInstrumentationTestCase<ListWithNoFadingEdge> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java index cf319d11ea88..80e70c6e4cac 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java @@ -17,14 +17,15 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.TextView; import android.widget.listview.ListWithOffScreenNextSelectable; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + @Suppress // Failing. public class ListWithOffScreenNextSelectableTest extends ActivityInstrumentationTestCase<ListWithOffScreenNextSelectable> { diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java index feea9b2c403c..819b739fdd32 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java @@ -17,12 +17,13 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; +import android.view.KeyEvent; import android.widget.ListView; import android.widget.TextView; -import android.view.KeyEvent; import android.widget.listview.ListWithOnItemSelectedAction; +import androidx.test.filters.MediumTest; + public class ListWithOnItemSelectedActionTest extends ActivityInstrumentationTestCase<ListWithOnItemSelectedAction> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java index 211c8c8d0f7e..9bbdc2ae8b9e 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java @@ -17,13 +17,14 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.ListView; import android.widget.listview.ListWithScreenOfNoSelectables; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListWithScreenOfNoSelectablesTest extends ActivityInstrumentationTestCase2<ListWithScreenOfNoSelectables> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java index 42058f030020..21fa51d4ae13 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java @@ -17,11 +17,12 @@ package android.widget.listview.arrowscroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.widget.ListView; import android.view.KeyEvent; +import android.widget.ListView; import android.widget.listview.ListWithSeparators; +import androidx.test.filters.MediumTest; + public class ListWithSeparatorsTest extends ActivityInstrumentationTestCase<ListWithSeparators> { private ListWithSeparators mActivity; private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java b/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java index 6a7466b627aa..e9baabf3175a 100644 --- a/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java +++ b/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java @@ -16,14 +16,14 @@ package android.widget.listview.focus; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.listview.AdjacentListsWithAdjacentISVsInside; -import android.util.InternalSelectionView; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; +import android.util.InternalSelectionView; import android.view.KeyEvent; import android.widget.ListView; +import android.widget.listview.AdjacentListsWithAdjacentISVsInside; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; public class AdjacentListsWithAdjacentISVsInsideTest extends ActivityInstrumentationTestCase<AdjacentListsWithAdjacentISVsInside> { diff --git a/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java index 5540d650dd19..3fbdacc302f5 100644 --- a/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java +++ b/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java @@ -16,15 +16,15 @@ package android.widget.listview.focus; -import android.widget.listview.ListButtonsDiagonalAcrossItems; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.FocusFinder; import android.view.KeyEvent; import android.view.View; import android.widget.Button; import android.widget.ListView; +import android.widget.listview.ListButtonsDiagonalAcrossItems; + +import androidx.test.filters.MediumTest; /** * Test that ListView will override default behavior of focus searching to diff --git a/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java index edc60b58e9d0..544895279e6d 100644 --- a/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java +++ b/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java @@ -17,12 +17,13 @@ package android.widget.listview.focus; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; import android.widget.ListView; import android.widget.listview.ListHorizontalFocusWithinItemWins; +import androidx.test.filters.MediumTest; + public class ListHorizontalFocusWithinItemWinsTest extends ActivityInstrumentationTestCase<ListHorizontalFocusWithinItemWins> { private ListView mListView; diff --git a/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java index b449b61baf83..0b17aaf4792c 100644 --- a/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java +++ b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java @@ -17,17 +17,18 @@ package android.widget.listview.focus; import android.test.ActivityInstrumentationTestCase2; -import android.test.FlakyTest; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.view.View; import android.widget.AbsListView; import android.widget.ListView; import android.widget.listview.ListWithEditTextHeader; +import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase2<ListWithEditTextHeader> { private ListView mListView; @@ -49,7 +50,7 @@ public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase2 assertTrue("header does not have focus", mListView.getChildAt(0).isFocused()); } - @FlakyTest(tolerance=2) + @FlakyTest @LargeTest public void testClickingHeaderKeepsFocus() { TouchUtils.clickView(this, mListView.getChildAt(0)); diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java index 28f899edc9b6..262d0f4ba42f 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java @@ -17,14 +17,14 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; -import android.widget.ListView; import android.view.View; - +import android.widget.ListView; import android.widget.listview.ListGetSelectedView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * This test is made to check that getSelectedView() will return * null in touch mode. diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java index ffa9a5e79543..48e8c5e24946 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java @@ -17,15 +17,14 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; +import android.test.TouchUtils; import android.view.Gravity; import android.view.View; import android.view.ViewConfiguration; import android.widget.ListView; - import android.widget.listview.ListOfTouchables; -import android.test.TouchUtils; + +import androidx.test.filters.MediumTest; /** * Touch tests for a list where all of the items fit on the screen. diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java index aed513a0721b..716683ab52ad 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java @@ -17,15 +17,15 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.Suppress; import android.view.View; import android.widget.ListView; - import android.widget.listview.ListSimple; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + /** * Tests setting the selection in touch mode */ diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java index 7daf64e0a596..6a1f076ea2c3 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java @@ -17,16 +17,16 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.Gravity; import android.view.View; import android.view.ViewConfiguration; import android.widget.ListView; - import android.widget.listview.ListBottomGravityMany; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * Touch tests for a list where all of the items do not fit on the screen, and the list * stacks from the bottom. diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java index 4086cf094ab9..89498d6632b9 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java @@ -17,13 +17,13 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.View; import android.widget.ListView; - import android.widget.listview.ListBottomGravity; +import androidx.test.filters.MediumTest; + /** * Touch tests for a list where all of the items fit on the screen, and the list * stacks from the bottom. diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java index 30d56caee7f6..c7f23714f3ba 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java @@ -17,16 +17,16 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.Gravity; import android.view.View; import android.view.ViewConfiguration; import android.widget.ListView; - import android.widget.listview.ListTopGravityMany; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * Touch tests for a list where all of the items do not fit on the screen. */ diff --git a/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java index 5b064b3e770d..8a557aba700e 100644 --- a/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java +++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java @@ -17,13 +17,13 @@ package android.widget.listview.touch; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.test.TouchUtils; import android.view.View; import android.widget.ListView; - import android.widget.listview.ListTopGravity; +import androidx.test.filters.MediumTest; + /** * Touch tests for a list where all of the items fit on the screen. */ diff --git a/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java index a7f5c0560a4e..a30985bfaf87 100644 --- a/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java +++ b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java @@ -18,7 +18,6 @@ package android.widget.scroll; import android.util.InternalSelectionView; import android.util.ScrollViewScenario; - import android.widget.Button; /** diff --git a/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java index 8123228c5228..825aa1aa85a3 100644 --- a/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java +++ b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java @@ -16,14 +16,13 @@ package android.widget.scroll; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.scroll.ButtonAboveTallInternalSelectionView; -import android.util.InternalSelectionView; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; +import android.util.InternalSelectionView; import android.view.KeyEvent; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + @Suppress // Failing. public class ButtonAboveTallInternalSelectionViewTest extends ActivityInstrumentationTestCase<ButtonAboveTallInternalSelectionView> { diff --git a/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java b/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java index 3d5f86d35b07..47d36ddf9be1 100644 --- a/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java +++ b/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java @@ -17,7 +17,6 @@ package android.widget.scroll; import android.util.ScrollViewScenario; - import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java index afc275f25181..dba07a086e89 100644 --- a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java +++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java @@ -16,15 +16,15 @@ package android.widget.scroll; -import com.android.frameworks.coretests.R; - import android.app.Activity; -import android.os.Bundle; import android.graphics.Rect; +import android.os.Bundle; import android.view.View; import android.widget.ScrollView; import android.widget.TextView; +import com.android.frameworks.coretests.R; + /** * A screen with some scenarios that exercise {@link ScrollView}'s implementation * of {@link android.view.ViewGroup#requestChildRectangleOnScreen}: diff --git a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java index f8abdb2c8ec1..7c3df910a547 100644 --- a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java +++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java @@ -16,19 +16,19 @@ package android.widget.scroll; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.scroll.RequestRectangleVisible; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.test.ViewAsserts; +import android.view.KeyEvent; +import android.view.View; import android.widget.Button; import android.widget.ScrollView; import android.widget.TextView; -import android.view.View; -import android.view.KeyEvent; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; + +import com.android.frameworks.coretests.R; /** * {@link RequestRectangleVisible} is set up to exercise the cases of moving a diff --git a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java index 731b25a08926..105686ad7a92 100644 --- a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java +++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java @@ -16,15 +16,14 @@ package android.widget.scroll; -import com.android.frameworks.coretests.R; - import android.app.Activity; +import android.graphics.Rect; import android.os.Bundle; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Button; import android.view.View; -import android.graphics.Rect; +import android.widget.Button; +import android.widget.TextView; + +import com.android.frameworks.coretests.R; public class RequestRectangleVisibleWithInternalScroll extends Activity { diff --git a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java index 5e9b520a9ec2..1a221ff63863 100644 --- a/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java +++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java @@ -16,16 +16,17 @@ package android.widget.scroll; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase; import android.test.ViewAsserts; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.widget.Button; import android.widget.ScrollView; import android.widget.TextView; +import androidx.test.filters.Suppress; + +import com.android.frameworks.coretests.R; + /** * This is suppressed because {@link TextView#scrollBy} isn't working. */ diff --git a/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java index 027ea0f83350..92a315296064 100644 --- a/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java +++ b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java @@ -16,15 +16,14 @@ package android.widget.scroll; -import com.android.frameworks.coretests.R; - import android.app.Activity; import android.os.Bundle; +import android.widget.Button; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; -import android.widget.Button; +import com.android.frameworks.coretests.R; /** * Basic scroll view example diff --git a/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java index 3fd17ee51abf..8d71f84d8f7d 100644 --- a/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java +++ b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java @@ -17,14 +17,14 @@ package android.widget.scroll; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.KeyEvent; import android.widget.Button; import android.widget.LinearLayout; import android.widget.ScrollView; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; public class ScrollViewButtonsAndLabelsTest extends ActivityInstrumentationTestCase<ScrollViewButtonsAndLabels> { diff --git a/core/tests/coretests/src/android/widget/scroll/ShortButtons.java b/core/tests/coretests/src/android/widget/scroll/ShortButtons.java index 3a0f29a530ee..90ede7d35511 100644 --- a/core/tests/coretests/src/android/widget/scroll/ShortButtons.java +++ b/core/tests/coretests/src/android/widget/scroll/ShortButtons.java @@ -17,7 +17,6 @@ package android.widget.scroll; import android.util.ScrollViewScenario; - import android.widget.Button; import android.widget.LinearLayout; diff --git a/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java index 56d7ed2c3243..04f5ac84bd2a 100644 --- a/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java +++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java @@ -16,16 +16,16 @@ package android.widget.scroll.arrowscroll; -import android.widget.scroll.ButtonsWithTallTextViewInBetween; - import android.graphics.Rect; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.view.View; import android.widget.Button; import android.widget.ScrollView; import android.widget.TextView; +import android.widget.scroll.ButtonsWithTallTextViewInBetween; + +import androidx.test.filters.MediumTest; public class ButtonsWithTallTextViewInBetweenTest extends ActivityInstrumentationTestCase<ButtonsWithTallTextViewInBetween> { diff --git a/core/tests/coretests/src/android/widget/scroll/arrowscroll/MultiPageTextWithPaddingTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/MultiPageTextWithPaddingTest.java index 6ce4c1508213..2f4509827592 100644 --- a/core/tests/coretests/src/android/widget/scroll/arrowscroll/MultiPageTextWithPaddingTest.java +++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/MultiPageTextWithPaddingTest.java @@ -16,14 +16,14 @@ package android.widget.scroll.arrowscroll; -import android.test.suitebuilder.annotation.Suppress; -import android.widget.scroll.arrowscroll.MultiPageTextWithPadding; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; -import android.widget.TextView; import android.widget.ScrollView; +import android.widget.TextView; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; @Suppress // Flaky public class MultiPageTextWithPaddingTest extends diff --git a/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java index 267d8ee4a250..a2928cb78e0c 100644 --- a/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java +++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java @@ -16,15 +16,15 @@ package android.widget.scroll.arrowscroll; -import android.widget.scroll.ShortButtons; - import android.graphics.Rect; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; import android.widget.ScrollView; +import android.widget.scroll.ShortButtons; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; public class ShortButtonsTest extends ActivityInstrumentationTestCase<ShortButtons> { diff --git a/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java index 5351839e868f..0681081f7452 100644 --- a/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java +++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java @@ -16,13 +16,13 @@ package android.widget.scroll.arrowscroll; -import android.widget.scroll.TallTextAboveButton; - import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.ScrollView; import android.widget.TextView; +import android.widget.scroll.TallTextAboveButton; + +import androidx.test.filters.MediumTest; public class TallTextAboveButtonTest extends ActivityInstrumentationTestCase<TallTextAboveButton> { private ScrollView mScrollView; diff --git a/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java b/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java index 449c95cc81fe..aa20c9b65f2e 100644 --- a/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java +++ b/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java @@ -16,16 +16,17 @@ package android.widget.touchmode; -import android.widget.layout.linear.LLOfButtons1; -import android.widget.layout.linear.LLOfButtons2; import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick; -import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey; import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap; +import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; +import android.widget.layout.linear.LLOfButtons1; +import android.widget.layout.linear.LLOfButtons2; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; /** * Tests that the touch mode changes from various events, and that the state diff --git a/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java b/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java index 691b25a51b8a..97c982f3cbfd 100644 --- a/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java +++ b/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java @@ -16,12 +16,12 @@ package android.widget.touchmode; -import android.widget.layout.linear.LLOfTwoFocusableInTouchMode; - import android.test.ActivityInstrumentationTestCase2; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; +import android.widget.layout.linear.LLOfTwoFocusableInTouchMode; + +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; public class FocusableInTouchModeClickTest extends ActivityInstrumentationTestCase2<LLOfTwoFocusableInTouchMode> { diff --git a/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java b/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java index 5339188ae89a..88aa9caa31b6 100644 --- a/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java +++ b/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java @@ -16,14 +16,15 @@ package android.widget.touchmode; -import android.widget.layout.linear.LLEditTextThenButton; import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; import android.widget.EditText; +import android.widget.layout.linear.LLEditTextThenButton; + +import androidx.test.filters.MediumTest; public class StartInTouchWithViewInFocusTest extends ActivityInstrumentationTestCase2<LLEditTextThenButton> { diff --git a/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java index 5a6110c08116..f192f6815163 100644 --- a/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java +++ b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java @@ -21,11 +21,11 @@ import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap; import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.widget.Button; import android.widget.layout.linear.LLOfButtons1; +import androidx.test.filters.MediumTest; /** * Make sure focus isn't kept by buttons when entering touch mode. diff --git a/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java index 3ddeef072a9e..87f33a4cc803 100644 --- a/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java +++ b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java @@ -20,12 +20,13 @@ import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick; import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap; import android.test.ActivityInstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.MediumTest; import android.widget.Button; import android.widget.EditText; import android.widget.layout.linear.LLEditTextThenButton; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; + /** * Some views, like edit texts, can keep and gain focus even when in touch mode. */ diff --git a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java index a302657c7ede..aadfcbc84f76 100644 --- a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java @@ -57,7 +57,6 @@ import android.os.Vibrator; import android.provider.Settings; import android.speech.tts.TextToSpeech; import android.speech.tts.Voice; -import android.support.test.runner.AndroidJUnit4; import android.test.mock.MockContentResolver; import android.text.TextUtils; import android.view.Window; @@ -66,6 +65,8 @@ import android.view.accessibility.AccessibilityManager; import android.view.accessibility.IAccessibilityManager; import android.widget.Toast; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.R; import com.android.internal.accessibility.AccessibilityShortcutController.FrameworkObjectProvider; import com.android.internal.util.test.FakeSettingsProvider; diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java index 1859378e4c1f..aaa624e6b25e 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java @@ -16,41 +16,41 @@ package com.android.internal.app; -import com.android.internal.R; -import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; - -import android.app.usage.UsageStats; -import android.app.usage.UsageStatsManager; -import android.content.Intent; -import android.content.pm.ResolveInfo; -import android.os.UserHandle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; + import static com.android.internal.app.ChooserWrapperActivity.sOverrides; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.usage.UsageStatsManager; +import android.content.Intent; +import android.content.pm.ResolveInfo; + +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + +import com.android.internal.R; +import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.List; /** * Chooser activity instrumentation tests diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java index c446f3c79ea8..60529f6d4071 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java +++ b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java @@ -16,14 +16,14 @@ package com.android.internal.app; +import static org.mockito.Mockito.mock; + import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.pm.PackageManager; import java.util.function.Function; -import static org.mockito.Mockito.mock; - public class ChooserWrapperActivity extends ChooserActivity { /* * Simple wrapper around chooser activity to be able to initiate it under test diff --git a/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java b/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java index cfb6bdd5d613..9b13af2a4357 100644 --- a/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java @@ -46,9 +46,10 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Rule; diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index 404c99c82a4c..fe2fb8530cf6 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -16,6 +16,29 @@ package com.android.internal.app; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isEnabled; +import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static android.support.test.espresso.matcher.ViewMatchers.withText; + +import static com.android.internal.app.ResolverWrapperActivity.sOverrides; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.when; + +import android.content.Intent; +import android.content.pm.ResolveInfo; +import android.view.View; +import android.widget.RelativeLayout; + +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.R; import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; import com.android.internal.widget.ResolverDrawerLayout; @@ -26,37 +49,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import android.app.usage.UsageStats; -import android.app.usage.UsageStatsManager; -import android.content.Intent; -import android.content.pm.ResolveInfo; -import android.os.UserHandle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.view.View; -import android.widget.RelativeLayout; - import java.util.ArrayList; import java.util.List; -import java.util.Map; - -import static android.os.SystemClock.sleep; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.isEnabled; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; -import static com.android.internal.app.ResolverWrapperActivity.sOverrides; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * Resolver activity instrumentation tests diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverDataProvider.java b/core/tests/coretests/src/com/android/internal/app/ResolverDataProvider.java index c710b9ad77bf..850b466ec755 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverDataProvider.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverDataProvider.java @@ -23,10 +23,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; import android.os.UserHandle; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - /** * Utility class used by resolver tests to create mock data */ diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java index 284ab605c3b5..fcec00e34278 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java @@ -25,34 +25,31 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.mockito.invocation.InvocationOnMock; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.mockito.stubbing.Answer; - import android.app.usage.IUsageStatsManager; import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.content.Context; +import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; -import android.content.Intent; import android.os.RemoteException; import android.os.UserHandle; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; -import java.io.File; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java index 163211e10e6a..83f6bc2e8bf3 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java @@ -16,18 +16,13 @@ package com.android.internal.app; +import static org.mockito.Mockito.mock; + import android.app.usage.UsageStatsManager; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.os.RemoteException; import java.util.function.Function; -import static org.mockito.Mockito.mock; - - /* * Simple wrapper around chooser activity to be able to initiate it under test */ diff --git a/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java b/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java index 472958a01eb4..87ad124fe04b 100644 --- a/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java +++ b/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java @@ -17,12 +17,13 @@ package com.android.internal.app; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.SmallTest; import android.view.ActionMode; import android.view.Menu; import android.view.MenuItem; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.SmallTest; + /** * Tests for {@link WindowDecorActionBar}. */ diff --git a/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java b/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java index 115af5e0ea5d..f7fea3b7a6d0 100644 --- a/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java +++ b/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java @@ -16,20 +16,14 @@ package com.android.internal.app.procstats; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; - -import android.os.BatteryStats; import android.os.Parcel; -import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import junit.framework.Assert; import junit.framework.TestCase; -import org.mockito.Mockito; - /** * Provides test cases for SparseMappingTable. */ diff --git a/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodDebugTest.java b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodDebugTest.java index 629f7b60471c..222e494de7d4 100644 --- a/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodDebugTest.java +++ b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodDebugTest.java @@ -18,10 +18,11 @@ package com.android.internal.inputmethod; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.WindowManager.LayoutParams; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/inputmethod/SubtypeLocaleUtilsTest.java b/core/tests/coretests/src/com/android/internal/inputmethod/SubtypeLocaleUtilsTest.java index 8179328c32c4..ba6390808151 100644 --- a/core/tests/coretests/src/com/android/internal/inputmethod/SubtypeLocaleUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/inputmethod/SubtypeLocaleUtilsTest.java @@ -18,8 +18,8 @@ package com.android.internal.inputmethod; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java index 992b46f96339..b6878013b254 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java @@ -13,6 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import static android.os.BatteryStats.STATS_SINCE_CHARGED; @@ -20,10 +21,11 @@ import static android.os.BatteryStats.STATS_SINCE_CHARGED; import android.app.ActivityManager; import android.os.BatteryStats; import android.os.WorkSource; -import android.support.test.filters.SmallTest; import android.util.ArrayMap; import android.view.Display; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; /** diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsCounterTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsCounterTest.java index 08f8dd146516..37f818a70ec9 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsCounterTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsCounterTest.java @@ -13,11 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java index ee8d5081b0b3..0179eadae6a1 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static android.os.BatteryStats.STATS_SINCE_CHARGED; @@ -36,11 +37,12 @@ import static org.mockito.Mockito.when; import android.os.BatteryStats; import android.os.UserHandle; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseLongArray; import android.view.Display; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.util.ArrayUtils; import org.junit.Before; @@ -64,7 +66,7 @@ import java.util.Arrays; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class com.android.internal.os.BatteryStatsCpuTimesTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner * * or * diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java index 3a5a9f5bc67a..efb871027830 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java @@ -13,10 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.os.BatteryStats; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsDurationTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDurationTimerTest.java index 19dab7961401..a42286f6882f 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsDurationTimerTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDurationTimerTest.java @@ -13,11 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java index 7467114a7596..355601ca05ed 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java @@ -17,7 +17,6 @@ package com.android.internal.os; - import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP; import static com.google.common.truth.Truth.assertThat; @@ -37,12 +36,13 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Process; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.text.format.DateUtils; import android.util.StatsLog; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import junit.framework.TestCase; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHistoryTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHistoryTest.java index 10a318920646..cc0ddb7bf8a4 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHistoryTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHistoryTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; - import android.content.Context; import android.os.Parcel; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java index 613de45173d6..dc9367557f9f 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static android.os.BatteryStats.STATS_SINCE_CHARGED; @@ -31,12 +32,13 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.os.BatteryStats; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; import android.util.SparseIntArray; import android.view.Display; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.util.ArrayUtils; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java index 8cbe5d68d554..3e33273feddb 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java @@ -13,6 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import static android.os.BatteryStats.STATS_CURRENT; @@ -20,21 +21,20 @@ import static android.os.BatteryStats.STATS_SINCE_CHARGED; import static android.os.BatteryStats.WAKE_TYPE_PARTIAL; import android.app.ActivityManager; -import android.os.BatteryManager; import android.os.BatteryStats; import android.os.BatteryStats.HistoryItem; import android.os.BatteryStats.Uid.Sensor; import android.os.WorkSource; -import android.support.test.filters.SmallTest; import android.view.Display; +import androidx.test.filters.SmallTest; + import com.android.internal.os.BatteryStatsImpl.DualTimer; import com.android.internal.os.BatteryStatsImpl.Uid; + import junit.framework.TestCase; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -47,7 +47,7 @@ import java.util.Map; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class com.android.internal.os.BatteryStatsNoteTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ public class BatteryStatsNoteTest extends TestCase { diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSamplingTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSamplingTimerTest.java index 251ceb04b973..61d20dfb32d9 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSamplingTimerTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSamplingTimerTest.java @@ -13,11 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java index a751f9060588..b851f0ad3414 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java @@ -13,13 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.app.ActivityManager; import android.os.BatteryStats; -import android.support.test.filters.SmallTest; import android.view.Display; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; /** diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java index 5fd822549ff8..b9995c443f35 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java @@ -18,7 +18,8 @@ package com.android.internal.os; import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.Assert; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsStopwatchTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsStopwatchTimerTest.java index 015314ebe8dc..f76f31619f79 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsStopwatchTimerTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsStopwatchTimerTest.java @@ -13,10 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; import android.os.BatteryStats; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java index 225515e9e3f3..d69e1d131731 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java index 3190d9e77c77..bce8b40cc31d 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java @@ -16,19 +16,20 @@ package com.android.internal.os; -import java.io.PrintWriter; -import java.io.StringWriter; - import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import junit.framework.Assert; import junit.framework.TestCase; import org.mockito.Mockito; +import java.io.PrintWriter; +import java.io.StringWriter; + /** * Provides test cases for android.os.BatteryStats. */ diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java index 98d0f7fdce5c..87dc2f3dd43b 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java @@ -18,16 +18,17 @@ package com.android.internal.os; import android.os.BatteryStats; import android.os.Parcel; -import android.support.test.filters.SmallTest; import android.util.StringBuilderPrinter; -import junit.framework.Assert; -import junit.framework.TestCase; +import androidx.test.filters.SmallTest; import com.android.internal.os.BatteryStatsImpl.Clocks; import com.android.internal.os.BatteryStatsImpl.TimeBase; import com.android.internal.os.BatteryStatsImpl.Timer; +import junit.framework.Assert; +import junit.framework.TestCase; + /** * Provides test cases for android.os.BatteryStats. */ diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java index a7e75a248eda..4df3190cc2d7 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java @@ -16,22 +16,10 @@ package com.android.internal.os; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; +import androidx.test.filters.SmallTest; -import android.os.BatteryStats; -import android.os.Parcel; -import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; - -import junit.framework.Assert; import junit.framework.TestCase; -import com.android.internal.os.BatteryStatsImpl; - -import org.mockito.Mockito; - /** * Provides test cases for android.os.BatteryStats. */ diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsUserLifecycleTests.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUserLifecycleTests.java index 450473d0335c..e7a1bcae459a 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsUserLifecycleTests.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUserLifecycleTests.java @@ -28,12 +28,13 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.ArraySet; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java index dc3a12f0bbf5..1d35143e3fab 100644 --- a/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java @@ -22,11 +22,12 @@ import static org.junit.Assert.assertTrue; import android.os.Binder; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; import android.util.SparseArray; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.BinderInternal.CallSession; import org.junit.Assert; diff --git a/core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java b/core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java index 42c9139e04e2..01515bd9c6b5 100644 --- a/core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static android.os.BatteryStats.UID_TIMES_TYPE_ALL; @@ -33,9 +34,6 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; -import com.android.frameworks.coretests.aidl.ICmdCallback; -import com.android.frameworks.coretests.aidl.ICmdReceiver; - import android.app.ActivityManager; import android.app.KeyguardManager; import android.content.ComponentName; @@ -52,14 +50,18 @@ import android.os.PowerManager; import android.os.Process; import android.os.SystemClock; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.text.TextUtils; import android.util.DebugUtils; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + +import com.android.frameworks.coretests.aidl.ICmdCallback; +import com.android.frameworks.coretests.aidl.ICmdReceiver; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/core/tests/coretests/src/com/android/internal/os/DebugTest.java b/core/tests/coretests/src/com/android/internal/os/DebugTest.java index efb78d788575..2a8a8571c882 100644 --- a/core/tests/coretests/src/com/android/internal/os/DebugTest.java +++ b/core/tests/coretests/src/com/android/internal/os/DebugTest.java @@ -18,7 +18,8 @@ package com.android.internal.os; import android.os.Debug; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; @SmallTest diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuProcReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuProcReaderTest.java index 8360126f3751..a25a74890029 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuProcReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuProcReaderTest.java @@ -24,9 +24,10 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuProcStringReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuProcStringReaderTest.java index 2663f2bc8ae1..7a316056429a 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuProcStringReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuProcStringReaderTest.java @@ -24,9 +24,10 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java index b242a34cc703..0c56b8a3e8aa 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java @@ -23,9 +23,10 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidActiveTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidActiveTimeReaderTest.java index adafda04d516..1b13a9927beb 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidActiveTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidActiveTimeReaderTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static org.junit.Assert.assertEquals; @@ -20,11 +21,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseLongArray; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidActiveTimeReader; import org.junit.After; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidClusterTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidClusterTimeReaderTest.java index ad20d84bfc60..2ea80da9e6d0 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidClusterTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidClusterTimeReaderTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static org.junit.Assert.assertArrayEquals; @@ -22,11 +23,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidClusterTimeReader; import org.junit.After; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidFreqTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidFreqTimeReaderTest.java index 1d3a98a89d95..0b6fed386117 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidFreqTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidFreqTimeReaderTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static org.junit.Assert.assertArrayEquals; @@ -24,11 +25,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader; import org.junit.After; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidUserSysTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidUserSysTimeReaderTest.java index 9b4512b8b9bd..8f81ea237a15 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuUidUserSysTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuUidUserSysTimeReaderTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.os; import static org.junit.Assert.assertArrayEquals; @@ -23,11 +24,12 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.os.FileUtils; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidUserSysTimeReader; import org.junit.After; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java b/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java index 32317eed203e..60dac8520d14 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java @@ -1,11 +1,27 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.internal.os; -import android.support.test.filters.SmallTest; import android.util.LongSparseLongArray; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; -import org.junit.Assert; import org.mockito.Mockito; import java.io.BufferedReader; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelSingleUidTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelSingleUidTimeReaderTest.java index 29227f9f6a1b..479e19e10ba0 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelSingleUidTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelSingleUidTimeReaderTest.java @@ -21,10 +21,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.os.KernelSingleUidTimeReader.Injector; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuActiveTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuActiveTimeReaderTest.java index 28570e8fa747..12f6c188f18f 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuActiveTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuActiveTimeReaderTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuClusterTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuClusterTimeReaderTest.java index 85dce020ddd4..532f337fe2e1 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuClusterTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuClusterTimeReaderTest.java @@ -21,10 +21,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuFreqTimeReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuFreqTimeReaderTest.java index 67c4e6161da6..6d2980b8bed0 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelUidCpuFreqTimeReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelUidCpuFreqTimeReaderTest.java @@ -24,10 +24,11 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.SparseArray; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,7 +54,7 @@ import java.util.Arrays; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class com.android.internal.os.KernelUidCpuFreqTimeReaderTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner * * or * diff --git a/core/tests/coretests/src/com/android/internal/os/KernelWakelockReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelWakelockReaderTest.java index 4e4bb350739d..78b6843e535c 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelWakelockReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelWakelockReaderTest.java @@ -13,9 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.os; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java b/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java index fe627642418f..cb8a62c0936c 100644 --- a/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java @@ -16,7 +16,9 @@ package com.android.internal.os; -import android.test.suitebuilder.annotation.Suppress; +import androidx.test.filters.Suppress; + +import junit.framework.TestCase; import java.io.PrintWriter; import java.io.StringWriter; @@ -25,8 +27,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import junit.framework.TestCase; - // this test causes a IllegalAccessError: superclass not accessible @Suppress public class LoggingPrintStreamTest extends TestCase { diff --git a/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterArrayTest.java b/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterArrayTest.java index 37b4e41a38d6..0516bb7f74d7 100644 --- a/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterArrayTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterArrayTest.java @@ -30,8 +30,9 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; @@ -55,7 +56,7 @@ import java.util.Arrays; * Install: adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk * Run: adb shell am instrument -e class com.android.internal.os.LongSamplingCounterArrayTest -w \ - * com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner + * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ @SmallTest @RunWith(AndroidJUnit4.class) diff --git a/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterTest.java b/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterTest.java index 853bf8a079a6..d2f5735ce3c1 100644 --- a/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LongSamplingCounterTest.java @@ -28,8 +28,9 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java b/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java index b65c1e6210a7..2c597b14c557 100644 --- a/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java @@ -23,8 +23,9 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Assert; diff --git a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java index b68f6b1273b9..c18445e26173 100644 --- a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java +++ b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java @@ -21,6 +21,7 @@ import android.os.Looper; import android.util.SparseIntArray; import com.android.internal.location.gnssmetrics.GnssMetrics; + import java.util.ArrayList; import java.util.Queue; import java.util.concurrent.Future; diff --git a/core/tests/coretests/src/com/android/internal/os/PowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/PowerCalculatorTest.java index 14d62e0b2f9c..c592ab6a16ae 100644 --- a/core/tests/coretests/src/com/android/internal/os/PowerCalculatorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/PowerCalculatorTest.java @@ -17,13 +17,13 @@ package com.android.internal.os; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.os.BatteryStats; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java b/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java index 2853c965e871..5862368f44d2 100644 --- a/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java +++ b/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java @@ -17,8 +17,8 @@ package com.android.internal.os; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/com/android/internal/os/ProcStatsUtilTest.java b/core/tests/coretests/src/com/android/internal/os/ProcStatsUtilTest.java index 489e164e0b12..e97caf8c0631 100644 --- a/core/tests/coretests/src/com/android/internal/os/ProcStatsUtilTest.java +++ b/core/tests/coretests/src/com/android/internal/os/ProcStatsUtilTest.java @@ -20,9 +20,10 @@ import static org.junit.Assert.assertEquals; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/ProcTimeInStateReaderTest.java b/core/tests/coretests/src/com/android/internal/os/ProcTimeInStateReaderTest.java index 2893066af0d8..9db3f8a6e187 100644 --- a/core/tests/coretests/src/com/android/internal/os/ProcTimeInStateReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/ProcTimeInStateReaderTest.java @@ -22,9 +22,10 @@ import static org.junit.Assert.fail; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java b/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java index c051a1cdf052..85eafc57acc3 100644 --- a/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java @@ -15,15 +15,17 @@ */ package com.android.internal.os; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import android.content.Context; import android.os.FileUtils; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; @@ -36,7 +38,6 @@ import java.io.BufferedWriter; import java.io.File; import java.nio.file.Files; - /** * Test class for {@link StoragedUidIoStatsReader}. * diff --git a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowActionModeTest.java b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowActionModeTest.java index 2a24881f67fa..8e0c1fe99933 100644 --- a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowActionModeTest.java +++ b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowActionModeTest.java @@ -17,8 +17,6 @@ package com.android.internal.policy; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.SmallTest; import android.view.ActionMode; import android.view.ActionMode.Callback; import android.view.KeyEvent; @@ -32,7 +30,8 @@ import android.view.Window; import android.view.WindowManager.LayoutParams; import android.view.accessibility.AccessibilityEvent; -import java.util.List; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.SmallTest; /** * Tests {@link PhoneWindow}'s {@link ActionMode} related methods. diff --git a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java index d4b8566b0345..6c2d630ac917 100644 --- a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java +++ b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java @@ -28,12 +28,13 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.ActionMode; import android.view.ContextThemeWrapper; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.frameworks.coretests.R; import org.junit.Before; diff --git a/core/tests/coretests/src/com/android/internal/util/ArrayUtilsTest.java b/core/tests/coretests/src/com/android/internal/util/ArrayUtilsTest.java index b3897ceb6e79..d0267355c92e 100644 --- a/core/tests/coretests/src/com/android/internal/util/ArrayUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/util/ArrayUtilsTest.java @@ -13,9 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ + package com.android.internal.util; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/tests/coretests/src/com/android/internal/util/DumpUtilsTest.java b/core/tests/coretests/src/com/android/internal/util/DumpUtilsTest.java index a44b86074ee2..4716312c59a8 100644 --- a/core/tests/coretests/src/com/android/internal/util/DumpUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/util/DumpUtilsTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.util; import static com.android.internal.util.DumpUtils.CRITICAL_SECTION_COMPONENTS; diff --git a/core/tests/coretests/src/com/android/internal/util/LineBreakBufferedWriterTest.java b/core/tests/coretests/src/com/android/internal/util/LineBreakBufferedWriterTest.java index 4845c4ef28f8..b2a2265d30ae 100644 --- a/core/tests/coretests/src/com/android/internal/util/LineBreakBufferedWriterTest.java +++ b/core/tests/coretests/src/com/android/internal/util/LineBreakBufferedWriterTest.java @@ -19,11 +19,8 @@ package com.android.internal.util; import junit.framework.TestCase; import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; import java.io.Writer; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; /** diff --git a/core/tests/coretests/src/com/android/internal/util/ParseUtilsTest.java b/core/tests/coretests/src/com/android/internal/util/ParseUtilsTest.java index f00c48c96b5d..867152e720dd 100644 --- a/core/tests/coretests/src/com/android/internal/util/ParseUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/util/ParseUtilsTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.internal.util; import junit.framework.TestCase; diff --git a/core/tests/coretests/src/android/util/TokenBucketTest.java b/core/tests/coretests/src/com/android/internal/util/TokenBucketTest.java index f7ac20c7287f..6c50bce86638 100644 --- a/core/tests/coretests/src/android/util/TokenBucketTest.java +++ b/core/tests/coretests/src/com/android/internal/util/TokenBucketTest.java @@ -18,6 +18,7 @@ package com.android.internal.util; import android.os.SystemClock; import android.text.format.DateUtils; + import junit.framework.TestCase; public class TokenBucketTest extends TestCase { @@ -54,9 +55,9 @@ public class TokenBucketTest extends TestCase { drain(new TokenBucket(FILL_DELTA_VERY_LONG, 10, 100), 10); - drain(new TokenBucket((int)DateUtils.MINUTE_IN_MILLIS, 50), 50); - drain(new TokenBucket((int)DateUtils.HOUR_IN_MILLIS, 10), 10); - drain(new TokenBucket((int)DateUtils.DAY_IN_MILLIS, 200), 200); + drain(new TokenBucket((int) DateUtils.MINUTE_IN_MILLIS, 50), 50); + drain(new TokenBucket((int) DateUtils.HOUR_IN_MILLIS, 10), 10); + drain(new TokenBucket((int) DateUtils.DAY_IN_MILLIS, 200), 200); } public void testReset() { @@ -163,16 +164,16 @@ public class TokenBucketTest extends TestCase { void assertDuration(long expected, long elapsed) { String msg = String.format( - "expected elapsed time at least %d ms, but was %d ms", expected, elapsed); + "expected elapsed time at least %d ms, but was %d ms", expected, elapsed); elapsed += 1; // one millisecond extra guard assertTrue(msg, elapsed >= expected); } - void assertThrow(Fn fn) { - try { - fn.call(); - fail("expected n exception to be thrown."); - } catch (Throwable t) {} + void assertThrow(Fn fn) { + try { + fn.call(); + fail("expected n exception to be thrown."); + } catch (Throwable t) { } } interface Fn { void call(); } diff --git a/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java b/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java index 912b7ec02b15..b3723664dc1b 100644 --- a/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java @@ -18,11 +18,12 @@ package com.android.internal.widget; import android.content.Context; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; import android.view.ActionMode; import android.view.View; import android.view.ViewGroup; +import androidx.test.filters.SmallTest; + /** * Tests for {@link ActionBarContainer}. */ diff --git a/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java index d782c0c0308d..d10f173328be 100644 --- a/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java @@ -29,9 +29,6 @@ import static org.junit.Assert.assertThat; import android.content.Context; import android.graphics.Insets; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.DisplayCutout; import android.view.View; import android.view.View.OnApplyWindowInsetsListener; @@ -40,6 +37,10 @@ import android.view.WindowInsets; import android.widget.FrameLayout; import android.widget.Toolbar; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/widget/BackgroundFallbackTest.java b/core/tests/coretests/src/com/android/internal/widget/BackgroundFallbackTest.java index e21143d4392f..0fada06b8de4 100644 --- a/core/tests/coretests/src/com/android/internal/widget/BackgroundFallbackTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/BackgroundFallbackTest.java @@ -32,10 +32,11 @@ import static java.util.Collections.emptyList; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.test.InstrumentationRegistry; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.test.InstrumentationRegistry; + import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java b/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java index 1806b226e7b3..2e0dbb4f574e 100644 --- a/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java @@ -19,12 +19,13 @@ package com.android.internal.widget; import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.text.Layout; import android.view.View.MeasureSpec; import android.widget.TextView; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java b/core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java index f73950a648e0..6167c4b80cee 100644 --- a/core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import android.os.UserHandle; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java index 41082b7c7593..6af7c886ce9b 100644 --- a/core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java @@ -21,12 +21,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.text.Layout; import android.view.LayoutInflater; import android.view.View.MeasureSpec; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import com.android.frameworks.coretests.R; import org.junit.Before; |