From 6bed2f3207b756b90dae7d72d91313d377f0d048 Mon Sep 17 00:00:00 2001 From: Stephane Lee Date: Thu, 24 Sep 2020 12:19:52 -0700 Subject: [PATCH] Allow batteryFullChargeDesignCapacityUah to be 0 Bug: 166841711 Test: Run VtsHalHealthV2_1TargetTest with a battery design capacity of 0 Change-Id: I48bea0e2a8e4f8eeba8874e44a9bf6aa00bfd637 --- .../vts/functional/VtsHalHealthV2_1TargetTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp index d0b0d603c0..4ae443ad98 100644 --- a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp +++ b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp @@ -235,14 +235,15 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { EXPECT_TRUE(IsEnum(value.batteryCapacityLevel)) << " BatteryCapacityLevel"; EXPECT_GE(value.batteryChargeTimeToFullNowSeconds, -1); - EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0) - << "batteryFullChargeDesignCapacityUah should not be negative"; + if (value.batteryFullChargeDesignCapacityUah != 0) { + EXPECT_GT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MIN) + << "batteryFullChargeDesignCapacityUah should be greater than 100 mAh, or 0 if " + "unknown"; - 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"; + EXPECT_LT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MAX) + << "batteryFullChargeDesignCapacityUah should be less than 100,000 mAh, or 0 " + "if unknown"; + } }))); }