Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-01-27 18:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Skip event count assertion on reporting mode" into android14-tests-dev am: 70be0c430b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3152456

Change-Id: I0638cc51cdf145a052e7d531423e25450fb35bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shih-Cheng Tu
2024-08-01 05:47:48 +00:00
committed by Automerger Merge Worker
parent 4cb59fdcb0 70be0c430b
commit d69acec03e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp
View File

@@ -714,11 +714,14 @@ TEST_P(SensorsAidlTest, CallInitializeTwice) {
return; // Exit early if setting up the new environment failed
}
size_t numNonOneShotAndNonSpecialSensors = getNonOneShotAndNonSpecialSensors().size();
activateAllSensors(true);
// Verify that the old environment does not receive any events
EXPECT_EQ(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), 0);
// Verify that the new event queue receives sensor events
EXPECT_GE(newEnv.get()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
if (numNonOneShotAndNonSpecialSensors > 0) {
// Verify that the new event queue receives sensor events
EXPECT_GE(newEnv.get()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
}
activateAllSensors(false);
// Cleanup the test environment
@@ -733,7 +736,9 @@ TEST_P(SensorsAidlTest, CallInitializeTwice) {
// Ensure that the original environment is receiving events
activateAllSensors(true);
EXPECT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
if (numNonOneShotAndNonSpecialSensors > 0) {
EXPECT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
}
activateAllSensors(false);
}
@@ -743,7 +748,11 @@ TEST_P(SensorsAidlTest, CleanupConnectionsOnInitialize) {
// Verify that events are received
constexpr useconds_t kCollectionTimeoutUs = 1000 * 1000; // 1s
constexpr int32_t kNumEvents = 1;
ASSERT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
size_t numNonOneShotAndNonSpecialSensors = getNonOneShotAndNonSpecialSensors().size();
if (numNonOneShotAndNonSpecialSensors > 0) {
ASSERT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
}
// Clear the active sensor handles so they are not disabled during TearDown
auto handles = mSensorHandles;
@@ -757,7 +766,9 @@ TEST_P(SensorsAidlTest, CleanupConnectionsOnInitialize) {
// Verify no events are received until sensors are re-activated
ASSERT_EQ(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), 0);
activateAllSensors(true);
ASSERT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
if (numNonOneShotAndNonSpecialSensors > 0) {
ASSERT_GE(getEnvironment()->collectEvents(kCollectionTimeoutUs, kNumEvents).size(), kNumEvents);
}
// Disable sensors
activateAllSensors(false);