commit 6a022ad1c485f283cc2e138a16fcaa53b016e64c
author Anthony Stange <stange@google.com> Thu Mar 25 19:48:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 25 19:48:16 2021 +0000
tree 53bb0bcf0fbc0d4c037c5d73593a5e0932f60f4c
parent 94b8b11324979daba3aa0e19473f0c494f717c75
parent 0b72e2e1051de14d9711dd54190f62fcad0d4914

Merge "Don't assert while a callback is registered"

sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h

diff --git a/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h b/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
index 8cf5003..47a8cc0 100644
--- a/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
+++ b/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
@@ -462,6 +462,7 @@
 
     // Wait for events to be written back to the Event FMQ
     callback.waitForEvents(sensors, milliseconds(1000) /* timeout */);
+    getEnvironment()->unregisterCallback();
 
     for (const auto& s : sensors) {
         auto events = callback.getEvents(s.sensorHandle);
@@ -485,7 +486,6 @@
         ASSERT_EQ(lastEvent.u.vec3.status, injectedEvent.u.vec3.status);
     }
 
-    getEnvironment()->unregisterCallback();
     ASSERT_EQ(Result::OK, getSensors()->setOperationMode(OperationMode::NORMAL));
 }
 
@@ -603,7 +603,7 @@
                          << " type=" << static_cast<int>(sensor.type) << " name=" << sensor.name);
 
             Result flushResult = flush(sensor.sensorHandle);
-            ASSERT_EQ(flushResult, expectedResponse);
+            EXPECT_EQ(flushResult, expectedResponse);
         }
     }