Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make internal printing tests compatible with helpers" into rvc-dev am: 5b3e4d946f am: 44fb3f71c5 am: f9acfe77f3

Browse Source 
Change-Id: I7c5557c5752932f30d2fed7e68f5a393fef43ea9
This commit is contained in:
TreeHugger Robot
2020-04-10 23:39:11 +00:00
committed by Automerger Merge Worker
parent 620d5354dc f9acfe77f3
commit 440dd29d04
6 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/coretests/Android.bp
View File

@@ -72,6 +72,7 @@ android_test {
":BinderDeathRecipientHelperApp1", ":BinderDeathRecipientHelperApp1",
":BinderDeathRecipientHelperApp2", ":BinderDeathRecipientHelperApp2",
], ],
required: ["com.android.cts.helpers.aosp"],
} }
// Rules to copy all the test apks to the intermediate raw resource directory // Rules to copy all the test apks to the intermediate raw resource directory

3
core/tests/coretests/AndroidTest.xml
View File

@@ -24,6 +24,9 @@
<option name="test-file-name" value="BinderDeathRecipientHelperApp1.apk" /> <option name="test-file-name" value="BinderDeathRecipientHelperApp1.apk" />
<option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" /> <option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" />
</target_preparer> </target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInteractionHelperInstaller" />
<option name="test-tag" value="FrameworksCoreTests" /> <option name="test-tag" value="FrameworksCoreTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" > <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.frameworks.coretests" /> <option name="package" value="com.android.frameworks.coretests" />

5
core/tests/coretests/src/android/print/IPrintManagerParametersTest.java
View File

@@ -41,6 +41,7 @@ import android.print.test.services.PrintServiceCallbacks;
import android.print.test.services.PrinterDiscoverySessionCallbacks; import android.print.test.services.PrinterDiscoverySessionCallbacks;
import android.print.test.services.StubbablePrinterDiscoverySession; import android.print.test.services.StubbablePrinterDiscoverySession;
import android.printservice.recommendation.IRecommendationsChangeListener; import android.printservice.recommendation.IRecommendationsChangeListener;
import android.support.test.uiautomator.UiDevice;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
@@ -71,6 +72,10 @@ public class IPrintManagerParametersTest extends BasePrintTest {
private IPrintManager mIPrintManager; private IPrintManager mIPrintManager;
public static UiDevice getUiDevice() {
return UiDevice.getInstance(getInstrumentation());
}
/** /**
* Create a new IPrintManagerParametersTest and setup basic fields. * Create a new IPrintManagerParametersTest and setup basic fields.
*/ */

1
packages/PrintSpooler/tests/outofprocess/Android.bp
View File

@@ -27,4 +27,5 @@ android_test {
sdk_version: "test_current", sdk_version: "test_current",
test_suites: ["device-tests"], test_suites: ["device-tests"],
required: ["com.android.cts.helpers.aosp"],
} }

2
packages/PrintSpooler/tests/outofprocess/AndroidTest.xml
View File

@@ -18,6 +18,8 @@
<option name="test-file-name" value="PrintSpoolerOutOfProcessTests.apk" /> <option name="test-file-name" value="PrintSpoolerOutOfProcessTests.apk" />
</target_preparer> </target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInteractionHelperInstaller" />
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />
<option name="test-tag" value="PrintSpoolerOutOfProcessTests" /> <option name="test-tag" value="PrintSpoolerOutOfProcessTests" />
<option name="config-descriptor:metadata" key="component" value="print" /> <option name="config-descriptor:metadata" key="component" value="print" />

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

@@ -36,6 +36,7 @@ import android.print.test.services.FirstPrintService;
import android.print.test.services.PrinterDiscoverySessionCallbacks; import android.print.test.services.PrinterDiscoverySessionCallbacks;
import android.print.test.services.StubbablePrinterDiscoverySession; import android.print.test.services.StubbablePrinterDiscoverySession;
import android.support.test.uiautomator.By; import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject; import android.support.test.uiautomator.UiObject;
import android.support.test.uiautomator.UiObjectNotFoundException; import android.support.test.uiautomator.UiObjectNotFoundException;
import android.support.test.uiautomator.UiSelector; import android.support.test.uiautomator.UiSelector;
@@ -78,6 +79,10 @@ public class WorkflowTest extends BasePrintTest {
void accept(T t) throws InterruptedException; void accept(T t) throws InterruptedException;
} }
public static UiDevice getUiDevice() {
return UiDevice.getInstance(getInstrumentation());
}
/** /**
* Execute {@code waiter} until {@code condition} is met. * Execute {@code waiter} until {@code condition} is met.
* *