Convert health hal test to use VtsHalHidlTargetTestEnvBase

Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalHealthV1_0Target

Change-Id: Ibbe9421b5a737d7eb2d021bd64757a548d3c95fc
This commit is contained in:
Zhuoyao Zhang 2018-02-08 20:55:27 -08:00
parent 8f7ff5730b
commit 91456084c2

View file

@ -19,7 +19,9 @@
#include <android/hardware/health/1.0/IHealth.h>
#include <android/hardware/health/1.0/types.h>
#include <log/log.h>
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
using HealthConfig = ::android::hardware::health::V1_0::HealthConfig;
using HealthInfo = ::android::hardware::health::V1_0::HealthInfo;
@ -28,10 +30,25 @@ using Result = ::android::hardware::health::V1_0::Result;
using ::android::sp;
// Test environment for Health HIDL HAL.
class HealthHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
public:
// get the test environment singleton
static HealthHidlEnvironment* Instance() {
static HealthHidlEnvironment* instance = new HealthHidlEnvironment;
return instance;
}
virtual void registerTestServices() override { registerTestService<IHealth>(); }
private:
HealthHidlEnvironment() {}
};
class HealthHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
health = ::testing::VtsHalHidlTargetTestBase::getService<IHealth>();
health = ::testing::VtsHalHidlTargetTestBase::getService<IHealth>(
HealthHidlEnvironment::Instance()->getServiceName<IHealth>());
ASSERT_NE(health, nullptr);
health->init(config,
[&](const auto& halConfigOut) { config = halConfigOut; });
@ -57,7 +74,9 @@ TEST_F(HealthHidlTest, TestEnergyCounter) {
}
int main(int argc, char **argv) {
::testing::AddGlobalTestEnvironment(HealthHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
HealthHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS();
ALOGI("Test result = %d", status);
return status;