diff options
author | Zhuoyao Zhang <zhuoyao@google.com> | 2018-02-08 12:48:48 -0800 |
---|---|---|
committer | Zhuoyao Zhang <zhuoyao@google.com> | 2018-02-08 22:24:04 -0800 |
commit | e95d49ac4424ea6f6f62f42f9140ccb94a207057 (patch) | |
tree | 64bf2c5db7fd417cb6871f748acb727e70d58e24 /biometrics | |
parent | 8f7ff5730b152542d476b039b15601785e3b777a (diff) | |
download | android_hardware_interfaces-e95d49ac4424ea6f6f62f42f9140ccb94a207057.tar.gz android_hardware_interfaces-e95d49ac4424ea6f6f62f42f9140ccb94a207057.tar.bz2 android_hardware_interfaces-e95d49ac4424ea6f6f62f42f9140ccb94a207057.zip |
Convert fingerprint hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalBiometricsFingerprintV2_0Target
Change-Id: Ia5be72669a8abae64009c659b6c991a0e64c2d0d
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 638af9f51..a7f40319a 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 @@ #define LOG_TAG "fingerprint_hidl_hal_test" +#include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> #include <android-base/logging.h> #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h> #include <hidl/HidlSupport.h> #include <hidl/HidlTransportSupport.h> -#include <VtsHalHidlTargetTestBase.h> #include <cinttypes> #include <future> @@ -179,10 +180,23 @@ class RemoveCallback : public FingerprintCallbackBase { std::promise<void> promise; }; +// Test environment for Fingerprint HIDL HAL. +class FingerprintHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static FingerprintHidlEnvironment* Instance() { + static FingerprintHidlEnvironment* instance = new FingerprintHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<IBiometricsFingerprint>(); } +}; + class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { - mService = ::testing::VtsHalHidlTargetTestBase::getService<IBiometricsFingerprint>(); + mService = ::testing::VtsHalHidlTargetTestBase::getService<IBiometricsFingerprint>( + FingerprintHidlEnvironment::Instance()->getServiceName<IBiometricsFingerprint>()); ASSERT_FALSE(mService == nullptr); // Create an active group @@ -454,7 +468,9 @@ TEST_F(FingerprintHidlTest, CancelRemoveAllTest) { } // anonymous namespace int main(int argc, char **argv) { + ::testing::AddGlobalTestEnvironment(FingerprintHidlEnvironment::Instance()); ::testing::InitGoogleTest(&argc, argv); + FingerprintHidlEnvironment::Instance()->init(&argc, argv); int status = RUN_ALL_TESTS(); LOG(INFO) << "Test result = " << status; return status; |