From 12aaf8e35911cd5f036917de9a6f388d611ed51c Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Fri, 3 Sep 2021 19:07:23 -0700 Subject: Simplify initialization and add setValue to support parceling Bug: 197162116 Test: atest libbattery_test Change-Id: I4278206eab049d714c5278e6b10ba3155e17142f --- libs/battery/LongArrayMultiStateCounterTest.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp') diff --git a/libs/battery/LongArrayMultiStateCounterTest.cpp b/libs/battery/LongArrayMultiStateCounterTest.cpp index 24cb437eaa..e4e6b2a49f 100644 --- a/libs/battery/LongArrayMultiStateCounterTest.cpp +++ b/libs/battery/LongArrayMultiStateCounterTest.cpp @@ -24,7 +24,9 @@ namespace battery { class LongArrayMultiStateCounterTest : public testing::Test {}; TEST_F(LongArrayMultiStateCounterTest, stateChange) { - LongArrayMultiStateCounter testCounter(2, 0, std::vector(4), 1000); + LongArrayMultiStateCounter testCounter(2, std::vector(4)); + testCounter.updateValue(std::vector({0, 0, 0, 0}), 1000); + testCounter.setState(0, 1000); testCounter.setState(1, 2000); testCounter.updateValue(std::vector({100, 200, 300, 400}), 3000); @@ -34,7 +36,9 @@ TEST_F(LongArrayMultiStateCounterTest, stateChange) { } TEST_F(LongArrayMultiStateCounterTest, accumulation) { - LongArrayMultiStateCounter testCounter(2, 0, std::vector(4), 1000); + LongArrayMultiStateCounter testCounter(2, std::vector(4)); + testCounter.updateValue(std::vector({0, 0, 0, 0}), 1000); + testCounter.setState(0, 1000); testCounter.setState(1, 2000); testCounter.updateValue(std::vector({100, 200, 300, 400}), 3000); testCounter.setState(0, 4000); @@ -50,5 +54,16 @@ TEST_F(LongArrayMultiStateCounterTest, accumulation) { EXPECT_EQ(std::vector({70, 120, 170, 220}), testCounter.getCount(1)); } +TEST_F(LongArrayMultiStateCounterTest, toString) { + LongArrayMultiStateCounter testCounter(2, std::vector(4)); + testCounter.updateValue(std::vector({0, 0, 0, 0}), 1000); + testCounter.setState(0, 1000); + testCounter.setState(1, 2000); + testCounter.updateValue(std::vector({100, 200, 300, 400}), 3000); + + EXPECT_STREQ("[0: {50, 100, 150, 200}, 1: {50, 100, 150, 200}] updated: 3000 currentState: 1", + testCounter.toString().c_str()); +} + } // namespace battery } // namespace android -- cgit v1.2.3-59-g8ed1b