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

Merge "secure_element/aidl: add state checking in TearDown()"

Browse source
This commit is contained in:
Treehugger Robot 2023-03-27 04:14:17 +00:00 committed by Gerrit Code Review
commit eab4d44782
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp
View file

@ -83,10 +83,15 @@ class MySecureElementCallback : public BnSecureElementCallback {
void expectCallbackHistory(std::vector<bool>&& want) {
std::unique_lock<std::mutex> l(m);
cv.wait_for(l, 2s, [&]() { return history.size() >= want.size(); });
cv.wait_for(l, 5s, [&]() { return history.size() >= want.size(); });
EXPECT_THAT(history, ElementsAreArray(want));
}
void resetCallbackHistory() {
std::unique_lock<std::mutex> l(m);
history.clear();
}
private:
std::mutex m; // guards history
std::condition_variable cv;
@ -118,7 +123,9 @@ class SecureElementAidl : public ::testing::TestWithParam<std::string> {
}
void TearDown() override {
secure_element_callback_->resetCallbackHistory();
EXPECT_OK(secure_element_->reset());
secure_element_callback_->expectCallbackHistory({false, true});
secure_element_ = nullptr;
secure_element_callback_ = nullptr;
}