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

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

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

parents b93b626c 2d6c5fc3

packages/ExternalStorageProvider/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ android_test { 
    ],



    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "mockito-target",

        "truth-prebuilt",

    ],

packages/ExternalStorageProvider/tests/AndroidManifest.xml

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

                     android:label="ExternalStorageProvider Tests" />

</manifest>

packages/ExternalStorageProvider/tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <option name="test-tag" value="ExternalStorageProviderTests" />

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

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

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

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

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java

+3 −2
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;



import android.content.pm.ProviderInfo;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;