From 828e90a4281bd76b4a489a5ae567fb545bee7fd0 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 27 Jan 2020 16:20:49 -0800 Subject: [PATCH] health 2.0 vts: Allow for battery-less devices Battery-less devices reports UNKNOWN for getChargeStatus. Allow it. Bug: 148425928 Test: on cuttlefish Change-Id: I06dd2841d43cab9528209d0bfd61969a8f2409c8 (cherry picked from commit 5ac6f5bc992c2a54fe4f2864264e9afc9909485c) --- health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp index 6e13a9896d..bb08c5ec4e 100644 --- a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp +++ b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp @@ -331,9 +331,7 @@ TEST_F(HealthHidlTest, getEnergyCounter) { TEST_F(HealthHidlTest, getChargeStatus) { SKIP_IF_SKIPPED(); EXPECT_OK(mHealth->getChargeStatus([](auto result, auto value) { - EXPECT_VALID_OR_UNSUPPORTED_PROP( - result, toString(value), - value != BatteryStatus::UNKNOWN && verifyEnum(value)); + EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyEnum(value)); })); }