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

Commit 075c182f authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

Remove DiskStat checks from VTS Health HAL test 

The fields being checked were uint64_t and it
is valid for them to have any value greater than
or equal to zero.

Bug: 74057048
Test: vts-tradefed run vts -m VtsHalHealthV2_0
Change-Id: If932e1d6af8e162b7c570a1d5dd0f5ddce89ad1e
parent 7b28d5f9

health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp

+2 −14
Original line number Diff line number Diff line
@@ -190,18 +190,6 @@ bool verifyStorageInfo(const hidl_vec<struct StorageInfo>& info) { 
    return true;

}



bool verifyDiskStats(const hidl_vec<struct DiskStats>& stats) {

    for (size_t i = 0; i < stats.size(); i++) {

        if (!(stats[i].reads > 0 && stats[i].readMerges > 0 && stats[i].readSectors > 0 &&

              stats[i].readTicks > 0 && stats[i].writes > 0 && stats[i].writeMerges > 0 &&

              stats[i].writeSectors > 0 && stats[i].writeTicks > 0 && stats[i].ioTicks > 0)) {

            return false;

        }

    }



    return true;

}



template <typename T>

bool verifyEnum(T value) {

    for (auto it : hidl_enum_iterator<T>()) {
@@ -214,7 +202,7 @@ bool verifyEnum(T value) { 
}



bool verifyHealthInfo(const HealthInfo& health_info) {

    if (!verifyStorageInfo(health_info.storageInfos) || !verifyDiskStats(health_info.diskStats)) {

    if (!verifyStorageInfo(health_info.storageInfos)) {

        return false;

    }
@@ -264,7 +252,7 @@ TEST_F(HealthHidlTest, Properties) { 
        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyStorageInfo(value));

    }));

    EXPECT_OK(mHealth->getDiskStats([](auto result, auto& value) {

        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyDiskStats(value));

        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), true);

    }));

    EXPECT_OK(mHealth->getHealthInfo([](auto result, auto& value) {

        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyHealthInfo(value));