Merge "Convert ir hal test to use VtsHalHidlTargetTestEnvBase" am: e5c6cdccba

am: 462255199b

Change-Id: Iffe37869b7e914e6cd67fef5824165a7c5559d6a
This commit is contained in:
Zhuoyao Zhang
2018-02-11 06:03:52 +00:00
committed by android-build-merger

View File

@@ -22,6 +22,7 @@
#include <android/hardware/ir/1.0/types.h>
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <algorithm>
using ::android::hardware::ir::V1_0::IConsumerIr;
@@ -30,11 +31,26 @@ using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::sp;
// Test environment for Ir
class ConsumerIrHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
public:
// get the test environment singleton
static ConsumerIrHidlEnvironment* Instance() {
static ConsumerIrHidlEnvironment* instance = new ConsumerIrHidlEnvironment;
return instance;
}
virtual void registerTestServices() override { registerTestService<IConsumerIr>(); }
private:
ConsumerIrHidlEnvironment() {}
};
// The main test class for IR HIDL HAL.
class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
ir = ::testing::VtsHalHidlTargetTestBase::getService<IConsumerIr>();
ir = ::testing::VtsHalHidlTargetTestBase::getService<IConsumerIr>(
ConsumerIrHidlEnvironment::Instance()->getServiceName<IConsumerIr>());
ASSERT_NE(ir, nullptr);
}
@@ -77,7 +93,9 @@ TEST_F(ConsumerIrHidlTest, BadFreqTest) {
}
int main(int argc, char **argv) {
::testing::AddGlobalTestEnvironment(ConsumerIrHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
ConsumerIrHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS();
LOG(INFO) << "Test result = " << status;
return status;