Convert fingerprint hal test to use VtsHalHidlTargetTestEnvBase am: e95d49ac44 am: 8c85bdb217

am: 1d56f169e2

Change-Id: Icc48f25f2800a5780f467c406c8d7a59e483ad04
This commit is contained in:
Zhuoyao Zhang
2018-02-09 17:50:28 +00:00
committed by android-build-merger

View File

@@ -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;