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

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

Merge "Migrate frameworks/base/packages/CarrierDefaultApp/tests/unit to androidx.test"

parents 59bb4793 79f430e2

packages/CarrierDefaultApp/tests/unit/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LOCAL_CERTIFICATE := platform 


LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.test.base



LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules mockito-target-minus-junit4



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)

packages/CarrierDefaultApp/tests/unit/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <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.carrierdefaultapp"

        android:label="CarrierDefaultApp Unit Test Cases">

    </instrumentation>