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

Commit 1f98fbe8 authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai
Browse files

Skip BufferHub_test if BufferHub service is not running 

Bug: 112940221
Bug: 123429755
Test: BufferHub_test
Change-Id: Ia9f8f05dc56458026ccb7dd674a270764eba189e
parent a773fbea

libs/ui/tests/BufferHubBuffer_test.cpp

+23 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <errno.h>

#include <sys/epoll.h>



#include <android/frameworks/bufferhub/1.0/IBufferHub.h>

#include <android/hardware_buffer.h>

#include <cutils/native_handle.h>

#include <gmock/gmock.h>
@@ -40,6 +41,7 @@ using ::android::BufferHubDefs::isClientGained; 
using ::android::BufferHubDefs::isClientPosted;

using ::android::BufferHubDefs::isClientReleased;

using ::android::BufferHubDefs::kMetadataHeaderSize;

using ::android::frameworks::bufferhub::V1_0::IBufferHub;

using ::testing::IsNull;

using ::testing::NotNull;
@@ -54,7 +56,20 @@ const size_t kUserMetadataSize = 1; 


class BufferHubBufferTest : public ::testing::Test {

protected:

    void SetUp() override { android::hardware::ProcessState::self()->startThreadPool(); }

    void SetUp() override {

        android::hardware::ProcessState::self()->startThreadPool();



        if (!BufferHubServiceRunning()) {

            // TODO(b/112940221): Enforce the test cross all devices once BufferHub lands in Android

            // R for all Android varieties.

            GTEST_SKIP() << "Skip test as the BufferHub service is not running.";

        }

    }



    bool BufferHubServiceRunning() {

        sp<IBufferHub> bufferhub = IBufferHub::getService();

        return bufferhub.get() != nullptr;

    }

};



bool cmpAHardwareBufferDesc(const AHardwareBuffer_Desc& desc, const AHardwareBuffer_Desc& other) {
@@ -67,6 +82,13 @@ class BufferHubBufferStateTransitionTest : public BufferHubBufferTest { 
protected:

    void SetUp() override {

        BufferHubBufferTest::SetUp();



        if (IsSkipped()) {

            // If the base class' SetUp() stated the test should be skipped, we should short

            // circuit this sub-class' logic.

            return;

        }



        CreateTwoClientsOfABuffer();

    }