diff options
author | Keun-young Park <keunyoung@google.com> | 2017-08-31 10:46:05 -0700 |
---|---|---|
committer | Keun-young Park <keunyoung@google.com> | 2017-08-31 11:03:18 -0700 |
commit | 23bc7ccc3a5194a981fabe4e03607f014496bfcb (patch) | |
tree | f20a0ffbf3a1293aab73d84a9043fb9b8e969d7f /tests/android_support_car_api_test | |
parent | 99e1a7555a9521c33203b68c5ab5bd1c039ee712 (diff) | |
download | Car-23bc7ccc3a5194a981fabe4e03607f014496bfcb.tar.gz |
fix sensor type comparison between car lib and support lib
- Handle snesors defined only in car lib while it is reserved in support lib
bug: 65125210
Test: the test
Change-Id: I002fe8e6fdccdaf2ae85f4d495b4689f0d19b321
Diffstat (limited to 'tests/android_support_car_api_test')
-rw-r--r-- | tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java index bb84def349..c60496be94 100644 --- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java +++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java @@ -110,22 +110,24 @@ public class CarSensorManagerTest extends AndroidTestCase { } StringBuilder builder = new StringBuilder(); boolean failed = false; - for (Field supprotCarSensorType : supportCarSensorTypes) { + for (Field supportCarSensorType : supportCarSensorTypes) { Field androidCarSensorType = androidCarSensorTypeToField.get( - supprotCarSensorType.getInt(null)); - assertNotNull("Sensor type:" + supprotCarSensorType.getName() + + supportCarSensorType.getInt(null)); + assertNotNull("Sensor type:" + supportCarSensorType.getName() + " not defined in android.car", androidCarSensorType); - if (supprotCarSensorType.getName().equals(androidCarSensorType.getName())) { + if (supportCarSensorType.getName().equals(androidCarSensorType.getName())) { // match ok } else if (androidCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) { // not used in android.car, ok + } else if (supportCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) { + // used in android.car but reserved in support.car } else { failed = true; - builder.append("android.support sensor has name:" + supprotCarSensorType.getName() + + builder.append("android.support sensor has name:" + supportCarSensorType.getName() + " while android.car sensor has name:" + androidCarSensorType.getName() + "\n"); } - androidCarSensorTypeToField.remove(supprotCarSensorType.getInt(null)); + androidCarSensorTypeToField.remove(supportCarSensorType.getInt(null)); } assertFalse(builder.toString(), failed); assertTrue("android Car sensor has additional types defined:" + androidCarSensorTypeToField, |