Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Enforce sensors of the same type having a unique name." into sc-dev am: 5ce2cca301

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

Change-Id: Ib5449b22e3b029f65226c518235c9b51863e831e
This commit is contained in:
Karthik Bharadwaj
2021-06-17 23:38:56 +00:00
committed by Automerger Merge Worker
parent 97888be2ae 5ce2cca301
commit ca264fbc59
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp
View File

@@ -24,7 +24,9 @@
#include <log/log.h>
#include <utils/SystemClock.h>
#include <algorithm>
#include <cinttypes>
#include <unordered_map>
#include <vector>
using ::android::hardware::Return;
@@ -149,6 +151,7 @@ std::vector<SensorInfo> SensorsHidlTest::getSensorsList() {
TEST_P(SensorsHidlTest, SensorListValid) {
S()->getSensorsList([&](const auto& list) {
const size_t count = list.size();
std::unordered_map<int32_t, std::vector<std::string>> sensorTypeNameMap;
for (size_t i = 0; i < count; ++i) {
const auto& s = list[i];
SCOPED_TRACE(::testing::Message()
@@ -167,6 +170,14 @@ TEST_P(SensorsHidlTest, SensorListValid) {
EXPECT_FALSE(s.name.empty());
EXPECT_FALSE(s.vendor.empty());
// Make sure that sensors of the same type have a unique name.
std::vector<std::string>& v = sensorTypeNameMap[static_cast<int32_t>(s.type)];
bool isUniqueName = std::find(v.begin(), v.end(), s.name) == v.end();
EXPECT_TRUE(isUniqueName) << "Duplicate sensor Name: " << s.name;
if (isUniqueName) {
v.push_back(s.name);
}
// Test power > 0, maxRange > 0
EXPECT_LE(0, s.power);
EXPECT_LT(0, s.maxRange);

11
sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
View File

@@ -26,10 +26,12 @@
#include <log/log.h>
#include <utils/SystemClock.h>
#include <algorithm>
#include <cinttypes>
#include <condition_variable>
#include <cstring>
#include <map>
#include <unordered_map>
#include <vector>
/**
@@ -373,6 +375,7 @@ int32_t SensorsHidlTest::getInvalidSensorHandle() {
TEST_P(SensorsHidlTest, SensorListValid) {
getSensors()->getSensorsList([&](const auto& list) {
const size_t count = list.size();
std::unordered_map<int32_t, std::vector<std::string>> sensorTypeNameMap;
for (size_t i = 0; i < count; ++i) {
const auto& s = list[i];
SCOPED_TRACE(::testing::Message()
@@ -393,6 +396,14 @@ TEST_P(SensorsHidlTest, SensorListValid) {
EXPECT_FALSE(s.name.empty());
EXPECT_FALSE(s.vendor.empty());
// Make sure that sensors of the same type have a unique name.
std::vector<std::string>& v = sensorTypeNameMap[static_cast<int32_t>(s.type)];
bool isUniqueName = std::find(v.begin(), v.end(), s.name) == v.end();
EXPECT_TRUE(isUniqueName) << "Duplicate sensor Name: " << s.name;
if (isUniqueName) {
v.push_back(s.name);
}
// Test power > 0, maxRange > 0
EXPECT_LE(0, s.power);
EXPECT_LT(0, s.maxRange);