Migrate bootable/recovery to androidx.test
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: I0740a2205e6b3893ba292cd841592ea85071eefb
This commit is contained in:
@@ -23,7 +23,7 @@ android_test {
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"android-support-test",
|
||||
"androidx.test.runner",
|
||||
"mockito-target-minus-junit4",
|
||||
"guava",
|
||||
],
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<uses-library android:name="android.test.runner" />
|
||||
</application>
|
||||
|
||||
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
|
||||
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
|
||||
android:targetPackage="com.example.android.systemupdatersample"
|
||||
android:label="Tests for SystemUpdaterSample."/>
|
||||
|
||||
|
||||
+4
-3
@@ -21,9 +21,10 @@ import static org.junit.Assert.assertSame;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import android.content.Context;
|
||||
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.example.android.systemupdatersample.tests.R;
|
||||
import com.google.common.io.CharStreams;
|
||||
|
||||
+4
-3
@@ -26,9 +26,10 @@ import static org.mockito.Mockito.when;
|
||||
import android.content.Context;
|
||||
import android.os.UpdateEngine;
|
||||
import android.os.UpdateEngineCallback;
|
||||
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.example.android.systemupdatersample.tests.R;
|
||||
import com.example.android.systemupdatersample.util.PayloadSpecs;
|
||||
|
||||
+4
-3
@@ -19,9 +19,10 @@ package com.example.android.systemupdatersample.util;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import android.content.Context;
|
||||
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.example.android.systemupdatersample.tests.R;
|
||||
|
||||
|
||||
+4
-3
@@ -22,9 +22,10 @@ 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.filters.SmallTest;
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.example.android.systemupdatersample.PayloadSpec;
|
||||
import com.example.android.systemupdatersample.tests.R;
|
||||
|
||||
+2
-2
@@ -18,8 +18,8 @@ package com.example.android.systemupdatersample.util;
|
||||
|
||||
import static org.junit.Assert.assertArrayEquals;
|
||||
|
||||
import android.support.test.filters.SmallTest;
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.example.android.systemupdatersample.UpdateConfig;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user