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

Merge "Ignore meta sensor events when checking values" into oreo-vts-dev am: d09fdd6ca1 am: bfc5b817e7

Browse source 
am: 5b2f3f3c7c

Change-Id: Ic1d04b1a252274715b4f9a7168ffaf141e305c5b
This commit is contained in:
Peng Xu 2018-04-10 14:41:34 -07:00 committed by android-build-merger
commit f183230f46
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp
View file

@ -956,6 +956,7 @@ void SensorsHidlTest::testStreamingOperation(SensorType type,
std::chrono::seconds duration,
const SensorEventsChecker &checker) {
std::vector<Event> events;
std::vector<Event> sensorEvents;
const int64_t samplingPeriodInNs = samplingPeriod.count();
const int64_t batchingPeriodInNs = 0; // no batching
@ -985,7 +986,6 @@ void SensorsHidlTest::testStreamingOperation(SensorType type,
ASSERT_GT(events.size(), 0u);
size_t nRealEvent = 0;
bool handleMismatchReported = false;
bool metaSensorTypeErrorReported = false;
for (auto & e : events) {
@ -996,7 +996,7 @@ void SensorsHidlTest::testStreamingOperation(SensorType type,
<< (handleMismatchReported = true,
"Event of the same type must come from the sensor registered");
}
++ nRealEvent;
sensorEvents.push_back(e);
} else {
// avoid generating hundreds of error
if (!metaSensorTypeErrorReported) {
@ -1008,9 +1008,10 @@ void SensorsHidlTest::testStreamingOperation(SensorType type,
}
std::string s;
EXPECT_TRUE(checker.check(events, &s)) << s;
EXPECT_TRUE(checker.check(sensorEvents, &s)) << s;
EXPECT_GE(nRealEvent, minNEvent / 2); // make sure returned events are not all meta
EXPECT_GE(sensorEvents.size(),
minNEvent / 2); // make sure returned events are not all meta
}
// Test if sensor hal can do UI speed accelerometer streaming properly
@ -1367,16 +1368,24 @@ void SensorsHidlTest::testDirectReportOperation(
bool typeErrorReported = false;
bool tokenErrorReported = false;
bool timestampErrorReported = false;
std::vector<Event> sensorEvents;
for (auto &e : events) {
if (!typeErrorReported) {
EXPECT_EQ(type, e.sensorType)
<< (typeErrorReported = true, "Type in event does not match type of sensor registered.");
}
if (!tokenErrorReported) {
EXPECT_EQ(eventToken, e.sensorHandle)
<< (tokenErrorReported = true,
"Event token does not match that retured from configDirectReport");
}
if (isMetaSensorType(e.sensorType)) {
continue;
}
sensorEvents.push_back(e);
if (!typeErrorReported) {
EXPECT_EQ(type, e.sensorType)
<< (typeErrorReported = true,
"Type in event does not match type of sensor registered.");
}
if (!timestampErrorReported) {
EXPECT_GT(e.timestamp, lastTimestamp)
<< (timestampErrorReported = true, "Timestamp not monotonically increasing");
@ -1385,7 +1394,7 @@ void SensorsHidlTest::testDirectReportOperation(
}
std::string s;
EXPECT_TRUE(checker.check(events, &s)) << s;
EXPECT_TRUE(checker.check(sensorEvents, &s)) << s;
// stop sensor and unregister channel
configDirectReport(sensor.sensorHandle, channelHandle, RateLevel::STOP,