Replaced JUnit asserts by Truth on AndroidCarApiTest.
Test: atest AndroidCarApiTest
Bug: 142554800
Fixes: 155447204
Change-Id: I55f05bda87f19381db97d6590d1d2d4e9873297f
diff --git a/tests/android_car_api_test/src/android/car/apitest/AppBlockingPackageInfoTest.java b/tests/android_car_api_test/src/android/car/apitest/AppBlockingPackageInfoTest.java
index eb868e8..68ed348 100644
--- a/tests/android_car_api_test/src/android/car/apitest/AppBlockingPackageInfoTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/AppBlockingPackageInfoTest.java
@@ -24,32 +24,39 @@
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public class AppBlockingPackageInfoTest extends TestBase {
+public class AppBlockingPackageInfoTest {
private static final String TAG = AppBlockingPackageInfoTest.class.getSimpleName();
+ private final Context mContext = InstrumentationRegistry.getInstrumentation()
+ .getTargetContext();
+
@Test
public void testParcellingSystemInfo() throws Exception {
- AppBlockingPackageInfo carServiceInfo = createInfoCarService(getContext());
+ AppBlockingPackageInfo carServiceInfo = createInfoCarService(mContext);
Parcel dest = Parcel.obtain();
carServiceInfo.writeToParcel(dest, 0);
dest.setDataPosition(0);
AppBlockingPackageInfo carServiceInfoRead = new AppBlockingPackageInfo(dest);
Log.i(TAG, "expected:" + carServiceInfo + ",read:" + carServiceInfoRead);
- assertEquals(carServiceInfo, carServiceInfoRead);
+ assertThat(carServiceInfoRead).isEqualTo(carServiceInfo);
}
@Test
public void testParcellingNonSystemInfo() throws Exception {
- AppBlockingPackageInfo selfInfo = createInfoSelf(getContext());
+ AppBlockingPackageInfo selfInfo = createInfoSelf(mContext);
Parcel dest = Parcel.obtain();
selfInfo.writeToParcel(dest, 0);
dest.setDataPosition(0);
AppBlockingPackageInfo selfInfoRead = new AppBlockingPackageInfo(dest);
Log.i(TAG, "expected:" + selfInfo + ",read:" + selfInfoRead);
- assertEquals(selfInfo, selfInfoRead);
+ assertThat(selfInfoRead).isEqualTo(selfInfo);
}
public static AppBlockingPackageInfo createInfoCarService(Context context) {
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarApiTestBase.java b/tests/android_car_api_test/src/android/car/apitest/CarApiTestBase.java
index 9c73854..811a400 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarApiTestBase.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarApiTestBase.java
@@ -16,19 +16,24 @@
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import android.car.Car;
import android.content.ComponentName;
+import android.content.Context;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.Looper;
+import androidx.test.platform.app.InstrumentationRegistry;
+
import org.junit.After;
import org.junit.Before;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-abstract class CarApiTestBase extends TestBase {
+abstract class CarApiTestBase {
protected static final long DEFAULT_WAIT_TIMEOUT_MS = 1000;
private Car mCar;
@@ -52,8 +57,12 @@
return mCar;
}
+ protected final Context getContext() {
+ return InstrumentationRegistry.getInstrumentation().getTargetContext();
+ }
+
protected static void assertMainThread() {
- assertTrue(Looper.getMainLooper().isCurrentThread());
+ assertThat(Looper.getMainLooper().isCurrentThread()).isTrue();
}
protected static final class DefaultServiceConnectionListener implements ServiceConnection {
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarAppBlockingPolicyTest.java b/tests/android_car_api_test/src/android/car/apitest/CarAppBlockingPolicyTest.java
index 80d52c5..51cb1e3 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarAppBlockingPolicyTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarAppBlockingPolicyTest.java
@@ -17,22 +17,30 @@
import android.car.content.pm.AppBlockingPackageInfo;
import android.car.content.pm.CarAppBlockingPolicy;
+import android.content.Context;
import android.os.Parcel;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public class CarAppBlockingPolicyTest extends TestBase {
+public class CarAppBlockingPolicyTest {
private static final String TAG = AppBlockingPackageInfoTest.class.getSimpleName();
+ private final Context mContext = InstrumentationRegistry.getInstrumentation()
+ .getTargetContext();
+
@Test
public void testParcelling() throws Exception {
AppBlockingPackageInfo carServiceInfo =
- AppBlockingPackageInfoTest.createInfoCarService(getContext());
+ AppBlockingPackageInfoTest.createInfoCarService(mContext);
AppBlockingPackageInfo selfInfo =
- AppBlockingPackageInfoTest.createInfoSelf(getContext());
+ AppBlockingPackageInfoTest.createInfoSelf(mContext);
// this is only for testing parcelling. contents has nothing to do with actual app blocking.
AppBlockingPackageInfo[] whitelists = new AppBlockingPackageInfo[] { carServiceInfo,
selfInfo };
@@ -43,6 +51,6 @@
dest.setDataPosition(0);
CarAppBlockingPolicy policyRead = new CarAppBlockingPolicy(dest);
Log.i(TAG, "expected:" + policyExpected + ",read:" + policyRead);
- assertEquals(policyExpected, policyRead);
+ assertThat(policyRead).isEqualTo(policyExpected);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarAppFocusManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarAppFocusManagerTest.java
index 57c18de..4a4681b 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarAppFocusManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarAppFocusManagerTest.java
@@ -18,6 +18,8 @@
import static android.car.CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED;
import static android.car.CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.car.Car;
@@ -47,7 +49,7 @@
@Before
public void setUp() throws Exception {
mManager = (CarAppFocusManager) getCar().getCarManager(Car.APP_FOCUS_SERVICE);
- assertNotNull(mManager);
+ assertThat(mManager).isNotNull();
// Request all application focuses and abandon them to ensure no active context is present
// when test starts.
@@ -97,20 +99,20 @@
manager.removeFocusListener(listener1, APP_FOCUS_TYPE_NAVIGATION);
- assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
- manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, new FocusOwnershipCallback()));
+ assertThat(manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, new FocusOwnershipCallback()))
+ .isEqualTo(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED);
// Unregistred from nav app, no events expected.
- assertFalse(listener1.waitForFocusChangeAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true));
- assertTrue(listener2.waitForFocusChangeAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(listener1.waitForFocusChangeAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true)).isFalse();
+ assertThat(listener2.waitForFocusChangeAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
manager.removeFocusListener(listener2, APP_FOCUS_TYPE_NAVIGATION);
- assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
- manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, new FocusOwnershipCallback()));
- assertFalse(listener2.waitForFocusChangeAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, new FocusOwnershipCallback()))
+ .isEqualTo(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(listener2.waitForFocusChangeAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION, true)).isFalse();
manager.removeFocusListener(listener2, 2);
manager.removeFocusListener(listener2, 2); // Double-unregister is OK
@@ -121,10 +123,9 @@
public void testFocusChange() throws Exception {
CarAppFocusManager manager1 = createManager();
CarAppFocusManager manager2 = createManager();
- assertNotNull(manager2);
- final int[] emptyFocus = new int[0];
+ assertThat(manager2).isNotNull();
- assertArrayEquals(emptyFocus, manager1.getActiveAppTypes());
+ assertThat(manager1.getActiveAppTypes()).asList().isEmpty();
FocusChangedListener change1 = new FocusChangedListener();
FocusChangedListener change2 = new FocusChangedListener();
FocusOwnershipCallback owner1 = new FocusOwnershipCallback();
@@ -133,82 +134,79 @@
manager2.addFocusListener(change2, APP_FOCUS_TYPE_NAVIGATION);
- assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
- manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner1));
- assertTrue(owner1.waitForOwnershipGrantAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
- int[] expectedFocuses = new int[] {APP_FOCUS_TYPE_NAVIGATION};
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
- assertTrue(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertFalse(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- assertTrue(change2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
- assertTrue(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner1))
+ .isEqualTo(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(owner1.waitForOwnershipGrantAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ int expectedFocus = APP_FOCUS_TYPE_NAVIGATION;
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(change2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
+ assertThat(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
- expectedFocuses = new int[] {
- APP_FOCUS_TYPE_NAVIGATION,
- };
- assertTrue(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertFalse(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+ expectedFocus = APP_FOCUS_TYPE_NAVIGATION;
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
// this should be no-op
change1.reset();
change2.reset();
- assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
- manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner1));
- assertTrue(owner1.waitForOwnershipGrantAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner1))
+ .isEqualTo(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(owner1.waitForOwnershipGrantAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
- assertFalse(change2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
- assertFalse(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(change2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isFalse();
+ assertThat(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isFalse();
- assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
- manager2.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner2));
- assertTrue(owner2.waitForOwnershipGrantAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(manager2.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner2))
+ .isEqualTo(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(owner2.waitForOwnershipGrantAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
- assertFalse(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertTrue(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
- assertTrue(owner1.waitForOwnershipLossAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(owner1.waitForOwnershipLossAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION)).isTrue();
// no-op as it is not owning it
change1.reset();
change2.reset();
manager1.abandonAppFocus(owner1, APP_FOCUS_TYPE_NAVIGATION);
- assertFalse(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertTrue(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
change1.reset();
change2.reset();
- assertFalse(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertTrue(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- expectedFocuses = new int[] {APP_FOCUS_TYPE_NAVIGATION};
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
+ expectedFocus = APP_FOCUS_TYPE_NAVIGATION;
+ assertThat(manager1.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
+ assertThat(manager2.getActiveAppTypes()).asList().containsExactly(expectedFocus).inOrder();
change1.reset();
change2.reset();
manager2.abandonAppFocus(owner2, APP_FOCUS_TYPE_NAVIGATION);
- assertFalse(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION));
- assertFalse(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION));
- expectedFocuses = emptyFocus;
- assertArrayEquals(expectedFocuses, manager1.getActiveAppTypes());
- assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
- assertTrue(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, false));
+ assertThat(manager1.isOwningFocus(owner1, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager2.isOwningFocus(owner2, APP_FOCUS_TYPE_NAVIGATION)).isFalse();
+ assertThat(manager1.getActiveAppTypes()).asList().isEmpty();
+ assertThat(manager2.getActiveAppTypes()).asList().isEmpty();
+ assertThat(change1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, false)).isTrue();
manager1.removeFocusListener(change1);
manager2.removeFocusListener(change2);
@@ -220,8 +218,8 @@
CarAppFocusManager manager1 = createManager(getContext(), mEventThread);
CarAppFocusManager manager2 = createManager(getContext(), mEventThread);
- assertArrayEquals(new int[0], manager1.getActiveAppTypes());
- assertArrayEquals(new int[0], manager2.getActiveAppTypes());
+ assertThat(manager1.getActiveAppTypes()).asList().isEmpty();
+ assertThat(manager2.getActiveAppTypes()).asList().isEmpty();
FocusChangedListener listener1 = new FocusChangedListener();
FocusChangedListener listener2 = new FocusChangedListener();
@@ -229,23 +227,23 @@
manager1.addFocusListener(listener1, APP_FOCUS_TYPE_NAVIGATION);
manager2.addFocusListener(listener2, APP_FOCUS_TYPE_NAVIGATION);
- assertEquals(APP_FOCUS_REQUEST_SUCCEEDED,
- manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner));
- assertTrue(owner.waitForOwnershipGrantAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(manager1.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner))
+ .isEqualTo(APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(owner.waitForOwnershipGrantAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
- assertTrue(listener1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
- assertTrue(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(listener1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
+ assertThat(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
listener1.reset();
listener2.reset();
manager1.abandonAppFocus(owner, APP_FOCUS_TYPE_NAVIGATION);
- assertTrue(listener1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, false));
- assertTrue(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, false));
+ assertThat(listener1.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, false)).isTrue();
+ assertThat(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, false)).isTrue();
}
private CarAppFocusManager createManager() throws InterruptedException {
@@ -256,7 +254,7 @@
LooperThread eventThread) throws InterruptedException {
Car car = createCar(context, eventThread);
CarAppFocusManager manager = (CarAppFocusManager) car.getCarManager(Car.APP_FOCUS_SERVICE);
- assertNotNull(manager);
+ assertThat(manager).isNotNull();
return manager;
}
@@ -265,7 +263,7 @@
DefaultServiceConnectionListener connectionListener =
new DefaultServiceConnectionListener();
Car car = Car.createCar(context, connectionListener, eventThread.mHandler);
- assertNotNull(car);
+ assertThat(car).isNotNull();
car.connect();
connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
return car;
@@ -281,23 +279,23 @@
manager.addFocusListener(listener, APP_FOCUS_TYPE_NAVIGATION);
manager.addFocusListener(listener2, APP_FOCUS_TYPE_NAVIGATION);
- assertEquals(APP_FOCUS_REQUEST_SUCCEEDED,
- manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner));
- assertTrue(owner.waitForOwnershipGrantAndAssert(
- DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(manager.requestAppFocus(APP_FOCUS_TYPE_NAVIGATION, owner))
+ .isEqualTo(APP_FOCUS_REQUEST_SUCCEEDED);
+ assertThat(owner.waitForOwnershipGrantAndAssert(
+ DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION)).isTrue();
- assertTrue(listener.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
- assertTrue(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, true));
+ assertThat(listener.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
+ assertThat(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, true)).isTrue();
listener.reset();
listener2.reset();
manager.abandonAppFocus(owner, APP_FOCUS_TYPE_NAVIGATION);
- assertTrue(listener.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, false));
- assertTrue(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
- APP_FOCUS_TYPE_NAVIGATION, false));
+ assertThat(listener.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, false)).isTrue();
+ assertThat(listener2.waitForFocusChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+ APP_FOCUS_TYPE_NAVIGATION, false)).isTrue();
}
private final class FocusChangedListener
@@ -313,8 +311,8 @@
return false;
}
- assertEquals(expectedAppType, mLastChangeAppType);
- assertEquals(expectedAppActive, mLastChangeAppActive);
+ assertThat(mLastChangeAppType).isEqualTo(expectedAppType);
+ assertThat(mLastChangeAppActive).isEqualTo(expectedAppActive);
return true;
}
@@ -345,7 +343,7 @@
if (!mLossEventWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
return false;
}
- assertEquals(expectedAppType, mLastLossEvent);
+ assertThat(mLastLossEvent).isEqualTo(expectedAppType);
return true;
}
@@ -354,7 +352,7 @@
if (!mGrantEventWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
return false;
}
- assertEquals(expectedAppType, mLastGrantEvent);
+ assertThat(mLastGrantEvent).isEqualTo(expectedAppType);
return true;
}
@@ -375,7 +373,7 @@
}
private void assertEventThread() {
- assertEquals(mEventThread, Thread.currentThread());
+ assertThat(Thread.currentThread()).isSameAs(mEventThread);
}
private static final class LooperThread extends Thread {
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarCabinManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarCabinManagerTest.java
index d2f705c..cc258c2 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarCabinManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarCabinManagerTest.java
@@ -15,6 +15,8 @@
*/
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.fail;
import android.car.Car;
@@ -40,7 +42,7 @@
@Before
public void setUp() throws Exception {
mCabinManager = (CarCabinManager) getCar().getCarManager(Car.CABIN_SERVICE);
- assertNotNull(mCabinManager);
+ assertThat(mCabinManager).isNotNull();
}
@Test
@@ -67,8 +69,8 @@
case CarCabinManager.ID_MIRROR_FOLD:
case CarCabinManager.ID_SEAT_BELT_BUCKLED:
case CarCabinManager.ID_WINDOW_LOCK:
- assertEquals(Boolean.class, property.getPropertyType());
- assertFalse(property.isGlobalProperty());
+ assertThat(property.getPropertyType()).isAssignableTo(Boolean.class);
+ assertThat(property.isGlobalProperty()).isFalse();
break;
// Zoned integer properties
@@ -106,13 +108,13 @@
case CarCabinManager.ID_SEAT_HEADREST_FORE_AFT_MOVE:
case CarCabinManager.ID_WINDOW_POS:
case CarCabinManager.ID_WINDOW_MOVE:
- assertEquals(Integer.class, property.getPropertyType());
- assertFalse(property.isGlobalProperty());
+ assertThat(property.getPropertyType()).isAssignableTo(Integer.class);
+ assertThat(property.isGlobalProperty()).isFalse();
checkIntMinMax(property);
break;
default:
Log.e(TAG, "Property ID not handled: " + propId);
- assertTrue(false);
+ assertThat(false).isTrue();
break;
}
}
@@ -121,23 +123,23 @@
Log.i(TAG, "checkIntMinMax property:" + property);
if (!property.isGlobalProperty()) {
int[] areaIds = property.getAreaIds();
- assertTrue(areaIds.length > 0);
- assertEquals(areaIds.length, property.getAreaCount());
+ assertThat(areaIds.length).isGreaterThan(0);
+ assertThat(property.getAreaCount()).isEqualTo(areaIds.length);
for (int areId : areaIds) {
- assertTrue(property.hasArea(areId));
+ assertThat(property.hasArea(areId)).isTrue();
int min = property.getMinValue(areId);
int max = property.getMaxValue(areId);
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
}
} else {
int min = property.getMinValue();
int max = property.getMaxValue();
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
for (int i = 0; i < 32; i++) {
- assertFalse(property.hasArea(0x1 << i));
- assertNull(property.getMinValue(0x1 << i));
- assertNull(property.getMaxValue(0x1 << i));
+ assertThat(property.hasArea(0x1 << i)).isFalse();
+ assertThat(property.getMinValue(0x1 << i)).isNull();
+ assertThat(property.getMaxValue(0x1 << i)).isNull();
}
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
index 144158b..c038320 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
@@ -16,6 +16,8 @@
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assume.assumeTrue;
import android.car.Car;
@@ -36,7 +38,7 @@
Car car = getCar();
assumeTrue(car.isFeatureEnabled(Car.DIAGNOSTIC_SERVICE));
mCarDiagnosticManager = (CarDiagnosticManager) car.getCarManager(Car.DIAGNOSTIC_SERVICE);
- assertNotNull(mCarDiagnosticManager);
+ assertThat(mCarDiagnosticManager).isNotNull();
}
/**
@@ -48,8 +50,8 @@
public void testLiveFrame() throws Exception {
CarDiagnosticEvent liveFrame = mCarDiagnosticManager.getLatestLiveFrame();
if (null != liveFrame) {
- assertTrue(liveFrame.isLiveFrame());
- assertFalse(liveFrame.isEmptyFrame());
+ assertThat(liveFrame.isLiveFrame()).isTrue();
+ assertThat(liveFrame.isEmptyFrame()).isFalse();
}
}
@@ -64,11 +66,11 @@
if (null != timestamps) {
for (long timestamp : timestamps) {
CarDiagnosticEvent freezeFrame = mCarDiagnosticManager.getFreezeFrame(timestamp);
- assertNotNull(freezeFrame);
- assertEquals(timestamp, freezeFrame.timestamp);
- assertTrue(freezeFrame.isFreezeFrame());
- assertFalse(freezeFrame.isEmptyFrame());
- assertNotSame("", freezeFrame.dtc);
+ assertThat(freezeFrame).isNotNull();
+ assertThat(freezeFrame.timestamp).isEqualTo(timestamp);
+ assertThat(freezeFrame.isFreezeFrame()).isTrue();
+ assertThat(freezeFrame.isEmptyFrame()).isFalse();
+ assertThat(freezeFrame.dtc).isNotEmpty();
}
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarHvacManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarHvacManagerTest.java
index c0f32db..6bea3e3 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarHvacManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarHvacManagerTest.java
@@ -15,6 +15,9 @@
*/
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
import static org.junit.Assert.fail;
import android.car.Car;
@@ -41,7 +44,7 @@
@Before
public void setUp() throws Exception {
mHvacManager = (CarHvacManager) getCar().getCarManager(Car.HVAC_SERVICE);
- assertNotNull(mHvacManager);
+ assertThat(mHvacManager).isNotNull();
}
@Test
@@ -61,9 +64,9 @@
@Test
public void testHvacPosition() {
- assertEquals(CarHvacManager.FAN_DIRECTION_FACE, VehicleHvacFanDirection.FACE);
- assertEquals(CarHvacManager.FAN_DIRECTION_FLOOR, VehicleHvacFanDirection.FLOOR);
- assertEquals(CarHvacManager.FAN_DIRECTION_DEFROST, VehicleHvacFanDirection.DEFROST);
+ assertThat(VehicleHvacFanDirection.FACE).isEqualTo(CarHvacManager.FAN_DIRECTION_FACE);
+ assertThat(VehicleHvacFanDirection.FLOOR).isEqualTo(CarHvacManager.FAN_DIRECTION_FLOOR);
+ assertThat(VehicleHvacFanDirection.DEFROST).isEqualTo(CarHvacManager.FAN_DIRECTION_DEFROST);
}
private void assertTypeAndZone(CarPropertyConfig property) {
@@ -109,35 +112,37 @@
}
}
- private void checkTypeAndGlobal(Class clazz, boolean global, CarPropertyConfig<Integer> property) {
- assertEquals("Wrong type, expecting " + clazz + " type for id:" + property.getPropertyId(),
- clazz, property.getPropertyType());
- assertEquals("Wrong zone, should " + (global ? "" : "not ") + "be global for id: " +
- property.getPropertyId() + ", area type:" + property.getAreaType(),
- global, property.isGlobalProperty());
+ private void checkTypeAndGlobal(Class<?> clazz, boolean global,
+ CarPropertyConfig<Integer> property) {
+ assertWithMessage("Wrong type, expecting %s type for id %s", clazz,
+ property.getPropertyId()).that(property.getPropertyType()).isEqualTo(clazz);
+ assertWithMessage(
+ "Wrong zone, should %s be global for id:%s, area type: %s" + property.getAreaType(),
+ property.getPropertyId(), property.getAreaType(), (global ? "" : "not "))
+ .that(property.isGlobalProperty()).isEqualTo(global);
}
private void checkIntMinMax(CarPropertyConfig<Integer> property) {
Log.i(TAG, "checkIntMinMax property:" + property);
if (!property.isGlobalProperty()) {
int[] areaIds = property.getAreaIds();
- assertTrue(areaIds.length > 0);
- assertEquals(areaIds.length, property.getAreaCount());
+ assertThat(areaIds.length).isGreaterThan(0);
+ assertThat(property.getAreaCount()).isEqualTo(areaIds.length);
for (int areaId : areaIds) {
- assertTrue(property.hasArea(areaId));
+ assertThat(property.hasArea(areaId)).isTrue();
int min = property.getMinValue(areaId) == null ? 0 : property.getMinValue(areaId);
int max = property.getMaxValue(areaId) == null ? 0 : property.getMaxValue(areaId);
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
}
} else {
int min = property.getMinValue() == null ? 0 : property.getMinValue();
int max = property.getMaxValue() == null ? 0 : property.getMinValue();
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
for (int i = 0; i < 32; i++) {
- assertFalse(property.hasArea(0x1 << i));
- assertNull(property.getMinValue(0x1 << i));
- assertNull(property.getMaxValue(0x1 << i));
+ assertThat(property.hasArea(0x1 << i)).isFalse();
+ assertThat(property.getMinValue(0x1 << i)).isNull();
+ assertThat(property.getMaxValue(0x1 << i)).isNull();
}
}
}
@@ -146,25 +151,25 @@
Log.i(TAG, "checkFloatMinMax property:" + property);
if (!property.isGlobalProperty()) {
int[] areaIds = property.getAreaIds();
- assertTrue(areaIds.length > 0);
- assertEquals(areaIds.length, property.getAreaCount());
+ assertThat(areaIds.length).isGreaterThan(0);
+ assertThat(property.getAreaCount()).isEqualTo(areaIds.length);
for (int areaId : areaIds) {
- assertTrue(property.hasArea(areaId));
+ assertThat(property.hasArea(areaId)).isTrue();
float min =
property.getMinValue(areaId) == null ? 0f : property.getMinValue(areaId);
float max =
property.getMaxValue(areaId) == null ? 0f : property.getMinValue(areaId);
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
}
} else {
float min = property.getMinValue() == null ? 0f : property.getMinValue();
float max = property.getMaxValue() == null ? 0f : property.getMinValue();
- assertTrue(min <= max);
+ assertThat(min).isAtMost(max);
for (int i = 0; i < 32; i++) {
- assertFalse(property.hasArea(0x1 << i));
- assertNull(property.getMinValue(0x1 << i));
- assertNull(property.getMaxValue(0x1 << i));
+ assertThat(property.hasArea(0x1 << i)).isFalse();
+ assertThat(property.getMinValue(0x1 << i)).isNull();
+ assertThat(property.getMaxValue(0x1 << i)).isNull();
}
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarInfoManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarInfoManagerTest.java
index 274c26b..298b28d 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarInfoManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarInfoManagerTest.java
@@ -20,6 +20,8 @@
import android.car.CarInfoManager;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Before;
import org.junit.Test;
@@ -31,19 +33,19 @@
@Before
public void setUp() throws Exception {
mInfoManager = (CarInfoManager) getCar().getCarManager(Car.INFO_SERVICE);
- assertNotNull(mInfoManager);
+ assertThat(mInfoManager).isNotNull();
}
@Test
public void testVehicleId() throws Exception {
- assertNotNull(mInfoManager.getVehicleId());
+ assertThat(mInfoManager.getVehicleId()).isNotNull();
}
@Test
public void testNotNullItems() throws Exception {
// call and check if it throws exception.
- assertNotNull(mInfoManager.getManufacturer());
- assertNotNull(mInfoManager.getModel());
- assertNotNull(mInfoManager.getModelYear());
+ assertThat(mInfoManager.getManufacturer()).isNotNull();
+ assertThat(mInfoManager.getModel()).isNotNull();
+ assertThat(mInfoManager.getModelYear()).isNotNull();
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarNavigationManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarNavigationManagerTest.java
index e7f7c9a..0d92400 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarNavigationManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarNavigationManagerTest.java
@@ -15,6 +15,8 @@
*/
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.car.Car;
@@ -61,7 +63,7 @@
(CarNavigationStatusManager) getCar().getCarManager(Car.CAR_NAVIGATION_SERVICE);
mCarAppFocusManager =
(CarAppFocusManager) getCar().getCarManager(Car.APP_FOCUS_SERVICE);
- assertNotNull(mCarAppFocusManager);
+ assertThat(mCarAppFocusManager).isNotNull();
}
@Test
@@ -80,33 +82,34 @@
Timestamp timestamp = Timestamp.newBuilder().build();
NavigationStateProto navigationStateProto = NavigationStateProto.newBuilder().build();
- assertNotNull(imageReference);
- assertNotNull(distance);
- assertNotNull(maneuver);
- assertNotNull(lane);
- assertNotNull(laneDirection);
- assertNotNull(cue);
- assertNotNull(cueElement);
- assertNotNull(step);
- assertNotNull(latLng);
- assertNotNull(destination);
- assertNotNull(road);
- assertNotNull(timestamp);
- assertNotNull(navigationStateProto);
+ assertThat(imageReference).isNotNull();
+ assertThat(distance).isNotNull();
+ assertThat(maneuver).isNotNull();
+ assertThat(lane).isNotNull();
+ assertThat(laneDirection).isNotNull();
+ assertThat(cue).isNotNull();
+ assertThat(cueElement).isNotNull();
+ assertThat(step).isNotNull();
+ assertThat(latLng).isNotNull();
+ assertThat(destination).isNotNull();
+ assertThat(road).isNotNull();
+ assertThat(timestamp).isNotNull();
+ assertThat(navigationStateProto).isNotNull();
- assertNotNull(ImageReference.parseFrom(imageReference.toByteArray()));
- assertNotNull(Distance.parseFrom(distance.toByteArray()));
- assertNotNull(Maneuver.parseFrom(maneuver.toByteArray()));
- assertNotNull(Lane.parseFrom(lane.toByteArray()));
- assertNotNull(LaneDirection.parseFrom(laneDirection.toByteArray()));
- assertNotNull(Cue.parseFrom(cue.toByteArray()));
- assertNotNull(CueElement.parseFrom(cueElement.toByteArray()));
- assertNotNull(Step.parseFrom(step.toByteArray()));
- assertNotNull(LatLng.parseFrom(latLng.toByteArray()));
- assertNotNull(Destination.parseFrom(destination.toByteArray()));
- assertNotNull(Road.parseFrom(road.toByteArray()));
- assertNotNull(Timestamp.parseFrom(timestamp.toByteArray()));
- assertNotNull(NavigationStateProto.parseFrom(navigationStateProto.toByteArray()));
+
+ assertThat(ImageReference.parseFrom(imageReference.toByteArray())).isNotNull();
+ assertThat(Distance.parseFrom(distance.toByteArray())).isNotNull();
+ assertThat(Maneuver.parseFrom(maneuver.toByteArray())).isNotNull();
+ assertThat(Lane.parseFrom(lane.toByteArray())).isNotNull();
+ assertThat(LaneDirection.parseFrom(laneDirection.toByteArray())).isNotNull();
+ assertThat(Cue.parseFrom(cue.toByteArray())).isNotNull();
+ assertThat(CueElement.parseFrom(cueElement.toByteArray())).isNotNull();
+ assertThat(Step.parseFrom(step.toByteArray())).isNotNull();
+ assertThat(LatLng.parseFrom(latLng.toByteArray())).isNotNull();
+ assertThat(Destination.parseFrom(destination.toByteArray())).isNotNull();
+ assertThat(Road.parseFrom(road.toByteArray())).isNotNull();
+ assertThat(Timestamp.parseFrom(timestamp.toByteArray())).isNotNull();
+ assertThat(NavigationStateProto.parseFrom(navigationStateProto.toByteArray())).isNotNull();
}
@Ignore("TODO(b/15534360)")
@@ -145,8 +148,8 @@
};
mCarAppFocusManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION,
ownershipCallback);
- assertTrue(mCarAppFocusManager.isOwningFocus(ownershipCallback,
- CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+ assertThat(mCarAppFocusManager.isOwningFocus(ownershipCallback,
+ CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION)).isTrue();
Log.i(TAG, "Instrument cluster: " + mCarNavigationManager.getInstrumentClusterInfo());
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarPackageManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarPackageManagerTest.java
index d447a08..b1b177d 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarPackageManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarPackageManagerTest.java
@@ -20,6 +20,8 @@
import android.car.content.pm.CarPackageManager;
import android.test.suitebuilder.annotation.MediumTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@MediumTest
@@ -29,6 +31,6 @@
public void testCreate() throws Exception {
CarPackageManager carPackageManager = (CarPackageManager) getCar()
.getCarManager(Car.PACKAGE_SERVICE);
- assertNotNull(carPackageManager);
+ assertThat(carPackageManager).isNotNull();
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarProjectionManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarProjectionManagerTest.java
index daba3c7..0d4d64b 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarProjectionManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarProjectionManagerTest.java
@@ -15,6 +15,8 @@
*/
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.app.Service;
@@ -71,7 +73,7 @@
@Before
public void setUp() throws Exception {
mManager = (CarProjectionManager) getCar().getCarManager(Car.PROJECTION_SERVICE);
- assertNotNull(mManager);
+ assertThat(mManager).isNotNull();
}
@Test
@@ -91,7 +93,7 @@
public void testRegisterProjectionRunner() throws Exception {
Intent intent = new Intent(
InstrumentationRegistry.getInstrumentation().getContext(), TestService.class);
- assertFalse(TestService.getBound());
+ assertThat(TestService.getBound()).isFalse();
mManager.registerProjectionRunner(intent);
synchronized (TestService.mLock) {
try {
@@ -100,7 +102,7 @@
// Do nothing
}
}
- assertTrue(TestService.getBound());
+ assertThat(TestService.getBound()).isTrue();
mManager.unregisterProjectionRunner(intent);
}
@@ -118,7 +120,7 @@
}
});
- assertTrue(startedLatch.await(30, TimeUnit.SECONDS));
+ assertThat(startedLatch.await(30, TimeUnit.SECONDS)).isTrue();
mManager.stopProjectionAccessPoint();
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarPropertyConfigTest.java b/tests/android_car_api_test/src/android/car/apitest/CarPropertyConfigTest.java
index 3d35b4c..ed0200f 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarPropertyConfigTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarPropertyConfigTest.java
@@ -16,6 +16,8 @@
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.car.VehicleAreaType;
@@ -46,17 +48,17 @@
.addAreaConfig(WINDOW_PASSENGER, 10f, 20f)
.build();
- assertEquals(FLOAT_PROPERTY_ID, config.getPropertyId());
- assertEquals(CAR_AREA_TYPE, config.getAreaType());
- assertEquals(Float.class, config.getPropertyType());
- assertEquals(2, config.getAreaCount());
+ assertThat(config.getPropertyId()).isEqualTo(FLOAT_PROPERTY_ID);
+ assertThat(config.getAreaType()).isEqualTo(CAR_AREA_TYPE);
+ assertThat(config.getPropertyType()).isEqualTo(Float.class);
+ assertThat(config.getAreaCount()).isEqualTo(2);
// We didn't assign any restrictions to WINDOW_DRIVER area.
- assertNull(config.getMinValue(WINDOW_DRIVER));
- assertNull(config.getMaxValue(WINDOW_DRIVER));
+ assertThat(config.getMinValue(WINDOW_DRIVER)).isNull();
+ assertThat(config.getMaxValue(WINDOW_DRIVER)).isNull();
- assertEquals(10f, config.getMinValue(WINDOW_PASSENGER));
- assertEquals(20f, config.getMaxValue(WINDOW_PASSENGER));
+ assertThat(config.getMinValue(WINDOW_PASSENGER)).isEqualTo(10f);
+ assertThat(config.getMaxValue(WINDOW_PASSENGER)).isEqualTo(20f);
return config;
}
@@ -68,17 +70,17 @@
writeToParcel(config);
CarPropertyConfig<Float> configRead = readFromParcel();
- assertEquals(FLOAT_PROPERTY_ID, configRead.getPropertyId());
- assertEquals(CAR_AREA_TYPE, configRead.getAreaType());
- assertEquals(Float.class, configRead.getPropertyType());
- assertEquals(2, configRead.getAreaCount());
+ assertThat(configRead.getPropertyId()).isEqualTo(FLOAT_PROPERTY_ID);
+ assertThat(configRead.getAreaType()).isEqualTo(CAR_AREA_TYPE);
+ assertThat(configRead.getPropertyType()).isEqualTo(Float.class);
+ assertThat(configRead.getAreaCount()).isEqualTo(2);
// We didn't assign any restrictions to WINDOW_DRIVER area.
- assertNull(configRead.getMinValue(WINDOW_DRIVER));
- assertNull(configRead.getMaxValue(WINDOW_DRIVER));
+ assertThat(configRead.getMinValue(WINDOW_DRIVER)).isNull();
+ assertThat(configRead.getMaxValue(WINDOW_DRIVER)).isNull();
- assertEquals(10f, configRead.getMinValue(WINDOW_PASSENGER));
- assertEquals(20f, configRead.getMaxValue(WINDOW_PASSENGER));
+ assertThat(configRead.getMinValue(WINDOW_PASSENGER)).isEqualTo(10f);
+ assertThat(configRead.getMaxValue(WINDOW_PASSENGER)).isEqualTo(20f);
}
@Test
@@ -93,16 +95,16 @@
writeToParcel(config);
CarPropertyConfig<Integer> configRead = readFromParcel();
- assertEquals(INT_PROPERTY_ID, configRead.getPropertyId());
- assertEquals(CAR_AREA_TYPE, configRead.getAreaType());
- assertEquals(Integer.class, configRead.getPropertyType());
- assertEquals(2, configRead.getAreaCount());
+ assertThat(configRead.getPropertyId()).isEqualTo(INT_PROPERTY_ID);
+ assertThat(configRead.getAreaType()).isEqualTo(CAR_AREA_TYPE);
+ assertThat(configRead.getPropertyType()).isEqualTo(Integer.class);
+ assertThat(configRead.getAreaCount()).isEqualTo(2);
- assertNull(configRead.getMinValue(WINDOW_DRIVER));
- assertNull(configRead.getMaxValue(WINDOW_DRIVER));
+ assertThat(configRead.getMinValue(WINDOW_DRIVER)).isNull();
+ assertThat(configRead.getMaxValue(WINDOW_DRIVER)).isNull();
- assertEquals(expectedMinValue, configRead.getMinValue(WINDOW_PASSENGER));
- assertEquals(expectedMaxValue, configRead.getMaxValue(WINDOW_PASSENGER));
+ assertThat(configRead.getMinValue(WINDOW_PASSENGER)).isEqualTo(expectedMinValue);
+ assertThat(configRead.getMaxValue(WINDOW_PASSENGER)).isEqualTo(expectedMaxValue);
}
@Test
@@ -117,16 +119,16 @@
writeToParcel(config);
CarPropertyConfig<Long> configRead = readFromParcel();
- assertEquals(LONG_PROPERTY_ID, configRead.getPropertyId());
- assertEquals(CAR_AREA_TYPE, configRead.getAreaType());
- assertEquals(Long.class, configRead.getPropertyType());
- assertEquals(2, configRead.getAreaCount());
+ assertThat(configRead.getPropertyId()).isEqualTo(LONG_PROPERTY_ID);
+ assertThat(configRead.getAreaType()).isEqualTo(CAR_AREA_TYPE);
+ assertThat(configRead.getPropertyType()).isEqualTo(Long.class);
+ assertThat(configRead.getAreaCount()).isEqualTo(2);
- assertNull(configRead.getMinValue(WINDOW_DRIVER));
- assertNull(configRead.getMaxValue(WINDOW_DRIVER));
+ assertThat(configRead.getMinValue(WINDOW_DRIVER)).isNull();
+ assertThat(configRead.getMaxValue(WINDOW_DRIVER)).isNull();
- assertEquals(expectedMinValue, configRead.getMinValue(WINDOW_PASSENGER));
- assertEquals(expectedMaxValue, configRead.getMaxValue(WINDOW_PASSENGER));
+ assertThat(configRead.getMinValue(WINDOW_PASSENGER)).isEqualTo(expectedMinValue);
+ assertThat(configRead.getMaxValue(WINDOW_PASSENGER)).isEqualTo(expectedMaxValue);
}
@Test
@@ -141,16 +143,16 @@
writeToParcel(config);
CarPropertyConfig<Integer[]> configRead = readFromParcel();
- assertEquals(INT_ARRAY_PROPERTY_ID, configRead.getPropertyId());
- assertEquals(CAR_AREA_TYPE, configRead.getAreaType());
- assertEquals(Integer[].class, configRead.getPropertyType());
- assertEquals(2, configRead.getAreaCount());
+ assertThat(configRead.getPropertyId()).isEqualTo(INT_ARRAY_PROPERTY_ID);
+ assertThat(configRead.getAreaType()).isEqualTo(CAR_AREA_TYPE);
+ assertThat(configRead.getPropertyType()).isEqualTo(Integer[].class);
+ assertThat(configRead.getAreaCount()).isEqualTo(2);
// We didn't assign any restrictions to WINDOW_DRIVER area.
- assertNull(configRead.getMinValue(WINDOW_PASSENGER));
- assertNull(configRead.getMaxValue(WINDOW_PASSENGER));
- assertNull(configRead.getMinValue(WINDOW_DRIVER));
- assertNull(configRead.getMaxValue(WINDOW_DRIVER));
+ assertThat(configRead.getMinValue(WINDOW_PASSENGER)).isNull();
+ assertThat(configRead.getMaxValue(WINDOW_PASSENGER)).isNull();
+ assertThat(configRead.getMinValue(WINDOW_DRIVER)).isNull();
+ assertThat(configRead.getMaxValue(WINDOW_DRIVER)).isNull();
}
@Test
@@ -167,7 +169,7 @@
// Type casting from raw CarPropertyConfig should be fine, just sanity check.
CarPropertyConfig<?> rawTypeConfig = readFromParcel();
- assertEquals(10f, rawTypeConfig.getMinValue(WINDOW_PASSENGER));
+ assertThat(rawTypeConfig.getMinValue(WINDOW_PASSENGER)).isEqualTo(10f);
// Wrote float, attempted to read integer.
assertThrows(ClassCastException.class, () -> {
@@ -189,11 +191,10 @@
CarPropertyConfig<Object> configRead = readFromParcel();
- assertEquals(MIXED_TYPE_PROPERTY_ID, configRead.getPropertyId());
- assertEquals(VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL, configRead.getAreaType());
- assertEquals(Object.class, configRead.getPropertyType());
- assertEquals(1, configRead.getAreaCount());
- assertArrayEquals(configArray.toArray(), configRead.getConfigArray().toArray());
-
+ assertThat(configRead.getPropertyId()).isEqualTo(MIXED_TYPE_PROPERTY_ID);
+ assertThat(configRead.getAreaType()).isEqualTo(VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL);
+ assertThat(configRead.getPropertyType()).isEqualTo(Object.class);
+ assertThat(configRead.getAreaCount()).isEqualTo(1);
+ assertThat(configRead.getConfigArray()).containsExactlyElementsIn(configArray).inOrder();
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarPropertyTestBase.java b/tests/android_car_api_test/src/android/car/apitest/CarPropertyTestBase.java
index f6e57ab..9649dc7 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarPropertyTestBase.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarPropertyTestBase.java
@@ -26,7 +26,7 @@
/**
* Base class to test {@link CarPropertyConfig} and {@link CarPropertyValue}.
*/
-public class CarPropertyTestBase extends TestBase {
+public class CarPropertyTestBase {
protected static final int FLOAT_PROPERTY_ID = 0x1160BEEF;
protected static final int INT_ARRAY_PROPERTY_ID = 0x0041BEEF;
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarPropertyValueTest.java b/tests/android_car_api_test/src/android/car/apitest/CarPropertyValueTest.java
index f6b0f4a..97fe7ba 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarPropertyValueTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarPropertyValueTest.java
@@ -20,6 +20,8 @@
import android.car.hardware.CarPropertyValue;
import android.test.suitebuilder.annotation.MediumTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
/**
@@ -36,20 +38,19 @@
writeToParcel(floatValue);
CarPropertyValue<Float> valueRead = readFromParcel();
- assertEquals(10f, valueRead.getValue());
+ assertThat(valueRead.getValue()).isEqualTo((Object) 10f);
}
@Test
public void testMixedValue() {
- Object[] values = {"android", 1, 2.0};
CarPropertyValue<Object> mixedValue =
new CarPropertyValue<>(MIXED_TYPE_PROPERTY_ID,
VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL,
- values);
+ new Object[] { "android", 1, 2.0 });
writeToParcel(mixedValue);
CarPropertyValue<Object[]> valueRead = readFromParcel();
- assertArrayEquals(values, valueRead.getValue());
- assertEquals(MIXED_TYPE_PROPERTY_ID, valueRead.getPropertyId());
- assertEquals(VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL, valueRead.getAreaId());
+ assertThat(valueRead.getValue()).asList().containsExactly("android", 1, 2.0).inOrder();
+ assertThat(valueRead.getPropertyId()).isEqualTo(MIXED_TYPE_PROPERTY_ID);
+ assertThat(valueRead.getAreaId()).isEqualTo(VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarSensorManagerTest.java b/tests/android_car_api_test/src/android/car/apitest/CarSensorManagerTest.java
index fd6ab08..95bc181 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarSensorManagerTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarSensorManagerTest.java
@@ -20,6 +20,8 @@
import android.car.hardware.CarSensorManager;
import android.test.suitebuilder.annotation.MediumTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@MediumTest
@@ -29,7 +31,7 @@
public void testCreate() throws Exception {
CarSensorManager carSensorManager = (CarSensorManager) getCar()
.getCarManager(Car.SENSOR_SERVICE);
- assertNotNull(carSensorManager);
+ assertThat(carSensorManager).isNotNull();
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarTest.java b/tests/android_car_api_test/src/android/car/apitest/CarTest.java
index 7625fb7..d1532d4 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarTest.java
@@ -16,25 +16,33 @@
package android.car.apitest;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.car.Car;
import android.car.ICar;
import android.car.hardware.CarSensorManager;
import android.content.ComponentName;
+import android.content.Context;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
import org.junit.Test;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@SmallTest
-public class CarTest extends TestBase {
+public class CarTest {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
+ private final Context mContext = InstrumentationRegistry.getInstrumentation()
+ .getTargetContext();
+
private final Semaphore mConnectionWait = new Semaphore(0);
private ICar mICar;
@@ -60,35 +68,35 @@
@Test
public void testCarConnection() throws Exception {
- Car car = Car.createCar(getContext(), mConnectionListener);
- assertFalse(car.isConnected());
- assertFalse(car.isConnecting());
+ Car car = Car.createCar(mContext, mConnectionListener);
+ assertThat(car.isConnected()).isFalse();
+ assertThat(car.isConnecting()).isFalse();
car.connect();
// TODO fix race here
// assertTrue(car.isConnecting()); // This makes test flaky.
waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
- assertTrue(car.isConnected());
- assertFalse(car.isConnecting());
+ assertThat(car.isConnected()).isTrue();
+ assertThat(car.isConnecting()).isFalse();
CarSensorManager carSensorManager =
(CarSensorManager) car.getCarManager(Car.SENSOR_SERVICE);
- assertNotNull(carSensorManager);
+ assertThat(carSensorManager).isNotNull();
CarSensorManager carSensorManager2 =
(CarSensorManager) car.getCarManager(Car.SENSOR_SERVICE);
- assertEquals(carSensorManager, carSensorManager2);
+ assertThat(carSensorManager2).isSameAs(carSensorManager);
Object noSuchService = car.getCarManager("No such service");
- assertNull(noSuchService);
+ assertThat(noSuchService).isNull();
// double disconnect should be safe.
car.disconnect();
car.disconnect();
- assertFalse(car.isConnected());
- assertFalse(car.isConnecting());
+ assertThat(car.isConnected()).isFalse();
+ assertThat(car.isConnecting()).isFalse();
}
@Test
public void testDoubleConnect() throws Exception {
- Car car = Car.createCar(getContext(), mConnectionListener);
- assertFalse(car.isConnected());
- assertFalse(car.isConnecting());
+ Car car = Car.createCar(mContext, mConnectionListener);
+ assertThat(car.isConnected()).isFalse();
+ assertThat(car.isConnecting()).isFalse();
car.connect();
assertThrows(IllegalStateException.class, () -> car.connect());
car.disconnect();
@@ -96,11 +104,11 @@
@Test
public void testConstructorWithICar() throws Exception {
- Car car = Car.createCar(getContext(), mConnectionListener);
+ Car car = Car.createCar(mContext, mConnectionListener);
car.connect();
waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
- assertNotNull(mICar);
- Car car2 = new Car(getContext(), mICar, null);
- assertTrue(car2.isConnected());
+ assertThat(mICar).isNotNull();
+ Car car2 = new Car(mContext, mICar, null);
+ assertThat(car2.isConnected()).isTrue();
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java b/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
index c126493..1e19622 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
@@ -26,6 +26,8 @@
import static android.car.drivingstate.CarUxRestrictionsConfiguration.Builder.SpeedRange.MAX_SPEED;
import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.testng.Assert.assertThrows;
import android.car.drivingstate.CarUxRestrictions;
@@ -51,7 +53,7 @@
* Unit test for UXR config and its subclasses.
*/
@SmallTest
-public class CarUxRestrictionsConfigurationTest extends TestBase {
+public class CarUxRestrictionsConfigurationTest {
private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
@@ -96,12 +98,14 @@
CarUxRestrictionsConfiguration config = new Builder().build();
CarUxRestrictions parkedRestrictions = config.getUxRestrictions(DRIVING_STATE_PARKED, 0f);
- assertTrue(parkedRestrictions.isRequiresDistractionOptimization());
- assertEquals(parkedRestrictions.getActiveRestrictions(), UX_RESTRICTIONS_FULLY_RESTRICTED);
+ assertThat(parkedRestrictions.isRequiresDistractionOptimization()).isTrue();
+ assertThat(UX_RESTRICTIONS_FULLY_RESTRICTED)
+ .isEqualTo(parkedRestrictions.getActiveRestrictions());
CarUxRestrictions movingRestrictions = config.getUxRestrictions(DRIVING_STATE_MOVING, 1f);
- assertTrue(movingRestrictions.isRequiresDistractionOptimization());
- assertEquals(movingRestrictions.getActiveRestrictions(), UX_RESTRICTIONS_FULLY_RESTRICTED);
+ assertThat(movingRestrictions.isRequiresDistractionOptimization()).isTrue();
+ assertThat(UX_RESTRICTIONS_FULLY_RESTRICTED)
+ .isEqualTo(movingRestrictions.getActiveRestrictions());
}
@Test
@@ -109,10 +113,10 @@
CarUxRestrictionsConfiguration config = new Builder()
.setUxRestrictions(DRIVING_STATE_MOVING, true, UX_RESTRICTIONS_FULLY_RESTRICTED)
.build();
- assertTrue(config.getUxRestrictions(DRIVING_STATE_PARKED, 0f)
- .isRequiresDistractionOptimization());
- assertTrue(config.getUxRestrictions(DRIVING_STATE_IDLING, 0f)
- .isRequiresDistractionOptimization());
+ assertThat(config.getUxRestrictions(DRIVING_STATE_PARKED, 0f)
+ .isRequiresDistractionOptimization()).isTrue();
+ assertThat(config.getUxRestrictions(DRIVING_STATE_IDLING, 0f)
+ .isRequiresDistractionOptimization()).isTrue();
}
@Test
@@ -150,8 +154,8 @@
.setSpeedRange(new Builder.SpeedRange(1f, 2f)))
.build();
- assertTrue(config.getUxRestrictions(DRIVING_STATE_MOVING, 1f, UX_RESTRICTION_MODE_PASSENGER)
- .isRequiresDistractionOptimization());
+ assertThat(config.getUxRestrictions(DRIVING_STATE_MOVING, 1f, UX_RESTRICTION_MODE_PASSENGER)
+ .isRequiresDistractionOptimization()).isTrue();
}
@Test
@@ -252,8 +256,8 @@
new Builder.SpeedRange(1f);
Builder.SpeedRange s2 =
new Builder.SpeedRange(2f);
- assertTrue(s1.compareTo(s2) < 0);
- assertTrue(s2.compareTo(s1) > 0);
+ assertThat(s1.compareTo(s2)).isLessThan(0);
+ assertThat(s2.compareTo(s1)).isGreaterThan(0);
}
@Test
@@ -262,7 +266,7 @@
new Builder.SpeedRange(1f);
Builder.SpeedRange s2 =
new Builder.SpeedRange(1f);
- assertEquals(0, s1.compareTo(s2));
+ assertThat(s1.compareTo(s2)).isEqualTo(0);
}
@Test
@@ -271,8 +275,8 @@
new Builder.SpeedRange(0f, 1f);
Builder.SpeedRange s2 =
new Builder.SpeedRange(0f, 2f);
- assertTrue(s1.compareTo(s2) < 0);
- assertTrue(s2.compareTo(s1) > 0);
+ assertThat(s1.compareTo(s2)).isLessThan(0);
+ assertThat(s2.compareTo(s1)).isGreaterThan(0);
}
@Test
@@ -281,8 +285,8 @@
new Builder.SpeedRange(0f, 1f);
Builder.SpeedRange s2 =
new Builder.SpeedRange(0f);
- assertTrue(s1.compareTo(s2) < 0);
- assertTrue(s2.compareTo(s1) > 0);
+ assertThat(s1.compareTo(s2)).isLessThan(0);
+ assertThat(s2.compareTo(s1)).isGreaterThan(0);
}
@Test
@@ -290,28 +294,28 @@
Builder.SpeedRange s1, s2;
s1 = new Builder.SpeedRange(0f);
- assertEquals(s1, s1);
+ assertThat(s1).isEqualTo(s1);
s1 = new Builder.SpeedRange(1f);
s2 = new Builder.SpeedRange(1f);
- assertEquals(0, s1.compareTo(s2));
- assertEquals(s1, s2);
+ assertThat(s1.compareTo(s2)).isEqualTo(0);
+ assertThat(s2).isEqualTo(s1);
s1 = new Builder.SpeedRange(0f, 1f);
s2 = new Builder.SpeedRange(0f, 1f);
- assertEquals(s1, s2);
+ assertThat(s2).isEqualTo(s1);
s1 = new Builder.SpeedRange(0f, MAX_SPEED);
s2 = new Builder.SpeedRange(0f, MAX_SPEED);
- assertEquals(s1, s2);
+ assertThat(s2).isEqualTo(s1);
s1 = new Builder.SpeedRange(0f);
s2 = new Builder.SpeedRange(1f);
- assertFalse(s1.equals(s2));
+ assertThat(s1).isNotEqualTo(s2);
s1 = new Builder.SpeedRange(0f, 1f);
s2 = new Builder.SpeedRange(0f, 2f);
- assertFalse(s1.equals(s2));
+ assertThat(s1).isNotEqualTo(s2);
}
@Test
@@ -442,7 +446,7 @@
CarUxRestrictionsConfiguration deserialized = CarUxRestrictionsConfiguration.readJson(
new JsonReader(new StringReader(v1LegacyJsonFormat)), /* schemaVersion= */ 1);
- assertEquals(expectedConfig, deserialized);
+ assertThat(deserialized).isEqualTo(expectedConfig);
}
@@ -526,15 +530,15 @@
}
String dump = new String(output.toByteArray());
- assertTrue(dump.contains("Max String length"));
- assertTrue(dump.contains("Max Cumulative Content Items"));
- assertTrue(dump.contains("Max Content depth"));
- assertTrue(dump.contains("State:moving"));
- assertTrue(dump.contains("Speed Range"));
- assertTrue(dump.contains("Requires DO?"));
- assertTrue(dump.contains("Restrictions"));
- assertTrue(dump.contains("passenger mode"));
- assertTrue(dump.contains("baseline mode"));
+ assertThat(dump).contains("Max String length");
+ assertThat(dump).contains("Max Cumulative Content Items");
+ assertThat(dump).contains("Max Content depth");
+ assertThat(dump).contains("State:moving");
+ assertThat(dump).contains("Speed Range");
+ assertThat(dump).contains("Requires DO?");
+ assertThat(dump).contains("Restrictions");
+ assertThat(dump).contains("passenger mode");
+ assertThat(dump).contains("baseline mode");
}
@Test
@@ -546,11 +550,11 @@
.build();
CarUxRestrictions restrictions = config.getUxRestrictions(DRIVING_STATE_PARKED, 0f);
- assertTrue(restrictions.isRequiresDistractionOptimization());
- assertEquals(UX_RESTRICTIONS_NO_VIDEO, restrictions.getActiveRestrictions());
+ assertThat(restrictions.isRequiresDistractionOptimization()).isTrue();
+ assertThat(restrictions.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_NO_VIDEO);
- assertTrue(restrictions.isSameRestrictions(
- config.getUxRestrictions(DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_BASELINE)));
+ assertThat(restrictions.isSameRestrictions(
+ config.getUxRestrictions(DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_BASELINE))).isTrue();
}
@Test
@@ -567,12 +571,12 @@
CarUxRestrictions passenger = config.getUxRestrictions(
DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_PASSENGER);
- assertFalse(passenger.isRequiresDistractionOptimization());
+ assertThat(passenger.isRequiresDistractionOptimization()).isFalse();
CarUxRestrictions baseline = config.getUxRestrictions(
DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_BASELINE);
- assertTrue(baseline.isRequiresDistractionOptimization());
- assertEquals(UX_RESTRICTIONS_NO_VIDEO, baseline.getActiveRestrictions());
+ assertThat(baseline.isRequiresDistractionOptimization()).isTrue();
+ assertThat(baseline.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_NO_VIDEO);
}
@Test
@@ -585,8 +589,8 @@
CarUxRestrictions passenger = config.getUxRestrictions(
DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_PASSENGER);
- assertTrue(passenger.isRequiresDistractionOptimization());
- assertEquals(UX_RESTRICTIONS_NO_VIDEO, passenger.getActiveRestrictions());
+ assertThat(passenger.isRequiresDistractionOptimization()).isTrue();
+ assertThat(passenger.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_NO_VIDEO);
}
@Test
@@ -604,8 +608,8 @@
// Retrieve with passenger mode for a moving state
CarUxRestrictions passenger = config.getUxRestrictions(
DRIVING_STATE_MOVING, 1f, UX_RESTRICTION_MODE_PASSENGER);
- assertTrue(passenger.isRequiresDistractionOptimization());
- assertEquals(UX_RESTRICTIONS_NO_VIDEO, passenger.getActiveRestrictions());
+ assertThat(passenger.isRequiresDistractionOptimization()).isTrue();
+ assertThat(passenger.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_NO_VIDEO);
}
@Test
@@ -624,13 +628,13 @@
// Retrieve at speed within passenger mode range.
CarUxRestrictions passenger = config.getUxRestrictions(
DRIVING_STATE_MOVING, 5f, UX_RESTRICTION_MODE_PASSENGER);
- assertFalse(passenger.isRequiresDistractionOptimization());
+ assertThat(passenger.isRequiresDistractionOptimization()).isFalse();
// Retrieve with passenger mode but outside speed range
CarUxRestrictions baseline = config.getUxRestrictions(
DRIVING_STATE_MOVING, 1f, UX_RESTRICTION_MODE_PASSENGER);
- assertTrue(baseline.isRequiresDistractionOptimization());
- assertEquals(UX_RESTRICTIONS_NO_VIDEO, baseline.getActiveRestrictions());
+ assertThat(baseline.isRequiresDistractionOptimization()).isTrue();
+ assertThat(baseline.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_NO_VIDEO);
}
@Test
@@ -647,7 +651,7 @@
.setMaxContentDepth(1)
.build();
- assertTrue(one.hasSameParameters(other));
+ assertThat(one.hasSameParameters(other)).isTrue();
}
@Test
@@ -664,7 +668,7 @@
.setMaxContentDepth(1)
.build();
- assertFalse(one.hasSameParameters(other));
+ assertThat(one.hasSameParameters(other)).isFalse();
}
@Test
@@ -687,8 +691,8 @@
new DrivingStateRestrictions().setRestrictions(UX_RESTRICTIONS_NO_VIDEO))
.build();
- assertEquals(one, other);
- assertEquals(one.hashCode(), other.hashCode());
+ assertThat(other).isEqualTo(one);
+ assertThat(other.hashCode()).isEqualTo(one.hashCode());
}
@Test
@@ -712,7 +716,7 @@
new DrivingStateRestrictions().setRestrictions(UX_RESTRICTIONS_BASELINE))
.build();
- assertFalse(one.equals(other));
+ assertThat(one.equals(other)).isFalse();
}
@Test
@@ -742,7 +746,7 @@
CarUxRestrictionsConfiguration deserialized =
CarUxRestrictionsConfiguration.CREATOR.createFromParcel(parcel);
- assertEquals(deserialized, config);
+ assertThat(config).isEqualTo(deserialized);
}
@Test
@@ -765,8 +769,8 @@
CarUxRestrictionsConfiguration deserialized =
CarUxRestrictionsConfiguration.CREATOR.createFromParcel(parcel);
- assertEquals(deserialized, config);
- assertNull(deserialized.getPhysicalPort());
+ assertThat(config).isEqualTo(deserialized);
+ assertThat(deserialized.getPhysicalPort()).isNull();
}
/**
@@ -784,7 +788,7 @@
try (JsonReader reader = new JsonReader(new InputStreamReader(in))) {
CarUxRestrictionsConfiguration deserialized = CarUxRestrictionsConfiguration.readJson(
reader, schemaVersion);
- assertEquals(config, deserialized);
+ assertThat(deserialized).isEqualTo(config);
}
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java b/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
index b44c7bd..2a9481d 100644
--- a/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
@@ -19,49 +19,51 @@
import android.car.FuelType;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public final class FuelTypeTest extends TestBase {
+public final class FuelTypeTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_UNKNOWN,
- FuelType.UNKNOWN);
+ assertThat(FuelType.UNKNOWN)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_UNKNOWN);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_UNLEADED,
- FuelType.UNLEADED);
+ assertThat(FuelType.UNLEADED)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_UNLEADED);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LEADED,
- FuelType.LEADED);
+ assertThat(FuelType.LEADED)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LEADED);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_DIESEL_1,
- FuelType.DIESEL_1);
+ assertThat(FuelType.DIESEL_1)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_DIESEL_1);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_DIESEL_2,
- FuelType.DIESEL_2);
+ assertThat(FuelType.DIESEL_2)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_DIESEL_2);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_BIODIESEL,
- FuelType.BIODIESEL);
+ assertThat(FuelType.BIODIESEL)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_BIODIESEL);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_E85,
- FuelType.E85);
+ assertThat(FuelType.E85)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_E85);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LPG,
- FuelType.LPG);
+ assertThat(FuelType.LPG)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LPG);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_CNG,
- FuelType.CNG);
+ assertThat(FuelType.CNG)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_CNG);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LNG,
- FuelType.LNG);
+ assertThat(FuelType.LNG)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_LNG);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_ELECTRIC,
- FuelType.ELECTRIC);
+ assertThat(FuelType.ELECTRIC)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_ELECTRIC);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_HYDROGEN,
- FuelType.HYDROGEN);
+ assertThat(FuelType.HYDROGEN)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_HYDROGEN);
- assertEquals(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_OTHER,
- FuelType.OTHER);
+ assertThat(FuelType.OTHER)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.FuelType.FUEL_TYPE_OTHER);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java b/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
index 1d5c0cf..c00889f 100644
--- a/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
@@ -19,32 +19,34 @@
import android.car.PortLocationType;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public final class PortLocationTypeTest extends TestBase {
+public final class PortLocationTypeTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.UNKNOWN,
- PortLocationType.UNKNOWN);
+ assertThat(PortLocationType.UNKNOWN)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.UNKNOWN);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT_LEFT,
- PortLocationType.FRONT_LEFT);
+ assertThat(PortLocationType.FRONT_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT_RIGHT,
- PortLocationType.FRONT_RIGHT);
+ assertThat(PortLocationType.FRONT_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR_RIGHT,
- PortLocationType.REAR_RIGHT);
+ assertThat(PortLocationType.REAR_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR_LEFT,
- PortLocationType.REAR_LEFT);
+ assertThat(PortLocationType.REAR_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT,
- PortLocationType.FRONT);
+ assertThat(PortLocationType.FRONT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.FRONT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR,
- PortLocationType.REAR);
+ assertThat(PortLocationType.REAR)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.PortLocationType.REAR);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/TestBase.java b/tests/android_car_api_test/src/android/car/apitest/TestBase.java
deleted file mode 100644
index 6162c93..0000000
--- a/tests/android_car_api_test/src/android/car/apitest/TestBase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.car.apitest;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.Assert;
-
-/**
- * Base class for all tests in this package (even those that don't need to connect to Car).
- */
-abstract class TestBase extends TmpBaseTestCase {
-
- protected final Context getContext() {
- return InstrumentationRegistry.getInstrumentation().getTargetContext();
- }
-}
-
-// TODO(b/155447204): inline its methods
-/**
- * Temporary class used to convert JUnit assertions to Truth - will be removed in a follow-up CL
- */
-abstract class TmpBaseTestCase {
-
- public static void assertTrue(boolean expression) {
- assertThat(expression).isTrue();
- }
-
- public static void assertFalse(boolean expression) {
- assertThat(expression).isFalse();
- }
-
- public static void assertEquals(Object expected, Object actual) {
- assertThat(actual).isEqualTo(expected);
- }
-
- public static void assertEquals(int expected, int actual) {
- assertThat(actual).isEqualTo(expected);
- }
-
- public static void assertEquals(String message, Object expected, Object actual) {
- assertWithMessage(message).that(actual).isEqualTo(expected);
- }
-
- public static void assertNotSame(Object expected, Object actual) {
- assertThat(actual).isNotSameAs(expected);
- }
-
- public static void assertNotNull(Object object) {
- assertThat(object).isNotNull();
- }
-
- public static void assertNull(Object object) {
- assertThat(object).isNull();
- }
-
- public static void assertArrayEquals(int[] expected, int[] actual) {
- Assert.assertArrayEquals(expected, actual);
- }
-
- public static void assertArrayEquals(Object[] expected, Object[] actual) {
- Assert.assertArrayEquals(expected, actual);
- }
-}
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
index 54bd345..6886faf 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
@@ -18,18 +18,20 @@
import android.car.VehicleAreaMirror;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public class VehicleAreaMirrorTest extends TestBase {
+public class VehicleAreaMirrorTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_CENTER,
- VehicleAreaMirror.MIRROR_DRIVER_CENTER);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_LEFT,
- VehicleAreaMirror.MIRROR_DRIVER_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_RIGHT,
- VehicleAreaMirror.MIRROR_DRIVER_RIGHT);
+ assertThat(VehicleAreaMirror.MIRROR_DRIVER_CENTER).isEqualTo(
+ android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_CENTER);
+ assertThat(VehicleAreaMirror.MIRROR_DRIVER_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_LEFT);
+ assertThat(VehicleAreaMirror.MIRROR_DRIVER_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaMirror.DRIVER_RIGHT);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
index 520e2d9..6c15929 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
@@ -18,28 +18,30 @@
import android.car.VehicleAreaDoor;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public class VehicleDoorTest extends TestBase {
+public class VehicleDoorTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.HOOD,
- VehicleAreaDoor.DOOR_HOOD);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.REAR,
- VehicleAreaDoor.DOOR_REAR);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_1_LEFT,
- VehicleAreaDoor.DOOR_ROW_1_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_1_RIGHT,
- VehicleAreaDoor.DOOR_ROW_1_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_2_LEFT,
- VehicleAreaDoor.DOOR_ROW_2_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_2_RIGHT,
- VehicleAreaDoor.DOOR_ROW_2_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_3_LEFT,
- VehicleAreaDoor.DOOR_ROW_3_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_3_RIGHT,
- VehicleAreaDoor.DOOR_ROW_3_RIGHT);
+ assertThat(VehicleAreaDoor.DOOR_HOOD)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.HOOD);
+ assertThat(VehicleAreaDoor.DOOR_REAR)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.REAR);
+ assertThat(VehicleAreaDoor.DOOR_ROW_1_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_1_LEFT);
+ assertThat(VehicleAreaDoor.DOOR_ROW_1_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_1_RIGHT);
+ assertThat(VehicleAreaDoor.DOOR_ROW_2_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_2_LEFT);
+ assertThat(VehicleAreaDoor.DOOR_ROW_2_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_2_RIGHT);
+ assertThat(VehicleAreaDoor.DOOR_ROW_3_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_3_LEFT);
+ assertThat(VehicleAreaDoor.DOOR_ROW_3_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaDoor.ROW_3_RIGHT);
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
index ec4a160..44ca0cd 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
@@ -18,92 +18,90 @@
import android.car.VehicleGear;
import android.test.suitebuilder.annotation.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(AndroidJUnit4.class)
@SmallTest
-public class VehicleGearTest extends TestBase {
+public class VehicleGearTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_UNKNOWN,
- VehicleGear.GEAR_UNKNOWN);
+ assertThat(VehicleGear.GEAR_UNKNOWN)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_UNKNOWN);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_NEUTRAL,
- VehicleGear.GEAR_NEUTRAL);
+ assertThat(VehicleGear.GEAR_NEUTRAL)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_NEUTRAL);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_REVERSE,
- VehicleGear.GEAR_REVERSE);
+ assertThat(VehicleGear.GEAR_REVERSE)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_REVERSE);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_PARK,
- VehicleGear.GEAR_PARK);
+ assertThat(VehicleGear.GEAR_PARK)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_PARK);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_DRIVE,
- VehicleGear.GEAR_DRIVE);
+ assertThat(VehicleGear.GEAR_DRIVE)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_DRIVE);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_1,
- VehicleGear.GEAR_FIRST);
+ assertThat(VehicleGear.GEAR_FIRST)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_1);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_2,
- VehicleGear.GEAR_SECOND);
+ assertThat(VehicleGear.GEAR_SECOND)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_2);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_3,
- VehicleGear.GEAR_THIRD);
+ assertThat(VehicleGear.GEAR_THIRD)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_3);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_4,
- VehicleGear.GEAR_FOURTH);
+ assertThat(VehicleGear.GEAR_FOURTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_4);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_5,
- VehicleGear.GEAR_FIFTH);
+ assertThat(VehicleGear.GEAR_FIFTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_5);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_6,
- VehicleGear.GEAR_SIXTH);
+ assertThat(VehicleGear.GEAR_SIXTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_6);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_7,
- VehicleGear.GEAR_SEVENTH);
+ assertThat(VehicleGear.GEAR_SEVENTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_7);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_8,
- VehicleGear.GEAR_EIGHTH);
+ assertThat(VehicleGear.GEAR_EIGHTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_8);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_9,
- VehicleGear.GEAR_NINTH);
+ assertThat(VehicleGear.GEAR_NINTH)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleGear.GEAR_9);
}
@Test
public void testToString() {
- assertEquals("GEAR_UNKNOWN", VehicleGear.toString(VehicleGear.GEAR_UNKNOWN));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_UNKNOWN)).isEqualTo("GEAR_UNKNOWN");
- assertEquals("GEAR_NEUTRAL", VehicleGear.toString(VehicleGear.GEAR_NEUTRAL));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_NEUTRAL)).isEqualTo("GEAR_NEUTRAL");
- assertEquals("GEAR_REVERSE", VehicleGear.toString(VehicleGear.GEAR_REVERSE));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_REVERSE)).isEqualTo("GEAR_REVERSE");
- assertEquals("GEAR_PARK", VehicleGear.toString(VehicleGear.GEAR_PARK));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_PARK)).isEqualTo("GEAR_PARK");
- assertEquals("GEAR_DRIVE", VehicleGear.toString(VehicleGear.GEAR_DRIVE));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_DRIVE)).isEqualTo("GEAR_DRIVE");
- assertEquals("GEAR_FIRST", VehicleGear.toString(VehicleGear.GEAR_FIRST));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_FIRST)).isEqualTo("GEAR_FIRST");
- assertEquals("GEAR_SECOND", VehicleGear.toString(VehicleGear.GEAR_SECOND));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_SECOND)).isEqualTo("GEAR_SECOND");
- assertEquals("GEAR_THIRD", VehicleGear.toString(VehicleGear.GEAR_THIRD));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_THIRD)).isEqualTo("GEAR_THIRD");
- assertEquals("GEAR_FOURTH", VehicleGear.toString(VehicleGear.GEAR_FOURTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_FOURTH)).isEqualTo("GEAR_FOURTH");
- assertEquals("GEAR_FIFTH", VehicleGear.toString(VehicleGear.GEAR_FIFTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_FIFTH)).isEqualTo("GEAR_FIFTH");
- assertEquals("GEAR_SIXTH", VehicleGear.toString(VehicleGear.GEAR_SIXTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_SIXTH)).isEqualTo("GEAR_SIXTH");
- assertEquals("GEAR_SEVENTH", VehicleGear.toString(VehicleGear.GEAR_SEVENTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_SEVENTH)).isEqualTo("GEAR_SEVENTH");
- assertEquals("GEAR_EIGHTH", VehicleGear.toString(VehicleGear.GEAR_EIGHTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_EIGHTH)).isEqualTo("GEAR_EIGHTH");
- assertEquals("GEAR_NINTH", VehicleGear.toString(VehicleGear.GEAR_NINTH));
+ assertThat(VehicleGear.toString(VehicleGear.GEAR_NINTH)).isEqualTo("GEAR_NINTH");
- assertEquals("0x3", VehicleGear.toString(3));
+ assertThat(VehicleGear.toString(3)).isEqualTo("0x3");
- assertEquals("0xc", VehicleGear.toString(12));
+ assertThat(VehicleGear.toString(12)).isEqualTo("0xc");
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleSeatTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleSeatTest.java
index c3ad03e..6ed1197 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleSeatTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleSeatTest.java
@@ -18,75 +18,77 @@
import android.car.VehicleAreaSeat;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
+
import org.junit.Test;
@SmallTest
-public class VehicleSeatTest extends TestBase {
+public class VehicleSeatTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_LEFT,
- VehicleAreaSeat.SEAT_ROW_1_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_CENTER,
- VehicleAreaSeat.SEAT_ROW_1_CENTER);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_RIGHT,
- VehicleAreaSeat.SEAT_ROW_1_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_LEFT,
- VehicleAreaSeat.SEAT_ROW_2_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_CENTER,
- VehicleAreaSeat.SEAT_ROW_2_CENTER);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_RIGHT,
- VehicleAreaSeat.SEAT_ROW_2_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_LEFT,
- VehicleAreaSeat.SEAT_ROW_3_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_CENTER,
- VehicleAreaSeat.SEAT_ROW_3_CENTER);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_RIGHT,
- VehicleAreaSeat.SEAT_ROW_3_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_LEFT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_CENTER)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_CENTER);
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_1_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_LEFT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_CENTER)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_CENTER);
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_2_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_LEFT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_CENTER)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_CENTER);
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat.ROW_3_RIGHT);
}
@Test
public void testFromRowAndSide() {
- assertEquals(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_UNKNOWN);
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(-1, VehicleAreaSeat.SIDE_RIGHT));
- assertEquals(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_UNKNOWN);
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(0, VehicleAreaSeat.SIDE_RIGHT));
- assertEquals(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_ROW_1_LEFT);
- assertEquals(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_ROW_1_CENTER);
- assertEquals(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_ROW_1_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_LEFT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_CENTER)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_ROW_1_RIGHT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(1, VehicleAreaSeat.SIDE_RIGHT));
- assertEquals(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_ROW_2_LEFT);
- assertEquals(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_ROW_2_CENTER);
- assertEquals(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_ROW_2_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_LEFT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_CENTER)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_ROW_2_RIGHT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(2, VehicleAreaSeat.SIDE_RIGHT));
- assertEquals(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_ROW_3_LEFT);
- assertEquals(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_ROW_3_CENTER);
- assertEquals(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_ROW_3_RIGHT);
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_LEFT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_CENTER)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_ROW_3_RIGHT)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(3, VehicleAreaSeat.SIDE_RIGHT));
- assertEquals(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_LEFT),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_CENTER),
- VehicleAreaSeat.SEAT_UNKNOWN);
- assertEquals(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_RIGHT),
- VehicleAreaSeat.SEAT_UNKNOWN);
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_LEFT));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_CENTER));
+ assertThat(VehicleAreaSeat.SEAT_UNKNOWN)
+ .isEqualTo(VehicleAreaSeat.fromRowAndSide(4, VehicleAreaSeat.SIDE_RIGHT));
}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleWindowTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleWindowTest.java
index c578cef..a0eb9d8 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleWindowTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleWindowTest.java
@@ -18,33 +18,34 @@
import android.car.VehicleAreaWindow;
import android.test.suitebuilder.annotation.SmallTest;
+import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@SmallTest
-public class VehicleWindowTest extends TestBase {
+public class VehicleWindowTest {
@Test
public void testMatchWithVehicleHal() {
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.FRONT_WINDSHIELD,
- VehicleAreaWindow.WINDOW_FRONT_WINDSHIELD);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.REAR_WINDSHIELD,
- VehicleAreaWindow.WINDOW_REAR_WINDSHIELD);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_1_LEFT,
- VehicleAreaWindow.WINDOW_ROW_1_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_1_RIGHT,
- VehicleAreaWindow.WINDOW_ROW_1_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_2_LEFT,
- VehicleAreaWindow.WINDOW_ROW_2_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_2_RIGHT,
- VehicleAreaWindow.WINDOW_ROW_2_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_3_LEFT,
- VehicleAreaWindow.WINDOW_ROW_3_LEFT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_3_RIGHT,
- VehicleAreaWindow.WINDOW_ROW_3_RIGHT);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROOF_TOP_1,
- VehicleAreaWindow.WINDOW_ROOF_TOP_1);
- assertEquals(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROOF_TOP_2,
- VehicleAreaWindow.WINDOW_ROOF_TOP_2);
+ assertThat(VehicleAreaWindow.WINDOW_FRONT_WINDSHIELD).isEqualTo(
+ android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.FRONT_WINDSHIELD);
+ assertThat(VehicleAreaWindow.WINDOW_REAR_WINDSHIELD).isEqualTo(
+ android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.REAR_WINDSHIELD);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_1_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_1_LEFT);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_1_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_1_RIGHT);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_2_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_2_LEFT);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_2_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_2_RIGHT);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_3_LEFT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_3_LEFT);
+ assertThat(VehicleAreaWindow.WINDOW_ROW_3_RIGHT)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROW_3_RIGHT);
+ assertThat(VehicleAreaWindow.WINDOW_ROOF_TOP_1)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROOF_TOP_1);
+ assertThat(VehicleAreaWindow.WINDOW_ROOF_TOP_2)
+ .isEqualTo(android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow.ROOF_TOP_2);
}
}