tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix IFingerprint VTS

Browse source 
The main function was not defined/visible because it was inside of a
namespace. The default GTest main was used instead, and the Binder
threadpool was never initialized, causing the test to hang.

In addition to that, the test expected a single onStateChanged with
SessionState::AUTHENTICATING. Added support and expectations for
multiple callback invocations.

Bug: 181184674
Test: atest VtsHalBiometricsFingerprintTargetTest
Change-Id: I1da72a81b091c7382494a2c4828c113671de845c
This commit is contained in:
Ilya Matyukhin 2021-02-26 12:24:18 -08:00
parent c605e0b9b3
commit 5e09b82829
1 changed files with 54 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
View file

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <aidl/Gtest.h>
#include <aidl/Vintf.h>
#include <aidl/android/hardware/biometrics/fingerprint/BnFingerprint.h>
@ -30,25 +31,35 @@ constexpr int kSensorId = 0;
constexpr int kUserId = 0;
constexpr auto kCallbackTimeout = std::chrono::seconds(1);
enum class SessionCallbackMethodName {
enum class MethodName {
kOnStateChanged,
};
struct SessionCallbackInvocation {
SessionCallbackMethodName method_name;
struct Invocation {
MethodName methodName;
int32_t cookie;
SessionState state;
};
class SessionCallback : public BnSessionCallback {
public:
explicit SessionCallback(std::promise<SessionCallbackInvocation> invocation_promise)
: invocation_promise_(std::move(invocation_promise)) {}
explicit SessionCallback() : mIsPromiseValid(false) {}
ndk::ScopedAStatus onStateChanged(int32_t /*cookie*/, SessionState state) override {
SessionCallbackInvocation invocation = {};
invocation.method_name = SessionCallbackMethodName::kOnStateChanged;
void setPromise(std::promise<std::vector<Invocation>>&& promise) {
mPromise = std::move(promise);
mIsPromiseValid = true;
}
ndk::ScopedAStatus onStateChanged(int32_t cookie, SessionState state) override {
Invocation invocation = {};
invocation.methodName = MethodName::kOnStateChanged;
invocation.cookie = cookie;
invocation.state = state;
invocation_promise_.set_value(invocation);
mInvocations.push_back(invocation);
if (state == SessionState::IDLING) {
assert(mIsPromiseValid);
mPromise.set_value(mInvocations);
}
return ndk::ScopedAStatus::ok();
}
@ -73,26 +84,20 @@ class SessionCallback : public BnSessionCallback {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onAuthenticationSucceeded(int32_t /*enrollmentId*/,
const keymaster::HardwareAuthToken& /*hat*/) override {
ndk::ScopedAStatus onAuthenticationSucceeded(
int32_t /*enrollmentId*/, const keymaster::HardwareAuthToken& /*hat*/) override {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onAuthenticationFailed() override {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onAuthenticationFailed() override { return ndk::ScopedAStatus::ok(); }
ndk::ScopedAStatus onLockoutTimed(int64_t /*durationMillis*/) override {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onLockoutPermanent() override {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onLockoutPermanent() override { return ndk::ScopedAStatus::ok(); }
ndk::ScopedAStatus onLockoutCleared() override {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus onLockoutCleared() override { return ndk::ScopedAStatus::ok(); }
ndk::ScopedAStatus onInteractionDetected() override { return ndk::ScopedAStatus::ok(); }
@ -115,7 +120,9 @@ class SessionCallback : public BnSessionCallback {
}
private:
std::promise<SessionCallbackInvocation> invocation_promise_;
bool mIsPromiseValid;
std::vector<Invocation> mInvocations;
std::promise<std::vector<Invocation>> mPromise;
};
class Fingerprint : public testing::TestWithParam<std::string> {
@ -123,28 +130,40 @@ class Fingerprint : public testing::TestWithParam<std::string> {
void SetUp() override {
AIBinder* binder = AServiceManager_waitForService(GetParam().c_str());
ASSERT_NE(binder, nullptr);
hal_ = IFingerprint::fromBinder(ndk::SpAIBinder(binder));
mHal = IFingerprint::fromBinder(ndk::SpAIBinder(binder));
}
std::shared_ptr<IFingerprint> hal_;
std::shared_ptr<IFingerprint> mHal;
};
TEST_P(Fingerprint, AuthenticateTest) {
std::promise<SessionCallbackInvocation> invocation_promise;
std::future<SessionCallbackInvocation> invocation_future = invocation_promise.get_future();
std::shared_ptr<SessionCallback> session_cb =
ndk::SharedRefBase::make<SessionCallback>(std::move(invocation_promise));
// Prepare the callback
std::promise<std::vector<Invocation>> promise;
auto future = promise.get_future();
std::shared_ptr<SessionCallback> cb = ndk::SharedRefBase::make<SessionCallback>();
cb->setPromise(std::move(promise));
// Create a session
std::shared_ptr<ISession> session;
ASSERT_TRUE(hal_->createSession(kSensorId, kUserId, session_cb, &session).isOk());
ASSERT_TRUE(mHal->createSession(kSensorId, kUserId, cb, &session).isOk());
std::shared_ptr<common::ICancellationSignal> cancel_cb;
ASSERT_TRUE(session->authenticate(0, 0, &cancel_cb).isOk());
ASSERT_EQ(invocation_future.wait_for(kCallbackTimeout), std::future_status::ready);
// Call authenticate
int32_t cookie = 123;
std::shared_ptr<common::ICancellationSignal> cancellationSignal;
ASSERT_TRUE(session->authenticate(cookie, 0, &cancellationSignal).isOk());
SessionCallbackInvocation invocation = invocation_future.get();
EXPECT_EQ(invocation.method_name, SessionCallbackMethodName::kOnStateChanged);
EXPECT_EQ(invocation.state, SessionState::AUTHENTICATING);
// Get the results
ASSERT_TRUE(future.wait_for(kCallbackTimeout) == std::future_status::ready);
std::vector<Invocation> invocations = future.get();
// Close the session
ASSERT_TRUE(session->close(0).isOk());
ASSERT_FALSE(invocations.empty());
EXPECT_EQ(invocations.front().methodName, MethodName::kOnStateChanged);
EXPECT_EQ(invocations.front().state, SessionState::AUTHENTICATING);
EXPECT_EQ(invocations.back().methodName, MethodName::kOnStateChanged);
EXPECT_EQ(invocations.back().state, SessionState::IDLING);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Fingerprint);
@ -154,6 +173,7 @@ INSTANTIATE_TEST_SUITE_P(
::android::PrintInstanceNameToString);
} // namespace
} // namespace aidl::android::hardware::biometrics::fingerprint
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
@ -161,5 +181,3 @@ int main(int argc, char** argv) {
ABinderProcess_startThreadPool();
return RUN_ALL_TESTS();
}
} // namespace aidl::android::hardware::biometrics::fingerprint