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

Commit 7551d700 authored by Tri Vo's avatar Tri Vo Committed by Automerger Merge Worker
Browse files

Merge "trusty: metrics: Drain events before each test" am: a6ac1d6b am:... 

Merge "trusty: metrics: Drain events before each test" am: a6ac1d6b am: 0b5183d5 am: 978af011 am: 748e3d41

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2169030



Change-Id: Ia8dbb71e01a733dbc46c1f83522e4bb539ed9477
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0d45e64 748e3d41

trusty/metrics/metrics_test.cpp

+18 −0
Original line number Diff line number Diff line
@@ -61,6 +61,18 @@ class TrustyMetricsTest : public TrustyMetrics, public ::testing::Test { 
    virtual void SetUp() override {

        auto ret = Open();

        ASSERT_TRUE(ret.ok()) << ret.error();



        /* Drain events (if any) and reset state */

        DrainEvents();

        crashed_app_.clear();

        event_drop_count_ = 0;

    }



    void DrainEvents() {

        while (WaitForEvent(1000 /* 1 second timeout */).ok()) {

            auto ret = HandleEvent();

            ASSERT_TRUE(ret.ok()) << ret.error();

        }

    }



    void WaitForAndHandleEvent() {
@@ -79,6 +91,9 @@ TEST_F(TrustyMetricsTest, Crash) { 
    TriggerCrash();

    WaitForAndHandleEvent();



    /* Check that no event was dropped. */

    ASSERT_EQ(event_drop_count_, 0);



    /* Check that correct TA crashed. */

    ASSERT_EQ(crashed_app_, "36f5b435-5bd3-4526-8b76-200e3a7e79f3:crasher");

}
@@ -110,6 +125,9 @@ TEST_F(TrustyMetricsTest, PollSet) { 
    auto ret = HandleEvent();

    ASSERT_TRUE(ret.ok()) << ret.error();



    /* Check that no event was dropped. */

    ASSERT_EQ(event_drop_count_, 0);



    /* Check that correct TA crashed. */

    ASSERT_EQ(crashed_app_, "36f5b435-5bd3-4526-8b76-200e3a7e79f3:crasher");

}