Merge "Convert dumpstate hal test to use VtsHalHidlTargetTestEnvBase" am: 250d67a157

am: 12b8312acf

Change-Id: I84ea7516a72737cad9d0db81f73a93befa795fd1
This commit is contained in:
Zhuoyao Zhang
2018-02-09 17:45:39 +00:00
committed by android-build-merger

View File

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