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

Commit cfa41bf6 authored by Nolan Scobie's avatar Nolan Scobie
Browse files

Make all libgui tests print their name to logcat on begin/end 

Follow up to If3811e5e553ecf97c35967128f3d59b0079d9f3a where existing
ad hoc test name logs were converted from ALOGV to ALOGD. Many tests
weren't logging their names at all, so this an attempt to centralize
and enforce that logic as much as possible.

Motivation: this makes debugging test failures significantly easier IMO.

Bug: 257123981
Test: libgui_test (note: some upcoming exclusions and fixes required)
Change-Id: I97c7cdce23b7edfa3bc655a1f5216c3506582a7c
parent c7ef78fd

libs/gui/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_test { 
    ],



    srcs: [

        "LibGuiMain.cpp", // Custom gtest entrypoint

        "BLASTBufferQueue_test.cpp",

        "BufferItemConsumer_test.cpp",

        "BufferQueue_test.cpp",

libs/gui/tests/BLASTBufferQueue_test.cpp

+0 −12
Original line number Diff line number Diff line
@@ -176,18 +176,6 @@ private: 
class BLASTBufferQueueTest : public ::testing::Test {

public:

protected:

    BLASTBufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

                ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGD("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());

    }



    ~BLASTBufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

                ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGD("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

    }



    void SetUp() {

        mComposer = ComposerService::getComposerService();

        mClient = new SurfaceComposerClient();

libs/gui/tests/BufferQueue_test.cpp

+0 −14
Original line number Diff line number Diff line
@@ -46,20 +46,6 @@ class BufferQueueTest : public ::testing::Test { 


public:

protected:

    BufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

            ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGD("Begin test: %s.%s", testInfo->test_case_name(),

                testInfo->name());

    }



    ~BufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

            ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGD("End test:   %s.%s", testInfo->test_case_name(),

                testInfo->name());

    }



    void GetMinUndequeuedBufferCount(int* bufferCount) {

        ASSERT_TRUE(bufferCount != nullptr);

        ASSERT_EQ(OK, mProducer->query(NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

libs/gui/tests/CpuConsumer_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ protected: 
        const ::testing::TestInfo* const test_info =

                ::testing::UnitTest::GetInstance()->current_test_info();

        CpuConsumerTestParams params = GetParam();

        ALOGD("** Starting test %s (%d x %d, %d, 0x%x)",

        ALOGD("** Starting parameterized test %s (%d x %d, %d, 0x%x)",

                test_info->name(),

                params.width, params.height,

                params.maxLockedBuffers, params.format);

libs/gui/tests/GLTest.cpp

+0 −8
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ static int abs(int value) { 
}



void GLTest::SetUp() {

    const ::testing::TestInfo* const testInfo =

        ::testing::UnitTest::GetInstance()->current_test_info();

    ALOGD("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());



    mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_NE(EGL_NO_DISPLAY, mEglDisplay);
@@ -132,10 +128,6 @@ void GLTest::TearDown() { 
        eglTerminate(mEglDisplay);

    }

    ASSERT_EQ(EGL_SUCCESS, eglGetError());



    const ::testing::TestInfo* const testInfo =

        ::testing::UnitTest::GetInstance()->current_test_info();

    ALOGD("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

}



EGLint const* GLTest::getConfigAttribs() {