diff options
author | Zhuoyao Zhang <zhuoyao@google.com> | 2017-12-05 01:16:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-05 01:16:53 +0000 |
commit | cc0933aa4502fb293798fcf95e263a8818baf0cb (patch) | |
tree | 0b88c42102f1c5714c00f48d16e6f45ffc41b2a3 /power | |
parent | 85a3fa9d65223a8960c025325d8a7b852e1be94a (diff) | |
parent | 6ab5305323f59510e7e83be06bf5ef5d8331453b (diff) | |
download | android_hardware_interfaces-cc0933aa4502fb293798fcf95e263a8818baf0cb.tar.gz android_hardware_interfaces-cc0933aa4502fb293798fcf95e263a8818baf0cb.tar.bz2 android_hardware_interfaces-cc0933aa4502fb293798fcf95e263a8818baf0cb.zip |
Merge "Convert boot, memtrack and power hal to use service name aware testing." am: b9515d9d3f am: a713584847
am: 6ab5305323
Change-Id: I0f8598253e34b08e73b8b65ff7fe91d937d5d8ad
Diffstat (limited to 'power')
-rw-r--r-- | power/1.0/vts/functional/VtsHalPowerV1_0TargetTest.cpp | 28 | ||||
-rw-r--r-- | power/1.1/vts/functional/VtsHalPowerV1_1TargetTest.cpp | 28 |
2 files changed, 44 insertions, 12 deletions
diff --git a/power/1.0/vts/functional/VtsHalPowerV1_0TargetTest.cpp b/power/1.0/vts/functional/VtsHalPowerV1_0TargetTest.cpp index da49dfcf3..999b2b420 100644 --- a/power/1.0/vts/functional/VtsHalPowerV1_0TargetTest.cpp +++ b/power/1.0/vts/functional/VtsHalPowerV1_0TargetTest.cpp @@ -23,6 +23,7 @@ #include <android/hardware/power/1.0/IPower.h> #include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> #include <fcntl.h> #include <algorithm> @@ -44,11 +45,24 @@ using std::vector; #define AVAILABLE_GOVERNORS_PATH \ "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors" +// Test environment for Power HIDL HAL. +class PowerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static PowerHidlEnvironment* Instance() { + static PowerHidlEnvironment* instance = new PowerHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<IPower>(); } +}; + class PowerHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { - power = ::testing::VtsHalHidlTargetTestBase::getService<IPower>(); - ASSERT_NE(power, nullptr); + power = ::testing::VtsHalHidlTargetTestBase::getService<IPower>( + PowerHidlEnvironment::Instance()->getServiceName<IPower>()); + ASSERT_NE(power, nullptr); } virtual void TearDown() override {} @@ -178,8 +192,10 @@ TEST_F(PowerHidlTest, GetPlatformLowPowerStats) { } int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; - return status; + ::testing::AddGlobalTestEnvironment(PowerHidlEnvironment::Instance()); + ::testing::InitGoogleTest(&argc, argv); + PowerHidlEnvironment::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + LOG(INFO) << "Test result = " << status; + return status; } diff --git a/power/1.1/vts/functional/VtsHalPowerV1_1TargetTest.cpp b/power/1.1/vts/functional/VtsHalPowerV1_1TargetTest.cpp index dc843f49d..4427b1550 100644 --- a/power/1.1/vts/functional/VtsHalPowerV1_1TargetTest.cpp +++ b/power/1.1/vts/functional/VtsHalPowerV1_1TargetTest.cpp @@ -19,6 +19,7 @@ #include <android/hardware/power/1.1/IPower.h> #include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> using ::android::hardware::power::V1_1::IPower; using ::android::hardware::power::V1_1::PowerStateSubsystem; @@ -28,11 +29,24 @@ using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::sp; +// Test environment for Power HIDL HAL. +class PowerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static PowerHidlEnvironment* Instance() { + static PowerHidlEnvironment* instance = new PowerHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<IPower>(); } +}; + class PowerHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { - power = ::testing::VtsHalHidlTargetTestBase::getService<IPower>(); - ASSERT_NE(power, nullptr); + power = ::testing::VtsHalHidlTargetTestBase::getService<IPower>( + PowerHidlEnvironment::Instance()->getServiceName<IPower>()); + ASSERT_NE(power, nullptr); } virtual void TearDown() override {} @@ -91,8 +105,10 @@ TEST_F(PowerHidlTest, PowerHintAsync) { } int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; - return status; + ::testing::AddGlobalTestEnvironment(PowerHidlEnvironment::Instance()); + ::testing::InitGoogleTest(&argc, argv); + PowerHidlEnvironment::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + LOG(INFO) << "Test result = " << status; + return status; } |