Enhance testConvertToStatusEvent unit tests
Enhanced testConvertToStatusEvent unit tests for the OccupantAwarenessUtils
class according to Google Unit Test Best Practice.
Bug: 219798907
Test: atest CarServiceUnitTest:OccupantAwarenessUitlsTest
Change-Id: Iad76e6858015fe8cfc080edfa872d0a1d71994c0
diff --git a/tests/OccupantAwareness/src/com/android/car/test/OccupantAwarenessUtilsTest.java b/tests/OccupantAwareness/src/com/android/car/test/OccupantAwarenessUtilsTest.java
deleted file mode 100644
index fc6fa06..0000000
--- a/tests/OccupantAwareness/src/com/android/car/test/OccupantAwarenessUtilsTest.java
+++ /dev/null
@@ -1,133 +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 com.android.car;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.car.occupantawareness.OccupantAwarenessDetection;
-import android.car.occupantawareness.SystemStatusEvent;
-import android.hardware.automotive.occupant_awareness.IOccupantAwareness;
-import android.hardware.automotive.occupant_awareness.OccupantAwarenessStatus;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import androidx.test.runner.AndroidJUnit4;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class OccupantAwarenessUtilsTest extends TestCase {
-
- @Test
- public void test_convertToStatusEvent() {
- SystemStatusEvent event;
-
- event =
- OccupantAwarenessUtils.convertToStatusEvent(
- IOccupantAwareness.CAP_NONE, OccupantAwarenessStatus.READY);
- assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_READY);
- assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_NONE);
-
- event =
- OccupantAwarenessUtils.convertToStatusEvent(
- IOccupantAwareness.CAP_PRESENCE_DETECTION,
- OccupantAwarenessStatus.NOT_SUPPORTED);
- assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_NOT_SUPPORTED);
- assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_PRESENCE);
-
- event =
- OccupantAwarenessUtils.convertToStatusEvent(
- IOccupantAwareness.CAP_GAZE_DETECTION,
- OccupantAwarenessStatus.NOT_INITIALIZED);
- assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_NOT_READY);
- assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_GAZE);
-
- event =
- OccupantAwarenessUtils.convertToStatusEvent(
- IOccupantAwareness.CAP_DRIVER_MONITORING_DETECTION,
- OccupantAwarenessStatus.FAILURE);
- assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_SYSTEM_FAILURE);
- assertThat(event.detectionType)
- .isEqualTo(SystemStatusEvent.DETECTION_TYPE_DRIVER_MONITORING);
- }
-
- @Test
- public void test_convertToConfidenceScore() {
- assertThat(
- OccupantAwarenessUtils.convertToConfidenceScore(
- android.hardware.automotive.occupant_awareness.ConfidenceLevel.MAX))
- .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_MAX);
-
- assertThat(
- OccupantAwarenessUtils.convertToConfidenceScore(
- android.hardware.automotive.occupant_awareness.ConfidenceLevel
- .HIGH))
- .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_HIGH);
-
- assertThat(
- OccupantAwarenessUtils.convertToConfidenceScore(
- android.hardware.automotive.occupant_awareness.ConfidenceLevel.LOW))
- .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_LOW);
-
- assertThat(
- OccupantAwarenessUtils.convertToConfidenceScore(
- android.hardware.automotive.occupant_awareness.ConfidenceLevel
- .NONE))
- .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_NONE);
- }
-
- @Test
- public void test_convertToPoint3D() {
- assertThat(OccupantAwarenessUtils.convertToPoint3D(null)).isNull();
- assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[0])).isNull();
- assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[2])).isNull();
- assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[] {1, 2, 3})).isNotNull();
- }
-
- @Test
- public void test_convertToRole() {
- assertThat(
- OccupantAwarenessUtils.convertToRole(
- android.hardware.automotive.occupant_awareness.Role.INVALID))
- .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_NONE);
-
- assertThat(
- OccupantAwarenessUtils.convertToRole(
- android.hardware.automotive.occupant_awareness.Role.UNKNOWN))
- .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_NONE);
-
- assertThat(
- OccupantAwarenessUtils.convertToRole(
- android.hardware.automotive.occupant_awareness.Role.DRIVER
- | android.hardware.automotive.occupant_awareness.Role
- .FRONT_PASSENGER
- | android.hardware.automotive.occupant_awareness.Role
- .ROW_2_PASSENGER_CENTER))
- .isEqualTo(
- OccupantAwarenessDetection.VEHICLE_OCCUPANT_DRIVER
- | OccupantAwarenessDetection.VEHICLE_OCCUPANT_FRONT_PASSENGER
- | OccupantAwarenessDetection
- .VEHICLE_OCCUPANT_ROW_2_PASSENGER_CENTER);
-
- assertThat(
- OccupantAwarenessUtils.convertToRole(
- android.hardware.automotive.occupant_awareness.Role.ALL_OCCUPANTS))
- .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_ALL_OCCUPANTS);
- }
-}
diff --git a/tests/carservice_unit_test/src/com/android/car/OccupantAwarenessUtilsTest.java b/tests/carservice_unit_test/src/com/android/car/OccupantAwarenessUtilsTest.java
new file mode 100644
index 0000000..5914ed4
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/OccupantAwarenessUtilsTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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 com.android.car;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.occupantawareness.OccupantAwarenessDetection;
+import android.car.occupantawareness.SystemStatusEvent;
+import android.hardware.automotive.occupant_awareness.IOccupantAwareness;
+import android.hardware.automotive.occupant_awareness.OccupantAwarenessStatus;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public final class OccupantAwarenessUtilsTest {
+ private static final byte INVALID_OCCUPANT_AWARENESS_STATUS = -1;
+ private static final int INVALID_IOCCUPANT_AWARENESS = -1;
+
+ @Test
+ public void testConvertToStatusEvent_returnsSystemStatusReady() {
+ SystemStatusEvent event =
+ OccupantAwarenessUtils.convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ OccupantAwarenessStatus.READY);
+
+ assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_READY);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsSystemStatusNotSupported() {
+ SystemStatusEvent event =
+ OccupantAwarenessUtils.convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ OccupantAwarenessStatus.NOT_SUPPORTED);
+
+ assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_NOT_SUPPORTED);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsSystemStatusNotReady() {
+ SystemStatusEvent event =
+ OccupantAwarenessUtils.convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ OccupantAwarenessStatus.NOT_INITIALIZED);
+
+ assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_NOT_READY);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsSystemStatusSystemFailure() {
+ SystemStatusEvent event =
+ OccupantAwarenessUtils.convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ OccupantAwarenessStatus.FAILURE);
+
+ assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_SYSTEM_FAILURE);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsSystemStatusNotReadyWithInvalidAwarenessStatus() {
+ SystemStatusEvent event =
+ OccupantAwarenessUtils.convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ INVALID_OCCUPANT_AWARENESS_STATUS);
+
+ assertThat(event.systemStatus).isEqualTo(SystemStatusEvent.SYSTEM_STATUS_NOT_READY);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsDetectionTypeNone() {
+ SystemStatusEvent event = OccupantAwarenessUtils
+ .convertToStatusEvent(IOccupantAwareness.CAP_NONE,
+ OccupantAwarenessStatus.READY);
+
+ assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_NONE);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsDetectionTypePresence() {
+ SystemStatusEvent event = OccupantAwarenessUtils
+ .convertToStatusEvent(IOccupantAwareness.CAP_PRESENCE_DETECTION,
+ OccupantAwarenessStatus.READY);
+
+ assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_PRESENCE);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsDetectionTypeGaze() {
+ SystemStatusEvent event = OccupantAwarenessUtils
+ .convertToStatusEvent(IOccupantAwareness.CAP_GAZE_DETECTION,
+ OccupantAwarenessStatus.READY);
+
+ assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_GAZE);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsDetectionTypeMonitoring() {
+ SystemStatusEvent event = OccupantAwarenessUtils
+ .convertToStatusEvent(IOccupantAwareness.CAP_DRIVER_MONITORING_DETECTION,
+ OccupantAwarenessStatus.READY);
+
+ assertThat(event.detectionType)
+ .isEqualTo(SystemStatusEvent.DETECTION_TYPE_DRIVER_MONITORING);
+ }
+
+ @Test
+ public void testConvertToStatusEvent_returnsDetectionTypeNoneWithInvalidIOccupantAwareness() {
+ SystemStatusEvent event = OccupantAwarenessUtils
+ .convertToStatusEvent(INVALID_IOCCUPANT_AWARENESS, OccupantAwarenessStatus.READY);
+
+ assertThat(event.detectionType).isEqualTo(SystemStatusEvent.DETECTION_TYPE_NONE);
+ }
+
+ // TODO(b/219798907) enhance the implementation according to Unit Test Best Practice
+ @Test
+ public void test_convertToConfidenceScore() {
+ assertThat(OccupantAwarenessUtils.convertToConfidenceScore(
+ android.hardware.automotive.occupant_awareness.ConfidenceLevel.MAX))
+ .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_MAX);
+
+ assertThat(OccupantAwarenessUtils.convertToConfidenceScore(
+ android.hardware.automotive.occupant_awareness.ConfidenceLevel.HIGH))
+ .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_HIGH);
+
+ assertThat(OccupantAwarenessUtils.convertToConfidenceScore(
+ android.hardware.automotive.occupant_awareness.ConfidenceLevel.LOW))
+ .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_LOW);
+
+ assertThat(OccupantAwarenessUtils.convertToConfidenceScore(
+ android.hardware.automotive.occupant_awareness.ConfidenceLevel.NONE))
+ .isEqualTo(OccupantAwarenessDetection.CONFIDENCE_LEVEL_NONE);
+ }
+
+ // TODO(b/219798907) enhance the implementation according to Unit Test Best Practice
+ @Test
+ public void test_convertToPoint3D() {
+ assertThat(OccupantAwarenessUtils.convertToPoint3D(null)).isNull();
+ assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[0])).isNull();
+ assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[2])).isNull();
+ assertThat(OccupantAwarenessUtils.convertToPoint3D(new double[] {1, 2, 3})).isNotNull();
+ }
+
+ // TODO(b/219798907) enhance the implementation according to Unit Test Best Practice
+ @Test
+ public void test_convertToRole() {
+ assertThat(OccupantAwarenessUtils.convertToRole(
+ android.hardware.automotive.occupant_awareness.Role.INVALID))
+ .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_NONE);
+
+ assertThat(OccupantAwarenessUtils.convertToRole(
+ android.hardware.automotive.occupant_awareness.Role.UNKNOWN))
+ .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_NONE);
+
+ assertThat(OccupantAwarenessUtils.convertToRole(
+ android.hardware.automotive.occupant_awareness.Role.DRIVER
+ | android.hardware.automotive.occupant_awareness.Role.FRONT_PASSENGER
+ | android.hardware.automotive.occupant_awareness.Role.ROW_2_PASSENGER_CENTER))
+ .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_DRIVER
+ | OccupantAwarenessDetection.VEHICLE_OCCUPANT_FRONT_PASSENGER
+ | OccupantAwarenessDetection.VEHICLE_OCCUPANT_ROW_2_PASSENGER_CENTER);
+
+ assertThat(OccupantAwarenessUtils.convertToRole(
+ android.hardware.automotive.occupant_awareness.Role.ALL_OCCUPANTS))
+ .isEqualTo(OccupantAwarenessDetection.VEHICLE_OCCUPANT_ALL_OCCUPANTS);
+ }
+}
