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

Commit f9acfe77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make internal printing tests compatible with helpers" into rvc-dev am:... 

Merge "Make internal printing tests compatible with helpers" into rvc-dev am: 5b3e4d94 am: 44fb3f71

Change-Id: I94d0bacee3bbefa46f1eb877a0a97328d1082dd3
parents 97b95951 44fb3f71

core/tests/coretests/Android.bp

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

core/tests/coretests/AndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -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" />

core/tests/coretests/src/android/print/IPrintManagerParametersTest.java

+5 −0
Original line number Diff line number Diff line
@@ -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.

     */

packages/PrintSpooler/tests/outofprocess/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ android_test { 


    sdk_version: "test_current",

    test_suites: ["device-tests"],

    required: ["com.android.cts.helpers.aosp"],

}

packages/PrintSpooler/tests/outofprocess/AndroidTest.xml

+2 −0
Original line number Diff line number Diff line
@@ -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" />