Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15256d9a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 20c8f61b 25046bd5

packages/PrintSpooler/tests/outofprocess/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

packages/PrintSpooler/tests/outofprocess/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/PrintSpooler/tests/outofprocess/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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;