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

Commit 3a751506 authored by Marissa Wall's avatar Marissa Wall Committed by Marissa Ikonomidis
Browse files

gralloc4-vts: fix bad comparisions in VTS 

The parameter order of a couple checks is wrong.

For example:
EXPECT_GT(val1, val2) is EXPECT_TRUE(val1 > val2)
so EXPECT_GT(0, X) can never be true.

Update the tests to be correct.

Test: VtsHalGraphicsMapperV4_0
Bug: 149739702

Change-Id: I21070a912b6014acc5feb63b6b19912b45fe8f5f
parent bfefeddf

graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -1990,7 +1990,7 @@ TEST_P(GraphicsMapperHidlTest, ListSupportedMetadataTypes) { 
        const auto& metadataType = description.metadataType;

        const auto& metadataType = description.metadataType;





        if (!gralloc4::isStandardMetadataType(metadataType)) {

        if (!gralloc4::isStandardMetadataType(metadataType)) {

            EXPECT_GT(0, description.description.size());

            EXPECT_GT(description.description.size(), 0);

            continue;

            continue;

        }

        }
@@ -2074,7 +2074,7 @@ TEST_P(GraphicsMapperHidlTest, GetReservedRegion) { 
    auto info = mDummyDescriptorInfo;

    auto info = mDummyDescriptorInfo;





    const int pageSize = getpagesize();

    const int pageSize = getpagesize();

    ASSERT_GE(0, pageSize);

    ASSERT_GE(pageSize, 0);

    std::vector<uint64_t> requestedReservedSizes{1, 10, 333, static_cast<uint64_t>(pageSize) / 2,

    std::vector<uint64_t> requestedReservedSizes{1, 10, 333, static_cast<uint64_t>(pageSize) / 2,

                                                 static_cast<uint64_t>(pageSize)};

                                                 static_cast<uint64_t>(pageSize)};
@@ -2106,7 +2106,7 @@ TEST_P(GraphicsMapperHidlTest, GetLargeReservedRegion) { 
    auto info = mDummyDescriptorInfo;

    auto info = mDummyDescriptorInfo;





    const int pageSize = getpagesize();

    const int pageSize = getpagesize();

    ASSERT_GE(0, pageSize);

    ASSERT_GE(pageSize, 0);

    std::vector<uint64_t> requestedReservedSizes{static_cast<uint64_t>(pageSize) * 2,

    std::vector<uint64_t> requestedReservedSizes{static_cast<uint64_t>(pageSize) * 2,

                                                 static_cast<uint64_t>(pageSize) * 10,

                                                 static_cast<uint64_t>(pageSize) * 10,

                                                 static_cast<uint64_t>(pageSize) * 1000};

                                                 static_cast<uint64_t>(pageSize) * 1000};
@@ -2144,7 +2144,7 @@ TEST_P(GraphicsMapperHidlTest, GetReservedRegionMultiple) { 
    auto info = mDummyDescriptorInfo;

    auto info = mDummyDescriptorInfo;





    const int pageSize = getpagesize();

    const int pageSize = getpagesize();

    ASSERT_GE(0, pageSize);

    ASSERT_GE(pageSize, 0);

    info.reservedSize = pageSize;

    info.reservedSize = pageSize;





    ASSERT_NO_FATAL_FAILURE(bufferHandle = mGralloc->allocate(info, true));

    ASSERT_NO_FATAL_FAILURE(bufferHandle = mGralloc->allocate(info, true));