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

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

Merge "Migrate packages/apps/PermissionController to androidx.test"

parents 156a9390 2b8e6c77

test/instrumentation/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs 
LOCAL_PROGUARD_ENABLED := disabled



LOCAL_STATIC_JAVA_LIBRARIES := \

    ctstestrunner \

    compatibility-device-util \

	androidx.annotation_annotation \

	androidx.test.runner \

	androidx.test.rules \

test/instrumentation/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

            android:targetPackage="com.android.permissioncontroller" />

</manifest>

test/instrumentation/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 


    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.permissioncontrollertest" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

    </test>

</configuration>

test/instrumentation/src/com/android/permissioncontrollertesthelper/incident/RequestConfirmationTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ import android.content.Context; 
import android.content.res.Resources;

import android.os.ConditionVariable;

import android.os.IncidentManager;

import android.support.test.InstrumentationRegistry;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.BySelector;

import androidx.test.uiautomator.UiDevice;