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

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

Merge "init/epoll_test: Improve this test" am: 6314ba7f am: 394cc04d am: 51d9d931 

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



Change-Id: I89d3993e0b8052faf5425495cd13f256f94ee8bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49af4cfc 51d9d931

init/epoll_test.cpp

+8 −9
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <unordered_set>



#include <android-base/file.h>

#include <android-base/logging.h>

#include <gtest/gtest.h>



namespace android {
@@ -30,14 +31,10 @@ std::unordered_set<void*> sValidObjects; 


class CatchDtor final {

  public:

    CatchDtor() { sValidObjects.emplace(this); }

    CatchDtor(const CatchDtor&) { sValidObjects.emplace(this); }

    ~CatchDtor() {

        auto iter = sValidObjects.find(this);

        if (iter != sValidObjects.end()) {

            sValidObjects.erase(iter);

        }

    }

    CatchDtor() { CHECK(sValidObjects.emplace(this).second); }

    CatchDtor(const CatchDtor&) { CHECK(sValidObjects.emplace(this).second); }

    CatchDtor(const CatchDtor&&) { CHECK(sValidObjects.emplace(this).second); }

    ~CatchDtor() { CHECK_EQ(sValidObjects.erase(this), size_t{1}); }

};



TEST(epoll, UnregisterHandler) {
@@ -48,11 +45,13 @@ TEST(epoll, UnregisterHandler) { 
    ASSERT_EQ(pipe(fds), 0);



    CatchDtor catch_dtor;

    bool handler_invoked;

    bool handler_invoked = false;

    auto handler = [&, catch_dtor]() -> void {

        auto result = epoll.UnregisterHandler(fds[0]);

        ASSERT_EQ(result.ok(), !handler_invoked);

        handler_invoked = true;

        // The assert statement below verifies that the UnregisterHandler() call

        // above did not destroy the current std::function<> instance.

        ASSERT_NE(sValidObjects.find((void*)&catch_dtor), sValidObjects.end());

    };