Property Permission related test
Adds some testcases about PropertyPermissionMapping
Uses the Truth.assertThat replace Assert
Bug: 190838634
Test: PropertyHalServiceIdsTest
Change-Id: Ic49ef7beff169e4f6f9569268218a552d2a82427
diff --git a/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java
index e128b19..814ccba 100644
--- a/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java
@@ -16,6 +16,9 @@
package com.android.car.hal;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
import android.car.Car;
import android.car.VehicleHvacFanDirection;
import android.car.VehiclePropertyIds;
@@ -29,10 +32,9 @@
import androidx.test.runner.AndroidJUnit4;
+import com.android.car.internal.PropertyPermissionMapping;
import com.android.car.vehiclehal.VehiclePropValueBuilder;
-import com.google.common.truth.Truth;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -50,7 +52,7 @@
public MockitoRule mMockitoRule = MockitoJUnit.rule();
private PropertyHalServiceIds mPropertyHalServiceIds;
-
+ private PropertyPermissionMapping mPermissionMapping;
private static final String TAG = PropertyHalServiceIdsTest.class.getSimpleName();
private static final int VENDOR_PROPERTY_1 = 0x21e01111;
private static final int VENDOR_PROPERTY_2 = 0x21e01112;
@@ -92,6 +94,7 @@
@Before
public void setUp() {
mPropertyHalServiceIds = new PropertyHalServiceIds();
+ mPermissionMapping = new PropertyPermissionMapping();
// set up read permission and write permission to VENDOR_PROPERTY_1
CONFIG_ARRAY.add(VENDOR_PROPERTY_1);
CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_DEFAULT);
@@ -117,14 +120,18 @@
*/
@Test
public void checkPermissionForSystemProperty() {
- Assert.assertEquals(Car.PERMISSION_CAR_ENGINE_DETAILED,
- mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.ENGINE_OIL_LEVEL));
- Assert.assertNull(
- mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.ENGINE_OIL_LEVEL));
- Assert.assertEquals(Car.PERMISSION_CONTROL_CAR_CLIMATE,
- mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.HVAC_FAN_SPEED));
- Assert.assertEquals(Car.PERMISSION_CONTROL_CAR_CLIMATE,
- mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.HVAC_FAN_SPEED));
+ assertThat(mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.ENGINE_OIL_LEVEL))
+ .isEqualTo(Car.PERMISSION_CAR_ENGINE_DETAILED);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.ENGINE_OIL_LEVEL))
+ .isNull();
+ assertThat(mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.HVAC_FAN_SPEED))
+ .isEqualTo(Car.PERMISSION_CONTROL_CAR_CLIMATE);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.HVAC_FAN_SPEED))
+ .isEqualTo(Car.PERMISSION_CONTROL_CAR_CLIMATE);
+ assertThat(mPermissionMapping.getReadPermission(VehiclePropertyIds.HVAC_FAN_SPEED))
+ .isEqualTo(Car.PERMISSION_CONTROL_CAR_CLIMATE);
+ assertThat(mPermissionMapping.getWritePermission(VehiclePropertyIds.HVAC_FAN_SPEED))
+ .isEqualTo(Car.PERMISSION_CONTROL_CAR_CLIMATE);
}
/**
* Test {@link PropertyHalServiceIds#customizeVendorPermission(List)}
@@ -133,28 +140,31 @@
public void checkPermissionForVendorProperty() {
// test insert a valid config
mPropertyHalServiceIds.customizeVendorPermission(CONFIG_ARRAY);
+ assertThat(mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_1))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_1)).isNull();
- Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
- mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_1));
- Assert.assertNull(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_1));
+ assertThat(mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_2))
+ .isEqualTo(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_ENGINE);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_2))
+ .isEqualTo(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_ENGINE);
- Assert.assertEquals(android.car.hardware.property
- .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_ENGINE,
- mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_2));
- Assert.assertEquals(android.car.hardware.property
- .VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_ENGINE,
- mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_2));
+ assertThat(mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_3))
+ .isEqualTo(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_INFO);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_3))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
- Assert.assertEquals(android.car.hardware.property
- .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_INFO,
- mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_3));
- Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
- mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_3));
-
- Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
- mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_4));
- Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
- mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_4));
+ assertThat(mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_4))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
+ assertThat(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_4))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
+ assertThat(mPermissionMapping.getReadPermission(VENDOR_PROPERTY_4))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
+ assertThat(mPermissionMapping.getWritePermission(VENDOR_PROPERTY_4))
+ .isEqualTo(Car.PERMISSION_VENDOR_EXTENSION);
// test insert invalid config
try {
@@ -171,10 +181,12 @@
@Test
public void checkVendorPropertyId() {
for (int vendorProp : VENDOR_PROPERTY_IDS) {
- Assert.assertTrue(mPropertyHalServiceIds.isSupportedProperty(vendorProp));
+ assertWithMessage("Property does not exist.").that(
+ mPropertyHalServiceIds.isSupportedProperty(vendorProp)).isTrue();
}
for (int systemProp : SYSTEM_PROPERTY_IDS) {
- Assert.assertTrue(mPropertyHalServiceIds.isSupportedProperty(systemProp));
+ assertWithMessage("Property does not exist.").that(
+ mPropertyHalServiceIds.isSupportedProperty(systemProp)).isTrue();
}
}
@@ -183,14 +195,11 @@
*/
@Test
public void testPayload() {
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_VALID_VALUE)).isTrue();
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_EXTRA_VALUE)).isFalse();
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_INVALID_VALUE)).isFalse();
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_INVALID_TYPE_VALUE))
- .isFalse();
-
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(HVAC_FAN_DIRECTIONS_VALID)).isTrue();
- Truth.assertThat(mPropertyHalServiceIds.checkPayload(HVAC_FAN_DIRECTIONS_INVALID))
- .isFalse();
+ assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_VALID_VALUE)).isTrue();
+ assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_EXTRA_VALUE)).isFalse();
+ assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_INVALID_VALUE)).isFalse();
+ assertThat(mPropertyHalServiceIds.checkPayload(GEAR_WITH_INVALID_TYPE_VALUE)).isFalse();
+ assertThat(mPropertyHalServiceIds.checkPayload(HVAC_FAN_DIRECTIONS_VALID)).isTrue();
+ assertThat(mPropertyHalServiceIds.checkPayload(HVAC_FAN_DIRECTIONS_INVALID)).isFalse();
}
}