Remove testng dependency in car CTS tests
Fixes: 224573601
Test: atest CtsCarTestCases
Change-Id: I96562fc3ff6cae8100ca1a621522d70d136645b4
diff --git a/tests/tests/car/Android.bp b/tests/tests/car/Android.bp
index fd9cd29..0fc85a4 100644
--- a/tests/tests/car/Android.bp
+++ b/tests/tests/car/Android.bp
@@ -37,9 +37,6 @@
"compatibility-device-util-axt",
"truth-prebuilt",
"ctstestrunner-axt",
- // TODO: remove once Android migrates to JUnit 4.12,
- // which provides assertThrows
- "testng",
"libprotobuf-java-lite",
"vehicle-property-verifier",
],
diff --git a/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java b/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
index e963162..6679bbc 100644
--- a/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
@@ -17,22 +17,22 @@
package android.car.cts;
import static android.car.Car.PERMISSION_CAR_CONTROL_AUDIO_VOLUME;
-import static android.car.media.CarAudioManager.*;
+import static android.car.media.CarAudioManager.AUDIO_FEATURE_DYNAMIC_ROUTING;
+import static android.car.media.CarAudioManager.AUDIO_FEATURE_VOLUME_GROUP_MUTING;
+import static android.car.media.CarAudioManager.CarVolumeCallback;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.expectThrows;
import android.app.UiAutomation;
import android.car.Car;
import android.car.media.CarAudioManager;
import android.os.SystemClock;
import android.platform.test.annotations.AppModeFull;
-import android.util.Pair;
import android.view.KeyEvent;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -98,7 +98,7 @@
@Test
public void isAudioFeatureEnabled_withNonAudioFeature_fails() {
- IllegalArgumentException exception = expectThrows(IllegalArgumentException.class,
+ IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
() -> mCarAudioManager.isAudioFeatureEnabled(-1));
assertThat(exception).hasMessageThat().contains("Unknown Audio Feature");
@@ -114,7 +114,7 @@
public void registerCarVolumeCallback_nonNullCallback_throwsPermissionError() {
mCallback = new SyncCarVolumeCallback();
- Exception e = expectThrows(SecurityException.class,
+ Exception e = assertThrows(SecurityException.class,
() -> mCarAudioManager.registerCarVolumeCallback(mCallback));
assertThat(e.getMessage()).contains(PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
@@ -215,7 +215,7 @@
runWithCarControlAudioVolumePermission(
() -> mCarAudioManager.registerCarVolumeCallback(mCallback));
- Exception e = expectThrows(SecurityException.class,
+ Exception e = assertThrows(SecurityException.class,
() -> mCarAudioManager.unregisterCarVolumeCallback(mCallback));
assertThat(e.getMessage()).contains(PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
diff --git a/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java b/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
index 079dd6e..40a627b 100644
--- a/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
@@ -19,7 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.testng.Assert.assertThrows;
+import static org.junit.Assert.assertThrows;
import android.app.UiAutomation;
import android.car.Car;
diff --git a/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java b/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java
index 0fbabf1..c2a66c7 100644
--- a/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java
+++ b/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java
@@ -20,8 +20,8 @@
import static com.google.common.truth.Truth.assertWithMessage;
import static org.hamcrest.CoreMatchers.containsStringIgnoringCase;
+import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.testng.Assert.fail;
import android.app.UiAutomation;
import android.car.Car;
diff --git a/tests/tests/car/src/android/car/cts/CarWatchdogManagerTest.java b/tests/tests/car/src/android/car/cts/CarWatchdogManagerTest.java
index 3cc15ed..8a69680 100644
--- a/tests/tests/car/src/android/car/cts/CarWatchdogManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarWatchdogManagerTest.java
@@ -20,7 +20,7 @@
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.testng.Assert.assertThrows;
+import static org.junit.Assert.assertThrows;
import android.car.Car;
import android.car.watchdog.CarWatchdogManager;
