From 65bab93fcc9e7b57bb1e33f3c34a585edda3a991 Mon Sep 17 00:00:00 2001
From: Benjamin Gordon <bmgordon@google.com>
Date: Fri, 10 Apr 2020 10:14:49 -0600
Subject: [PATCH] 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
---
 core/tests/coretests/Android.bp                              | 1 +
 core/tests/coretests/AndroidTest.xml                         | 3 +++
 .../src/android/print/IPrintManagerParametersTest.java       | 5 +++++
 packages/PrintSpooler/tests/outofprocess/Android.bp          | 1 +
 packages/PrintSpooler/tests/outofprocess/AndroidTest.xml     | 2 ++
 .../printspooler/outofprocess/tests/WorkflowTest.java        | 5 +++++
 6 files changed, 17 insertions(+)

diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index 8d51a60000863..1e16ee052899c 100644
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -72,6 +72,7 @@ android_test {
         ":BinderDeathRecipientHelperApp1",
         ":BinderDeathRecipientHelperApp2",
     ],
+    required: ["com.android.cts.helpers.aosp"],
 }
 
 // Rules to copy all the test apks to the intermediate raw resource directory
diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml
index ed9d3f54ef3d1..04952bdfa3898 100644
--- a/core/tests/coretests/AndroidTest.xml
+++ b/core/tests/coretests/AndroidTest.xml
@@ -24,6 +24,9 @@
         <option name="test-file-name" value="BinderDeathRecipientHelperApp1.apk" />
         <option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" />
     </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInteractionHelperInstaller" />
+
     <option name="test-tag" value="FrameworksCoreTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.coretests" />
diff --git a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java
index 94d85e63cc5f1..4dd4d1c7bd12f 100644
--- a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java
+++ b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java
@@ -41,6 +41,7 @@ import android.print.test.services.PrintServiceCallbacks;
 import android.print.test.services.PrinterDiscoverySessionCallbacks;
 import android.print.test.services.StubbablePrinterDiscoverySession;
 import android.printservice.recommendation.IRecommendationsChangeListener;
+import android.support.test.uiautomator.UiDevice;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
@@ -71,6 +72,10 @@ public class IPrintManagerParametersTest extends BasePrintTest {
 
     private IPrintManager mIPrintManager;
 
+    public static UiDevice getUiDevice() {
+        return UiDevice.getInstance(getInstrumentation());
+    }
+
     /**
      * Create a new IPrintManagerParametersTest and setup basic fields.
      */
diff --git a/packages/PrintSpooler/tests/outofprocess/Android.bp b/packages/PrintSpooler/tests/outofprocess/Android.bp
index c6dc26370ebcf..0e028b04aaaf1 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 b649e82d10bc2..922d73511815a 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 61c2f54a2bf9d..132545b2d5d24 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.
      *