diff options
| author | Benjamin Gordon <bmgordon@google.com> | 2020-04-10 10:14:49 -0600 |
|---|---|---|
| committer | Benjamin Gordon <bmgordon@google.com> | 2020-04-10 14:57:22 -0600 |
| commit | 65bab93fcc9e7b57bb1e33f3c34a585edda3a991 (patch) | |
| tree | 61d60ab89f121165a449689f5bf572fc106dc2bc /packages/PrintSpooler | |
| parent | 6651da4348361c2c670c54524e647a186488bd24 (diff) | |
Make internal printing tests compatible with helpers
WorkflowTest and IPrintManagerParametersTest extend BasePrintTest from
CtsPrintTestCases, which means they now try to load a helper when
BasePrintTest.setUp() runs. Add the helper installer target preparer
and package to their build files so that these can be found as expected.
With UiDevice being removed from BasePrintTest, also move getUiDevice()
over into the internal tests directly so that they can continue using it.
Bug: 153727434
Test: atest PrintSpoolerOutOfProcessTests android.test.IPrintManagerParametersTest
Change-Id: I7ff580c4288c83a69e319ff3668dcb98b11e4f41
Diffstat (limited to 'packages/PrintSpooler')
3 files changed, 8 insertions, 0 deletions
diff --git a/packages/PrintSpooler/tests/outofprocess/Android.bp b/packages/PrintSpooler/tests/outofprocess/Android.bp index c6dc26370ebc..0e028b04aaaf 100644 --- a/packages/PrintSpooler/tests/outofprocess/Android.bp +++ b/packages/PrintSpooler/tests/outofprocess/Android.bp @@ -27,4 +27,5 @@ android_test { sdk_version: "test_current", test_suites: ["device-tests"], + required: ["com.android.cts.helpers.aosp"], } diff --git a/packages/PrintSpooler/tests/outofprocess/AndroidTest.xml b/packages/PrintSpooler/tests/outofprocess/AndroidTest.xml index b649e82d10bc..922d73511815 100644 --- a/packages/PrintSpooler/tests/outofprocess/AndroidTest.xml +++ b/packages/PrintSpooler/tests/outofprocess/AndroidTest.xml @@ -18,6 +18,8 @@ <option name="test-file-name" value="PrintSpoolerOutOfProcessTests.apk" /> </target_preparer> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInteractionHelperInstaller" /> + <option name="test-suite-tag" value="apct" /> <option name="test-tag" value="PrintSpoolerOutOfProcessTests" /> <option name="config-descriptor:metadata" key="component" value="print" /> diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java index 61c2f54a2bf9..132545b2d5d2 100644 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java +++ b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java @@ -36,6 +36,7 @@ import android.print.test.services.FirstPrintService; import android.print.test.services.PrinterDiscoverySessionCallbacks; import android.print.test.services.StubbablePrinterDiscoverySession; import android.support.test.uiautomator.By; +import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; import android.support.test.uiautomator.UiObjectNotFoundException; import android.support.test.uiautomator.UiSelector; @@ -78,6 +79,10 @@ public class WorkflowTest extends BasePrintTest { void accept(T t) throws InterruptedException; } + public static UiDevice getUiDevice() { + return UiDevice.getInstance(getInstrumentation()); + } + /** * Execute {@code waiter} until {@code condition} is met. * |