Migrate frameworks/base/packages/PrintSpooler/tests/outofprocess to androidx.test

See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I40cc079c663e22a32adc7b7a519d11d8f85a7880
This commit is contained in:
KOUSHIK PANUGANTI
2018-12-18 14:10:55 -08:00
parent 4465267f1d
commit 25046bd5dc
4 changed files with 5 additions and 4 deletions

View File

@@ -19,7 +19,7 @@ android_test {
libs: ["android.test.runner.stubs"],
static_libs: [
"android-support-test",
"androidx.test.rules",
"ub-uiautomator",
"mockito-target-minus-junit4",
"print-test-util-lib",

View File

@@ -54,7 +54,7 @@
</application>
<!-- This runs in its own process, hence it instruments itself -->
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.printspooler.outofprocess.tests"
android:label="PrintSpooler Out of Process Test Cases">
</instrumentation>

View File

@@ -24,7 +24,7 @@
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.printspooler.outofprocess.tests" />
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
<option name="hidden-api-checks" value="false"/>
</test>
</configuration>

View File

@@ -35,7 +35,6 @@ import android.print.test.services.AddPrintersActivity;
import android.print.test.services.FirstPrintService;
import android.print.test.services.PrinterDiscoverySessionCallbacks;
import android.print.test.services.StubbablePrinterDiscoverySession;
import android.support.test.filters.LargeTest;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiObject;
import android.support.test.uiautomator.UiObjectNotFoundException;
@@ -43,6 +42,8 @@ import android.support.test.uiautomator.UiSelector;
import android.support.test.uiautomator.Until;
import android.util.Log;
import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;