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

Convert thermal hal test to use VtsHalHidlTargetTestEnvBase

Browse source 
Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalThermalV1_0Target
      vts-tradefed run vts -m VtsHalThermallV1_1Target

Change-Id: I460fc2bc56770b7acb31d47693e08f80aa30b154
This commit is contained in:
Zhuoyao Zhang 2018-02-08 21:10:21 -08:00
parent 8f7ff5730b
commit e01b187b9d
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
thermal/1.0/vts/functional/VtsHalThermalV1_0TargetTest.cpp
View file

@ -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;

20
thermal/1.1/vts/functional/VtsHalThermalV1_1TargetTest.cpp
View file

@ -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;