diff options
| author | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-12-18 19:06:37 -0800 |
|---|---|---|
| committer | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-12-18 19:06:37 -0800 |
| commit | 4a7acf8124ed4723473381f37d2a0b4006f3f70a (patch) | |
| tree | 99dcbab643f64fe5a7496f9fad48e3653b14fb5e | |
| parent | 26b3b076d67ba0a0b5bd5c62a0b197831a3ebd8f (diff) | |
| download | ex-4a7acf8124ed4723473381f37d2a0b4006f3f70a.tar.gz | |
Migrate frameworks/ex/camera2 to androidx.test
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I3c583c7872cb633c5328699bd9ecaacaac7440f8
| -rw-r--r-- | camera2/portability/tests/Android.bp | 2 | ||||
| -rw-r--r-- | camera2/portability/tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | camera2/utils/tests/Android.bp | 2 | ||||
| -rw-r--r-- | camera2/utils/tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/camera2/portability/tests/Android.bp b/camera2/portability/tests/Android.bp index 66bebb4b..09ccd899 100644 --- a/camera2/portability/tests/Android.bp +++ b/camera2/portability/tests/Android.bp @@ -22,7 +22,7 @@ android_test { "android-ex-camera2-portability", "android-ex-camera2-utils", "android-ex-camera2-utils-tests", - "android-support-test", + "androidx.test.rules", "mockito-target-minus-junit4", ], } diff --git a/camera2/portability/tests/AndroidManifest.xml b/camera2/portability/tests/AndroidManifest.xml index 65cf709e..0ad9534e 100644 --- a/camera2/portability/tests/AndroidManifest.xml +++ b/camera2/portability/tests/AndroidManifest.xml @@ -22,6 +22,6 @@ <application> <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.ex.camera2.portability.tests" /> </manifest> diff --git a/camera2/utils/tests/Android.bp b/camera2/utils/tests/Android.bp index ab727818..6be7f390 100644 --- a/camera2/utils/tests/Android.bp +++ b/camera2/utils/tests/Android.bp @@ -18,7 +18,7 @@ android_test { srcs: ["src/**/*.java"], static_libs: [ "android-ex-camera2-utils", - "android-support-test", + "androidx.test.rules", "mockito-target-minus-junit4", ], } diff --git a/camera2/utils/tests/AndroidManifest.xml b/camera2/utils/tests/AndroidManifest.xml index 2f3cc08d..9a9eb72b 100644 --- a/camera2/utils/tests/AndroidManifest.xml +++ b/camera2/utils/tests/AndroidManifest.xml @@ -22,6 +22,6 @@ <application> <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.ex.camera2.utils.tests" /> </manifest> diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java index b6f7bd0e..5e491bac 100644 --- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java +++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java @@ -21,7 +21,8 @@ import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraManager; import android.os.Handler; import android.os.HandlerThread; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import org.junit.After; import org.junit.AfterClass; |