diff options
| -rw-r--r-- | ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp b/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp index a01740462c..5fd2dd4c77 100644 --- a/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp +++ b/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp @@ -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; |