commit 8ddf29869bdf116b5a2d97aa52f00d778b48af04
author Benjamin Schwartz <bsschwar@google.com> Mon Dec 21 14:57:45 2020 -0800
committer Benjamin Schwartz <bsschwar@google.com> Wed Jan 20 12:12:39 2021 -0800
tree ecde812871dd077891570b1797eab15cbd2e5db0
parent 7989ddac9bcb5b04e67521d77d38c72931d5fd6c

power/stats: Add EnergyConsumer types

Also cleaning up Power Stats HAL type names to be less verbose

Bug: 176117316
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I252a13b0490326ab9557f4a81ee313e57eb36754

power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp

diff --git a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
index 1d30821..f293773 100644
--- a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
+++ b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
@@ -21,10 +21,10 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 
-using aidl::android::hardware::power::stats::ChannelInfo;
+using aidl::android::hardware::power::stats::Channel;
 using aidl::android::hardware::power::stats::EnergyMeasurement;
 using aidl::android::hardware::power::stats::IPowerStats;
-using aidl::android::hardware::power::stats::PowerEntityInfo;
+using aidl::android::hardware::power::stats::PowerEntity;
 using aidl::android::hardware::power::stats::StateResidencyResult;
 
 using ndk::SpAIBinder;
@@ -47,70 +47,70 @@
 
 // Each PowerEntity must have a valid name
 TEST_P(PowerStatsAidl, ValidatePowerEntityNames) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     for (auto info : infos) {
-        EXPECT_NE(info.powerEntityName, "");
+        EXPECT_NE(info.name, "");
     }
 }
 
 // Each power entity must have a unique name
 TEST_P(PowerStatsAidl, ValidatePowerEntityUniqueNames) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     std::set<std::string> names;
     for (auto info : infos) {
-        EXPECT_TRUE(names.insert(info.powerEntityName).second);
+        EXPECT_TRUE(names.insert(info.name).second);
     }
 }
 
 // Each PowerEntity must have a unique ID
 TEST_P(PowerStatsAidl, ValidatePowerEntityIds) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     std::set<int32_t> ids;
     for (auto info : infos) {
-        EXPECT_TRUE(ids.insert(info.powerEntityId).second);
+        EXPECT_TRUE(ids.insert(info.id).second);
     }
 }
 
 // Each state must have a valid name
 TEST_P(PowerStatsAidl, ValidateStateNames) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     for (auto info : infos) {
         for (auto state : info.states) {
-            EXPECT_NE(state.stateName, "");
+            EXPECT_NE(state.name, "");
         }
     }
 }
 
 // Each state must have a name that is unique to the given PowerEntity
 TEST_P(PowerStatsAidl, ValidateStateUniqueNames) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     for (auto info : infos) {
         std::set<std::string> stateNames;
         for (auto state : info.states) {
-            EXPECT_TRUE(stateNames.insert(state.stateName).second);
+            EXPECT_TRUE(stateNames.insert(state.name).second);
         }
     }
 }
 
 // Each state must have an ID that is unique to the given PowerEntity
 TEST_P(PowerStatsAidl, ValidateStateUniqueIds) {
-    std::vector<PowerEntityInfo> infos;
+    std::vector<PowerEntity> infos;
     ASSERT_TRUE(powerstats->getPowerEntityInfo(&infos).isOk());
 
     for (auto info : infos) {
         std::set<int32_t> stateIds;
         for (auto state : info.states) {
-            EXPECT_TRUE(stateIds.insert(state.stateId).second);
+            EXPECT_TRUE(stateIds.insert(state.id).second);
         }
     }
 }
@@ -121,7 +121,7 @@
 }
 
 TEST_P(PowerStatsAidl, TestGetEnergyMeterInfo) {
-    std::vector<ChannelInfo> info;
+    std::vector<Channel> info;
     ASSERT_TRUE(powerstats->getEnergyMeterInfo(&info).isOk());
 }