Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abd63478 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "secure_element/aidl: add state checking in TearDown()" am: eab4d447 am: 6d68e4c6 am: 8ffd4101 am: cf861ec5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2499636



Change-Id: I97a336674a2c4b8f3c249475c3b05e9a07260c5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0c917f9 cf861ec5

secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp

+8 −1
Original line number Diff line number Diff line
@@ -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;

    }