tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix VtsHalSensorsV2_0TargetTest am: 3beaf4faca

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

Change-Id: I7e198b398d0c69b25c54f51f69bd2581e55c0ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
lichen yu 2024-06-13 01:44:01 +00:00 committed by Automerger Merge Worker
commit d65c459061
1 changed files with 42 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
View file

@ -603,7 +603,16 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfoType>& sensors, b
EventCallback callback; EventCallback callback;
getEnvironment()->registerCallback(&callback); getEnvironment()->registerCallback(&callback);
for (const SensorInfoType& sensor : sensors) { // 10 sensors per group
constexpr size_t kSensorsPerGroup = 10;
for (size_t sensorOffset = 0; sensorOffset < sensors.size();
sensorOffset += kSensorsPerGroup) {
std::vector<SensorInfoType> sensorGroup(
sensors.begin() + sensorOffset,
sensors.begin() +
std::min(sensorOffset + kSensorsPerGroup, sensors.size()));
for (const SensorInfoType& sensor : sensorGroup) {
// Configure and activate the sensor // Configure and activate the sensor
batch(sensor.sensorHandle, sensor.maxDelay, 0 /* maxReportLatencyNs */); batch(sensor.sensorHandle, sensor.maxDelay, 0 /* maxReportLatencyNs */);
activate(sensor.sensorHandle, activateSensor); activate(sensor.sensorHandle, activateSensor);
@ -614,7 +623,8 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfoType>& sensors, b
<< "Flush " << i << "/" << flushCalls << ": " << "Flush " << i << "/" << flushCalls << ": "
<< " handle=0x" << std::hex << std::setw(8) << std::setfill('0') << " handle=0x" << std::hex << std::setw(8) << std::setfill('0')
<< sensor.sensorHandle << std::dec << sensor.sensorHandle << std::dec
<< " type=" << static_cast<int>(sensor.type) << " name=" << sensor.name); << " type=" << static_cast<int>(sensor.type)
<< " name=" << sensor.name);
Result flushResult = flush(sensor.sensorHandle); Result flushResult = flush(sensor.sensorHandle);
EXPECT_EQ(flushResult, expectedResponse); EXPECT_EQ(flushResult, expectedResponse);
@ -622,23 +632,26 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfoType>& sensors, b
} }
// Wait up to one second for the flush events // Wait up to one second for the flush events
callback.waitForFlushEvents(sensors, flushCalls, std::chrono::milliseconds(1000) /* timeout */); callback.waitForFlushEvents(sensorGroup, flushCalls,
std::chrono::milliseconds(1000) /* timeout */);
// Deactivate all sensors after waiting for flush events so pending flush events are not // Deactivate all sensors after waiting for flush events so pending flush events are not
// abandoned by the HAL. // abandoned by the HAL.
for (const SensorInfoType& sensor : sensors) { for (const SensorInfoType& sensor : sensorGroup) {
activate(sensor.sensorHandle, false); activate(sensor.sensorHandle, false);
} }
getEnvironment()->unregisterCallback();
// Check that the correct number of flushes are present for each sensor // Check that the correct number of flushes are present for each sensor
for (const SensorInfoType& sensor : sensors) { for (const SensorInfoType& sensor : sensorGroup) {
SCOPED_TRACE(::testing::Message() SCOPED_TRACE(::testing::Message()
<< " handle=0x" << std::hex << std::setw(8) << std::setfill('0') << " handle=0x" << std::hex << std::setw(8) << std::setfill('0')
<< sensor.sensorHandle << std::dec << " type=" << static_cast<int>(sensor.type) << sensor.sensorHandle << std::dec
<< " type=" << static_cast<int>(sensor.type)
<< " name=" << sensor.name); << " name=" << sensor.name);
ASSERT_EQ(callback.getFlushCount(sensor.sensorHandle), expectedFlushCount); ASSERT_EQ(callback.getFlushCount(sensor.sensorHandle), expectedFlushCount);
} }
}
getEnvironment()->unregisterCallback();
} }
TEST_P(SensorsHidlTest, FlushSensor) { TEST_P(SensorsHidlTest, FlushSensor) {