Merge "Convert dumpstate hal test to use VtsHalHidlTargetTestEnvBase"

am: 250d67a157

Change-Id: I63bf8959d4f432052d81ce20e7f6fe351aa1d696
This commit is contained in:
Zhuoyao Zhang 2018-02-09 17:39:35 +00:00 committed by android-build-merger
commit 12b8312acf

View file

@ -21,15 +21,29 @@
#include <log/log.h>
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;
using ::android::hardware::Return;
using ::android::sp;
// Test environment for Dumpstate HIDL HAL.
class DumpstateHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
public:
// get the test environment singleton
static DumpstateHidlEnvironment* Instance() {
static DumpstateHidlEnvironment* instance = new DumpstateHidlEnvironment;
return instance;
}
virtual void registerTestServices() override { registerTestService<IDumpstateDevice>(); }
};
class DumpstateHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
dumpstate = ::testing::VtsHalHidlTargetTestBase::getService<IDumpstateDevice>();
dumpstate = ::testing::VtsHalHidlTargetTestBase::getService<IDumpstateDevice>(
DumpstateHidlEnvironment::Instance()->getServiceName<IDumpstateDevice>());
ASSERT_NE(dumpstate, nullptr) << "Could not get HIDL instance";
}
@ -105,7 +119,9 @@ TEST_F(DumpstateHidlTest, TestHandleWithTwoFds) {
}
int main(int argc, char** argv) {
::testing::AddGlobalTestEnvironment(DumpstateHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
DumpstateHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS();
ALOGI("Test result = %d", status);
return status;