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

Commit 32c4ec09 authored by Stephane Lee's avatar Stephane Lee
Browse files

Fix VTS test for health HAL 2.1 

Latest update on the ticket to use hard coded thresholds

Test: atest VtsHalHealthV2_1TargetTest
Bug: 149428646
Change-Id: Id7f86ba05a203a926e8d316bf7af4d24c7e0e2f0
parent 25c2de29

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -616,7 +616,7 @@ dd377f404a8e71f6191d295e10067db629b0f0c28e594af906f2bea5d87fe2cc android.hardwar 
f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice

f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

30e5d878099aeca710420dfc438d115bbbdcdbe84ad1b05a0f5e01debc3ef3af android.hardware.health@2.1::types

3a4e7462a12589bd219599de59663d0ba9915313f45150774780d09f4e114f74 android.hardware.health@2.1::types

0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types

0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types

bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential

bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential

96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

health/2.1/types.hal

+2 −1
Original line number Original line Diff line number Diff line
@@ -85,9 +85,10 @@ struct HealthInfo { 




    /**

    /**

     * Estimated battery full charge design capacity (in microamp hours, uAh).

     * Estimated battery full charge design capacity (in microamp hours, uAh).

     * batteryFullCharge must be less than (value * 1000).

     * Value must be 0 if unknown.

     * Value must be 0 if unknown.

     * Value must be positive if known.

     * Value must be positive if known.

     * Value must be greater than 100 000 uAh.

     * Value must be less than 100 000 000 uAh.

     */

     */

    int32_t batteryFullChargeDesignCapacityUah;

    int32_t batteryFullChargeDesignCapacityUah;

};

};

health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp

+8 −6
Original line number Original line Diff line number Diff line
@@ -219,6 +219,9 @@ AssertionResult IsEnum(T value) { 
    return AssertionFailure() << static_cast<std::underlying_type_t<T>>(value) << " is not valid";

    return AssertionFailure() << static_cast<std::underlying_type_t<T>>(value) << " is not valid";

}

}





#define FULL_CHARGE_DESIGN_CAP_MIN ((long)100 * 1000)

#define FULL_CHARGE_DESIGN_CAP_MAX ((long)100000 * 1000)



/*

/*

 * Tests the values returned by getHealthInfo() from interface IHealth.

 * Tests the values returned by getHealthInfo() from interface IHealth.

 */

 */
@@ -235,12 +238,11 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { 
        EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0)

        EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0)

                << "batteryFullChargeDesignCapacityUah should not be negative";

                << "batteryFullChargeDesignCapacityUah should not be negative";





        // Check for extreme outliers

        EXPECT_GT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MIN)

        const auto& legacy = value.legacy.legacy;

                << "batteryFullChargeDesignCapacityUah should be greater than 100 mAh";

        if (value.batteryFullChargeDesignCapacityUah > 0) {



            EXPECT_LT((long)legacy.batteryFullCharge,

        EXPECT_LT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MAX)

                      ((long)value.batteryFullChargeDesignCapacityUah * 1000));

                << "batteryFullChargeDesignCapacityUah should be less than 100,000 mAh";

        }

    })));

    })));

}

}