commit b4470f271744e62e5c59cdcf2ea69aed0b679e7c
author Tadashi G. Takaoka <takaoka@google.com> Tue Jan 15 18:29:15 2019 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Jan 16 21:54:51 2019 +0000
tree 8ef1be878043fbe50b6daff6c1743482a154cc59
parent 4180876be42bb7708f8a1e68ab3a82efce174f8b

Use androidx.test instead of android.support.test

This CL mechanically changes package name of AndroidJUnitRunner, test
annotation classes, test filter classes, and etc. from android.support.test
to androidx.test.

This CL also copies WidgetTestUtils#runOnMainAndDrawSync() helper method
from CTS and eliminates compatibility-device-util from dependency.

Bug: None
Exempt-From-Owner-Approval: Large-scale refactor
Test: Run all non-flaky presubmit tests in FrameworksCoreTests
  $ tradefed.sh run commandAndExit FrameworksCoreTests \
        --include-annotation android.platform.test.annotations.Presubmit \
	--exclude-annotation androidx.test.filters.FlakyTest
  430 tests pass.
Change-Id: Ia65c4f643961afaa01c2c8d4b271712e574eb45c

core/tests/coretests/src/android/graphics/ColorStateListTest.java

diff --git a/core/tests/coretests/src/android/graphics/ColorStateListTest.java b/core/tests/coretests/src/android/graphics/ColorStateListTest.java
index 374d142..1d34f93 100644
--- a/core/tests/coretests/src/android/graphics/ColorStateListTest.java
+++ b/core/tests/coretests/src/android/graphics/ColorStateListTest.java
@@ -19,7 +19,8 @@
 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;