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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-20 23:53:33 +00:00
committed by Android (Google) Code Review
parent b93b626cbf 2d6c5fc3bf
commit 6634ae2cf3
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ExternalStorageProvider/tests/Android.bp
View File

@@ -14,7 +14,7 @@ android_test {
],
static_libs: [
"android-support-test",
"androidx.test.rules",
"mockito-target",
"truth-prebuilt",
],

2
packages/ExternalStorageProvider/tests/AndroidManifest.xml
View File

@@ -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>

2
packages/ExternalStorageProvider/tests/AndroidTest.xml
View File

@@ -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>

5
packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java
View File

@@ -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;