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

Commit 7de0be5c authored by Valerie Hau's avatar Valerie Hau
Browse files

Adding/modifying tests for new 2.3 API 

Adding new tests for getPerFrameMetadataKeys_2_3 and
getHdrCapabilities_2_3.  Modifying for optional API
to not error on UNSUPPORTED

Bug: 118343714
Test: ./VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I66e28cc1cb51b8c26d3e7777311a168086f938ca
parent e089050c

graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp

+35 −2
Original line number Diff line number Diff line
@@ -247,6 +247,32 @@ TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_PER_FRAME_METADATA) { 
    ASSERT_NO_FATAL_FAILURE(mComposerClient->destroyLayer(mPrimaryDisplay, layer));

}



/**

 * Test IComposerClient::getHdrCapabilities_2_3

 */

TEST_F(GraphicsComposerHidlTest, GetHdrCapabilities_2_3) {

    float maxLuminance;

    float maxAverageLuminance;

    float minLuminance;

    ASSERT_NO_FATAL_FAILURE(mComposerClient->getHdrCapabilities_2_3(

        mPrimaryDisplay, &maxLuminance, &maxAverageLuminance, &minLuminance));

    ASSERT_TRUE(maxLuminance >= minLuminance);

}



/**

 * Test IComposerClient::getPerFrameMetadataKeys_2_3

 */

TEST_F(GraphicsComposerHidlTest, GetPerFrameMetadataKeys_2_3) {

    std::vector<IComposerClient::PerFrameMetadataKey> keys;

    mComposerClient->getRaw()->getPerFrameMetadataKeys_2_3(

        mPrimaryDisplay, [&](const auto tmpError, const auto outKeys) {

            if (tmpError != Error::UNSUPPORTED) {

                ASSERT_EQ(Error::NONE, tmpError);

                keys = outKeys;

            }

        });

}



/**

 * TestIComposerClient::getReadbackBufferAttributes_2_3

 */
@@ -254,8 +280,15 @@ TEST_F(GraphicsComposerHidlTest, GetReadbackBufferAttributes_2_3) { 
    Dataspace dataspace;

    PixelFormat pixelFormat;



    ASSERT_NO_FATAL_FAILURE(mComposerClient->getReadbackBufferAttributes_2_3(

        mPrimaryDisplay, &pixelFormat, &dataspace));

    mComposerClient->getRaw()->getReadbackBufferAttributes_2_3(

        mPrimaryDisplay,

        [&](const auto tmpError, const auto outPixelFormat, const auto outDataspace) {

            if (tmpError != Error::UNSUPPORTED) {

                ASSERT_EQ(Error::NONE, tmpError);

                dataspace = outDataspace;

                pixelFormat = outPixelFormat;

            }

        });

}



/**