diff options
| author | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:47 -0800 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:47 -0800 |
| commit | 42781795bfef3f1cc659b058362324f52c69e0c9 (patch) | |
| tree | 000d2c8acb34cacf39b67bdfaa7e4a25250cc8f9 | |
| parent | 699fa8e25fcf38184ba20ea9a359b4620d75ac44 (diff) | |
| download | services-42781795bfef3f1cc659b058362324f52c69e0c9.tar.gz | |
Migrate frameworks/opt/car/services to androidx.test
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I54232c1129203a657bf60ed82b0cfeb333997264
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/src/com/android/internal/car/CarHelperServiceTest.java | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index f307cf7..bb5e149 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES += \ services LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ android.car.userlib \ junit \ mockito-target-minus-junit4 \ diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index dd71419..008655a 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -18,7 +18,7 @@ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" package="com.android.internal.car" android:sharedUserId="android.uid.system" > - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.internal.car" android:label="Unit Tests for Car Framework Services"/> diff --git a/tests/src/com/android/internal/car/CarHelperServiceTest.java b/tests/src/com/android/internal/car/CarHelperServiceTest.java index 3d62b0a..ea08095 100644 --- a/tests/src/com/android/internal/car/CarHelperServiceTest.java +++ b/tests/src/com/android/internal/car/CarHelperServiceTest.java @@ -22,16 +22,20 @@ import static org.mockito.Mockito.verify; import android.car.userlib.CarUserManagerHelper; import android.content.Context; import android.content.pm.UserInfo; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; + import com.android.server.SystemService; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.List; + /** * This class contains unit tests for the {@link CarServiceHelperService}. * |