diff options
author | Hridya Valsaraju <hridya@google.com> | 2018-04-03 11:19:08 -0700 |
---|---|---|
committer | Hridya Valsaraju <hridya@google.com> | 2018-04-03 18:24:34 +0000 |
commit | 075c182f4d7d0ad54e204f0d2776708c54070804 (patch) | |
tree | e5df3ed0bc5d00ff5eaf73024dbca2e3cecfcf2d /health | |
parent | 7b28d5f97aaff366b9e685a6e6ad362a0065a22e (diff) | |
download | android_hardware_interfaces-075c182f4d7d0ad54e204f0d2776708c54070804.tar.gz android_hardware_interfaces-075c182f4d7d0ad54e204f0d2776708c54070804.tar.bz2 android_hardware_interfaces-075c182f4d7d0ad54e204f0d2776708c54070804.zip |
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
Diffstat (limited to 'health')
-rw-r--r-- | health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp index 972bc7f6d..c5431e45c 100644 --- a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp +++ b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp @@ -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)); |