Merge "thermal: fix VTS test for default implementation" (4cb19c55) · Commits · e / os / android_hardware_interfaces

thermal/1.0/vts/functional/VtsHalThermalV1_0TargetTest.cpp

+9 −8

Original line number	Diff line number	Diff line
		@@ -68,9 +68,11 @@ class ThermalHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		if (i < baseSize_) {
		EXPECT_EQ(names_[i], temperatures[i].name.c_str());
		} else {
		// Names must be unique.
		// Names must be unique only for known temperature types.
		if (temperatures[i].type != TemperatureType::UNKNOWN) {
		EXPECT_EQ(names_.end(), std::find(names_.begin(), names_.end(),
		temperatures[i].name.c_str()));
		}
		names_.push_back(temperatures[i].name);
		}
		}
		@@ -88,9 +90,8 @@ class ThermalHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		if (i < baseSize_) {
		EXPECT_EQ(names_[i], cpuUsages[i].name.c_str());
		} else {
		// Names must be unique.
		EXPECT_EQ(names_.end(), std::find(names_.begin(), names_.end(),
		cpuUsages[i].name.c_str()));
		// Names are not guaranteed to be unique because of the current
		// default Thermal HAL implementation.
		names_.push_back(cpuUsages[i].name);
		}
		}