Merge "Update the imports to androidx.test.filters.*" into main
diff --git a/tests/Android.bp b/tests/Android.bp
index 8ca5cf9..2ae10dd 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -21,8 +21,9 @@
android_test {
name: "QuickSearchBoxTests",
- sdk_version: "9",
+ sdk_version: "19",
srcs: ["src/**/*.java"],
certificate: "shared",
instrumentation_for: "QuickSearchBox",
+ static_libs: ["androidx.test.rules"],
}
diff --git a/tests/src/com/android/quicksearchbox/CachingIconLoaderTest.java b/tests/src/com/android/quicksearchbox/CachingIconLoaderTest.java
index b4e3b16..5841acb 100644
--- a/tests/src/com/android/quicksearchbox/CachingIconLoaderTest.java
+++ b/tests/src/com/android/quicksearchbox/CachingIconLoaderTest.java
@@ -16,7 +16,7 @@
package com.android.quicksearchbox;
-import android.test.suitebuilder.annotation.MediumTest;
+import androidx.test.filters.MediumTest;
/**
* Tests for {@link CachingIconLoader}.
diff --git a/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java b/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
index 1bb1035..c2d2a96 100644
--- a/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
+++ b/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
@@ -16,13 +16,14 @@
package com.android.quicksearchbox;
+import android.test.AndroidTestCase;
+import android.text.Spanned;
+
+import androidx.test.filters.SmallTest;
+
import com.android.quicksearchbox.MockTextAppearanceFactory.MockStyleSpan;
import com.android.quicksearchbox.util.LevenshteinDistance.Token;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.Spanned;
-
/**
* Tests for {@link LevenshteinSuggestionFormatter}.
*/
diff --git a/tests/src/com/android/quicksearchbox/PackageIconLoaderTest.java b/tests/src/com/android/quicksearchbox/PackageIconLoaderTest.java
index 9ec3e15..5442e9d 100644
--- a/tests/src/com/android/quicksearchbox/PackageIconLoaderTest.java
+++ b/tests/src/com/android/quicksearchbox/PackageIconLoaderTest.java
@@ -16,16 +16,17 @@
package com.android.quicksearchbox;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Process;
+
+import androidx.test.filters.MediumTest;
+
import com.android.quicksearchbox.tests.CrashingIconProvider;
import com.android.quicksearchbox.util.NamedTaskExecutor;
import com.android.quicksearchbox.util.PriorityThreadFactory;
import com.android.quicksearchbox.util.SingleThreadNamedTaskExecutor;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Process;
-import android.test.suitebuilder.annotation.MediumTest;
-
/**
* Tests for {@link PackageIconLoader}.
*
diff --git a/tests/src/com/android/quicksearchbox/SuggestionUtilsTest.java b/tests/src/com/android/quicksearchbox/SuggestionUtilsTest.java
index 721f380..54f91bf 100644
--- a/tests/src/com/android/quicksearchbox/SuggestionUtilsTest.java
+++ b/tests/src/com/android/quicksearchbox/SuggestionUtilsTest.java
@@ -16,7 +16,8 @@
package com.android.quicksearchbox;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
/**
* Tests for {@link SuggestionUtils}.
diff --git a/tests/src/com/android/quicksearchbox/util/CachedLaterTest.java b/tests/src/com/android/quicksearchbox/util/CachedLaterTest.java
index 669db5f..0fdac28 100644
--- a/tests/src/com/android/quicksearchbox/util/CachedLaterTest.java
+++ b/tests/src/com/android/quicksearchbox/util/CachedLaterTest.java
@@ -16,9 +16,9 @@
package com.android.quicksearchbox.util;
-import com.android.quicksearchbox.ConsumerTrap;
+import androidx.test.filters.SmallTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import com.android.quicksearchbox.ConsumerTrap;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/quicksearchbox/util/LevenshteinDistanceTest.java b/tests/src/com/android/quicksearchbox/util/LevenshteinDistanceTest.java
index 6235229..3aa6084 100644
--- a/tests/src/com/android/quicksearchbox/util/LevenshteinDistanceTest.java
+++ b/tests/src/com/android/quicksearchbox/util/LevenshteinDistanceTest.java
@@ -16,12 +16,13 @@
package com.android.quicksearchbox.util;
+import android.test.AndroidTestCase;
+
+import androidx.test.filters.SmallTest;
+
import com.android.quicksearchbox.util.LevenshteinDistance.EditOperation;
import com.android.quicksearchbox.util.LevenshteinDistance.Token;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
/**
* Tests for class {@link LevenshteinDistance}.
*/
diff --git a/tests/src/com/android/quicksearchbox/util/PerNameExecutorTest.java b/tests/src/com/android/quicksearchbox/util/PerNameExecutorTest.java
index f7eb20a..489e80a 100644
--- a/tests/src/com/android/quicksearchbox/util/PerNameExecutorTest.java
+++ b/tests/src/com/android/quicksearchbox/util/PerNameExecutorTest.java
@@ -19,7 +19,7 @@
import static com.android.quicksearchbox.util.MockTask.assertRanNever;
import static com.android.quicksearchbox.util.MockTask.assertRanOnce;
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/quicksearchbox/util/PriorityThreadFactoryTest.java b/tests/src/com/android/quicksearchbox/util/PriorityThreadFactoryTest.java
index 5557877..738d64e 100644
--- a/tests/src/com/android/quicksearchbox/util/PriorityThreadFactoryTest.java
+++ b/tests/src/com/android/quicksearchbox/util/PriorityThreadFactoryTest.java
@@ -18,7 +18,8 @@
package com.android.quicksearchbox.util;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
+
+import androidx.test.filters.MediumTest;
import java.util.concurrent.ThreadFactory;
diff --git a/tests/src/com/android/quicksearchbox/util/SingleThreadNamedTaskExecutorTest.java b/tests/src/com/android/quicksearchbox/util/SingleThreadNamedTaskExecutorTest.java
index 43f6ae7..97c3cf3 100644
--- a/tests/src/com/android/quicksearchbox/util/SingleThreadNamedTaskExecutorTest.java
+++ b/tests/src/com/android/quicksearchbox/util/SingleThreadNamedTaskExecutorTest.java
@@ -16,12 +16,12 @@
package com.android.quicksearchbox.util;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import java.util.concurrent.Executors;
+import androidx.test.filters.MediumTest;
import junit.framework.TestCase;
+import java.util.concurrent.Executors;
+
/**
* Tests for {@link SingleThreadNamedTaskExecutor}.
*/
