Merge "Convert thermal hal test to use VtsHalHidlTargetTestEnvBase" (3be1fe99) · Commits · e / os / android_hardware_interfaces

thermal/1.0/vts/functional/VtsHalThermalV1_0TargetTest.cpp

+20 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,11 @@

		#define LOG_TAG "thermal_hidl_hal_test"

		#include <VtsHalHidlTargetTestBase.h>
		#include <VtsHalHidlTargetTestEnvBase.h>
		#include <android-base/logging.h>
		#include <android/hardware/thermal/1.0/IThermal.h>
		#include <android/hardware/thermal/1.0/types.h>
		#include <VtsHalHidlTargetTestBase.h>
		#include <unistd.h>

		using ::android::hardware::hidl_string;
		@@ -45,11 +46,26 @@ using ::android::sp;
		#define MAX_DEVICE_TEMPERATURE 200
		#define MAX_FAN_SPEED 20000

		// Test environment for Thermal HIDL HAL.
		class ThermalHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		public:
		// get the test environment singleton
		static ThermalHidlEnvironment* Instance() {
		static ThermalHidlEnvironment* instance = new ThermalHidlEnvironment;
		return instance;
		}

		virtual void registerTestServices() override { registerTestService<IThermal>(); }
		private:
		ThermalHidlEnvironment() {}
		};

		// The main test class for THERMAL HIDL HAL.
		class ThermalHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		public:
		virtual void SetUp() override {
		thermal_ = ::testing::VtsHalHidlTargetTestBase::getService<IThermal>();
		thermal_ = ::testing::VtsHalHidlTargetTestBase::getService<IThermal>(
		ThermalHidlEnvironment::Instance()->getServiceName<IThermal>());
		ASSERT_NE(thermal_, nullptr);
		baseSize_ = 0;
		names_.clear();
		@@ -207,7 +223,9 @@ TEST_F(ThermalHidlTest, CoolingDeviceTest) {
		}

		int main(int argc, char** argv) {
		::testing::AddGlobalTestEnvironment(ThermalHidlEnvironment::Instance());
		::testing::InitGoogleTest(&argc, argv);
		ThermalHidlEnvironment::Instance()->init(&argc, argv);
		int status = RUN_ALL_TESTS();
		LOG(INFO) << "Test result = " << status;
		return status;

thermal/1.1/vts/functional/VtsHalThermalV1_1TargetTest.cpp

+19 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@

		#include <VtsHalHidlTargetCallbackBase.h>
		#include <VtsHalHidlTargetTestBase.h>
		#include <VtsHalHidlTargetTestEnvBase.h>

		using ::android::hardware::thermal::V1_0::Temperature;
		using ::android::hardware::thermal::V1_0::TemperatureType;
		@@ -62,11 +63,26 @@ class ThermalCallback
		}
		};

		// Test environment for Thermal HIDL HAL.
		class ThermalHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		public:
		// get the test environment singleton
		static ThermalHidlEnvironment* Instance() {
		static ThermalHidlEnvironment* instance = new ThermalHidlEnvironment;
		return instance;
		}

		virtual void registerTestServices() override { registerTestService<IThermal>(); }
		private:
		ThermalHidlEnvironment() {}
		};

		// The main test class for THERMAL HIDL HAL 1.1.
		class ThermalHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		public:
		virtual void SetUp() override {
		mThermal = ::testing::VtsHalHidlTargetTestBase::getService<IThermal>();
		mThermal = ::testing::VtsHalHidlTargetTestBase::getService<IThermal>(
		ThermalHidlEnvironment::Instance()->getServiceName<IThermal>());
		ASSERT_NE(mThermal, nullptr);
		mThermalCallback = new(std::nothrow) ThermalCallback();
		ASSERT_NE(mThermalCallback, nullptr);
		@@ -99,7 +115,9 @@ TEST_F(ThermalHidlTest, NotifyThrottlingTest) {
		}

		int main(int argc, char** argv) {
		::testing::AddGlobalTestEnvironment(ThermalHidlEnvironment::Instance());
		::testing::InitGoogleTest(&argc, argv);
		ThermalHidlEnvironment::Instance()->init(&argc, argv);
		int status = RUN_ALL_TESTS();
		cout << "Test result = " << status << std::endl;
		return status;