diff options
author | Zhuoyao Zhang | 2018-02-09 11:50:28 -0600 |
---|---|---|
committer | android-build-merger | 2018-02-09 11:50:28 -0600 |
commit | 4d413de2e7aee0e1609b5df05b6d558295352f93 (patch) | |
tree | 3c143b96d7ed7edf110fef0919414c7c67e5ebd5 /biometrics | |
parent | 093d01372176daaf60e8c30b42f37ba566f3eb90 (diff) | |
parent | 1d56f169e2e6bde45afee1cd0a7eecbfbec82f42 (diff) | |
download | platform-hardware-interfaces-4d413de2e7aee0e1609b5df05b6d558295352f93.tar.gz platform-hardware-interfaces-4d413de2e7aee0e1609b5df05b6d558295352f93.tar.xz platform-hardware-interfaces-4d413de2e7aee0e1609b5df05b6d558295352f93.zip |
Convert fingerprint hal test to use VtsHalHidlTargetTestEnvBase am: e95d49ac44 am: 8c85bdb217
am: 1d56f169e2
Change-Id: Icc48f25f2800a5780f467c406c8d7a59e483ad04
Diffstat (limited to 'biometrics')
-rw-r--r-- | biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp b/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp index 638af9f5..a7f40319 100644 --- a/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp +++ b/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp | |||
@@ -16,12 +16,13 @@ | |||
16 | 16 | ||
17 | #define LOG_TAG "fingerprint_hidl_hal_test" | 17 | #define LOG_TAG "fingerprint_hidl_hal_test" |
18 | 18 | ||
19 | #include <VtsHalHidlTargetTestBase.h> | ||
20 | #include <VtsHalHidlTargetTestEnvBase.h> | ||
19 | #include <android-base/logging.h> | 21 | #include <android-base/logging.h> |
20 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> | 22 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> |
21 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h> | 23 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h> |
22 | #include <hidl/HidlSupport.h> | 24 | #include <hidl/HidlSupport.h> |
23 | #include <hidl/HidlTransportSupport.h> | 25 | #include <hidl/HidlTransportSupport.h> |
24 | #include <VtsHalHidlTargetTestBase.h> | ||
25 | 26 | ||
26 | #include <cinttypes> | 27 | #include <cinttypes> |
27 | #include <future> | 28 | #include <future> |
@@ -179,10 +180,23 @@ class RemoveCallback : public FingerprintCallbackBase { | |||
179 | std::promise<void> promise; | 180 | std::promise<void> promise; |
180 | }; | 181 | }; |
181 | 182 | ||
183 | // Test environment for Fingerprint HIDL HAL. | ||
184 | class FingerprintHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { | ||
185 | public: | ||
186 | // get the test environment singleton | ||
187 | static FingerprintHidlEnvironment* Instance() { | ||
188 | static FingerprintHidlEnvironment* instance = new FingerprintHidlEnvironment; | ||
189 | return instance; | ||
190 | } | ||
191 | |||
192 | virtual void registerTestServices() override { registerTestService<IBiometricsFingerprint>(); } | ||
193 | }; | ||
194 | |||
182 | class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase { | 195 | class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase { |
183 | public: | 196 | public: |
184 | virtual void SetUp() override { | 197 | virtual void SetUp() override { |
185 | mService = ::testing::VtsHalHidlTargetTestBase::getService<IBiometricsFingerprint>(); | 198 | mService = ::testing::VtsHalHidlTargetTestBase::getService<IBiometricsFingerprint>( |
199 | FingerprintHidlEnvironment::Instance()->getServiceName<IBiometricsFingerprint>()); | ||
186 | ASSERT_FALSE(mService == nullptr); | 200 | ASSERT_FALSE(mService == nullptr); |
187 | 201 | ||
188 | // Create an active group | 202 | // Create an active group |
@@ -454,7 +468,9 @@ TEST_F(FingerprintHidlTest, CancelRemoveAllTest) { | |||
454 | } // anonymous namespace | 468 | } // anonymous namespace |
455 | 469 | ||
456 | int main(int argc, char **argv) { | 470 | int main(int argc, char **argv) { |
471 | ::testing::AddGlobalTestEnvironment(FingerprintHidlEnvironment::Instance()); | ||
457 | ::testing::InitGoogleTest(&argc, argv); | 472 | ::testing::InitGoogleTest(&argc, argv); |
473 | FingerprintHidlEnvironment::Instance()->init(&argc, argv); | ||
458 | int status = RUN_ALL_TESTS(); | 474 | int status = RUN_ALL_TESTS(); |
459 | LOG(INFO) << "Test result = " << status; | 475 | LOG(INFO) << "Test result = " << status; |
460 | return status; | 476 | return status; |