diff options
author | Zhuoyao Zhang | 2018-02-08 23:13:22 -0600 |
---|---|---|
committer | Zhuoyao Zhang | 2018-02-12 17:13:38 -0600 |
commit | 7e1c2896adbb64aa4e975b15beb7796b7f3cb9bb (patch) | |
tree | 20f03e10b5c709b1f4229d816b2c031535b005e2 /vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp | |
parent | 9cdd6f951608e680a3bccbf986c602b3c8b56bbd (diff) | |
download | platform-hardware-interfaces-7e1c2896adbb64aa4e975b15beb7796b7f3cb9bb.tar.gz platform-hardware-interfaces-7e1c2896adbb64aa4e975b15beb7796b7f3cb9bb.tar.xz platform-hardware-interfaces-7e1c2896adbb64aa4e975b15beb7796b7f3cb9bb.zip |
Convert vibrator hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalVibratorV1_0Target
vts-tradefed run vts -m VtsHalVibratorV1_1Target
Change-Id: Iff6015b15c0cca93213e5afe976bd98b6cb3a13b
Diffstat (limited to 'vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp')
-rw-r--r-- | vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp b/vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp index d07d1b78..d8df18bb 100644 --- a/vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp +++ b/vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp | |||
@@ -17,6 +17,7 @@ | |||
17 | #define LOG_TAG "vibrator_hidl_hal_test" | 17 | #define LOG_TAG "vibrator_hidl_hal_test" |
18 | 18 | ||
19 | #include <VtsHalHidlTargetTestBase.h> | 19 | #include <VtsHalHidlTargetTestBase.h> |
20 | #include <VtsHalHidlTargetTestEnvBase.h> | ||
20 | #include <android-base/logging.h> | 21 | #include <android-base/logging.h> |
21 | #include <android/hardware/vibrator/1.0/types.h> | 22 | #include <android/hardware/vibrator/1.0/types.h> |
22 | #include <android/hardware/vibrator/1.2/IVibrator.h> | 23 | #include <android/hardware/vibrator/1.2/IVibrator.h> |
@@ -32,11 +33,27 @@ using ::android::hardware::Return; | |||
32 | using ::android::hardware::Void; | 33 | using ::android::hardware::Void; |
33 | using ::android::sp; | 34 | using ::android::sp; |
34 | 35 | ||
36 | // Test environment for Vibrator HIDL HAL. | ||
37 | class VibratorHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { | ||
38 | public: | ||
39 | // get the test environment singleton | ||
40 | static VibratorHidlEnvironment* Instance() { | ||
41 | static VibratorHidlEnvironment* instance = new VibratorHidlEnvironment; | ||
42 | return instance; | ||
43 | } | ||
44 | |||
45 | virtual void registerTestServices() override { registerTestService<IVibrator>(); } | ||
46 | |||
47 | private: | ||
48 | VibratorHidlEnvironment() {} | ||
49 | }; | ||
50 | |||
35 | // The main test class for VIBRATOR HIDL HAL 1.2. | 51 | // The main test class for VIBRATOR HIDL HAL 1.2. |
36 | class VibratorHidlTest_1_2 : public ::testing::VtsHalHidlTargetTestBase { | 52 | class VibratorHidlTest_1_2 : public ::testing::VtsHalHidlTargetTestBase { |
37 | public: | 53 | public: |
38 | virtual void SetUp() override { | 54 | virtual void SetUp() override { |
39 | vibrator = ::testing::VtsHalHidlTargetTestBase::getService<IVibrator>(); | 55 | vibrator = ::testing::VtsHalHidlTargetTestBase::getService<IVibrator>( |
56 | VibratorHidlEnvironment::Instance()->getServiceName<IVibrator>()); | ||
40 | ASSERT_NE(vibrator, nullptr); | 57 | ASSERT_NE(vibrator, nullptr); |
41 | } | 58 | } |
42 | 59 | ||
@@ -65,7 +82,9 @@ TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2) { | |||
65 | } | 82 | } |
66 | 83 | ||
67 | int main(int argc, char** argv) { | 84 | int main(int argc, char** argv) { |
85 | ::testing::AddGlobalTestEnvironment(VibratorHidlEnvironment::Instance()); | ||
68 | ::testing::InitGoogleTest(&argc, argv); | 86 | ::testing::InitGoogleTest(&argc, argv); |
87 | VibratorHidlEnvironment::Instance()->init(&argc, argv); | ||
69 | int status = RUN_ALL_TESTS(); | 88 | int status = RUN_ALL_TESTS(); |
70 | LOG(INFO) << "Test result = " << status; | 89 | LOG(INFO) << "Test result = " << status; |
71 | return status; | 90 | return status; |