Loading media/tests/MtpTests/Android.mk +1 −1 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := MtpTests LOCAL_PRIVATE_PLATFORM_APIS := true Loading media/tests/MtpTests/AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -25,7 +25,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="android.mtp" android:label="MtpTests"/> </manifest> media/tests/MtpTests/AndroidTest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -10,6 +10,6 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="android.mtp"/> <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration> No newline at end of file media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java +4 −7 Original line number Diff line number Diff line Loading @@ -18,20 +18,19 @@ package android.mtp; import android.os.FileUtils; import android.os.UserHandle; import android.os.storage.StorageVolume; import android.support.test.filters.SmallTest; import android.support.test.InstrumentationRegistry; import android.util.Log; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.junit.runners.MethodSorters; import java.io.File; import java.io.FileOutputStream; Loading @@ -39,8 +38,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.function.Predicate; import java.util.stream.Stream; /** * Tests for MtpStorageManager functionality. Loading Loading
media/tests/MtpTests/Android.mk +1 −1 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := MtpTests LOCAL_PRIVATE_PLATFORM_APIS := true Loading
media/tests/MtpTests/AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -25,7 +25,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="android.mtp" android:label="MtpTests"/> </manifest>
media/tests/MtpTests/AndroidTest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -10,6 +10,6 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="android.mtp"/> <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration> No newline at end of file
media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java +4 −7 Original line number Diff line number Diff line Loading @@ -18,20 +18,19 @@ package android.mtp; import android.os.FileUtils; import android.os.UserHandle; import android.os.storage.StorageVolume; import android.support.test.filters.SmallTest; import android.support.test.InstrumentationRegistry; import android.util.Log; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.junit.runners.MethodSorters; import java.io.File; import java.io.FileOutputStream; Loading @@ -39,8 +38,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.function.Predicate; import java.util.stream.Stream; /** * Tests for MtpStorageManager functionality. Loading