From b7eeda4812355b2119c1ece9f85870d604745bad Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Tue, 10 Jul 2018 11:57:16 -0700
Subject: Move to androidx.test for tests.

We have been using jetified version of android.support.test. Move to
androidx.test that have started shipping to external devs.

Test: ran all appcompat tests and they all pass.
Change-Id: I58a5fac20e2d0728caa334981909a3e372c9032a
Merged-In: I58a5fac20e2d0728caa334981909a3e372c9032a
---
 palette/build.gradle                                                 | 2 +-
 palette/ktx/build.gradle                                             | 2 +-
 .../src/androidTest/java/androidx/palette/graphics/BucketTests.java  | 5 +++--
 .../androidTest/java/androidx/palette/graphics/ConsistencyTest.java  | 5 +++--
 .../androidTest/java/androidx/palette/graphics/MaxColorsTest.java    | 4 ++--
 .../src/androidTest/java/androidx/palette/graphics/SwatchTests.java  | 5 +++--
 .../src/androidTest/java/androidx/palette/graphics/TestUtils.java    | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'palette')

diff --git a/palette/build.gradle b/palette/build.gradle
index 4037bf55290..dfca475a8e7 100644
--- a/palette/build.gradle
+++ b/palette/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     annotationProcessor(NULLAWAY)
 
-    androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+    androidTestImplementation(TEST_RUNNER)
 }
 
 supportLibrary {
diff --git a/palette/ktx/build.gradle b/palette/ktx/build.gradle
index e5d5d4338bc..f194955377e 100644
--- a/palette/ktx/build.gradle
+++ b/palette/ktx/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     api(project(":palette"))
     api(KOTLIN_STDLIB)
     androidTestImplementation(JUNIT)
-    androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+    androidTestImplementation(TEST_RUNNER)
 }
 
 supportLibrary {
diff --git a/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java b/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
index 500b0134007..47600171a09 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
@@ -24,8 +24,9 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-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/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java b/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
index 8ea0daf9f3d..7a0982c306f 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
@@ -19,8 +19,9 @@ package androidx.palette.graphics;
 import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java b/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
index 06123485c2e..4a164bb9f71 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
@@ -18,8 +18,8 @@ package androidx.palette.graphics;
 
 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/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java b/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
index fa62303bceb..c269141ed3d 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
@@ -25,8 +25,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import android.graphics.Color;
-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/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
index 995cf3ea6f0..d138c71d89a 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.support.test.InstrumentationRegistry;
 
 import androidx.palette.test.R;
+import androidx.test.InstrumentationRegistry;
 
 class TestUtils {
 
-- 
cgit v1.2.3