diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-16 00:16:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-16 00:16:05 +0000 |
| commit | 0935243c4499da8cd48696f6868e8e4166642ab5 (patch) | |
| tree | 47a540330cdf54a821c1e599f35dd4487a08953a | |
| parent | a36ef09893d321d8e04fa11369d1ab5b11debbd3 (diff) | |
| parent | 32c4ec09d4f5803521288acdb07b36887d532e91 (diff) | |
Merge "Fix VTS test for health HAL 2.1"
| -rw-r--r-- | current.txt | 2 | ||||
| -rw-r--r-- | health/2.1/types.hal | 3 | ||||
| -rw-r--r-- | health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp | 14 |
3 files changed, 11 insertions, 8 deletions
diff --git a/current.txt b/current.txt index d94f15928d..1d62165f5f 100644 --- a/current.txt +++ b/current.txt @@ -616,7 +616,7 @@ dd377f404a8e71f6191d295e10067db629b0f0c28e594af906f2bea5d87fe2cc android.hardwar f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth 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 bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential 96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore diff --git a/health/2.1/types.hal b/health/2.1/types.hal index d99f63f92f..be1eaf8262 100644 --- a/health/2.1/types.hal +++ b/health/2.1/types.hal @@ -85,9 +85,10 @@ struct HealthInfo { /** * 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 positive if known. + * Value must be greater than 100 000 uAh. + * Value must be less than 100 000 000 uAh. */ int32_t batteryFullChargeDesignCapacityUah; }; diff --git a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp index ea69527ae3..deb1a29b37 100644 --- a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp +++ b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp @@ -219,6 +219,9 @@ AssertionResult IsEnum(T value) { 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. */ @@ -235,12 +238,11 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0) << "batteryFullChargeDesignCapacityUah should not be negative"; - // Check for extreme outliers - const auto& legacy = value.legacy.legacy; - if (value.batteryFullChargeDesignCapacityUah > 0) { - EXPECT_LT((long)legacy.batteryFullCharge, - ((long)value.batteryFullChargeDesignCapacityUah * 1000)); - } + EXPECT_GT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MIN) + << "batteryFullChargeDesignCapacityUah should be greater than 100 mAh"; + + EXPECT_LT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MAX) + << "batteryFullChargeDesignCapacityUah should be less than 100,000 mAh"; }))); } |