Merge "power/stats: Split channel name validation test" am: 43374307a3 am: 8ac06fbf1f am: 87905ec84c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668785

Change-Id: I93e7d1f42fc6503c85f97b06013b13081253660e

1 files changed, 11 insertions, 1 deletions

diff --git a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
index db2cfd81c1..c7ba96cec3 100644
--- a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
+++ b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
@@ -239,12 +239,22 @@ TEST_P(PowerStatsAidl, TestGetEnergyMeterInfo) {
     ASSERT_OK(powerstats->getEnergyMeterInfo(&info));
 }
 
-// Each channel must have a valid name and subsystem
+// Each channel must have a valid name
 TEST_P(PowerStatsAidl, ValidateChannelNames) {
     std::vector<Channel> channels;
     ASSERT_OK(powerstats->getEnergyMeterInfo(&channels));
+
     for (auto channel : channels) {
         testNameValid(channel.name);
+    }
+}
+
+// Each channel must have a valid subsystem
+TEST_P(PowerStatsAidl, ValidateSubsystemNames) {
+    std::vector<Channel> channels;
+    ASSERT_OK(powerstats->getEnergyMeterInfo(&channels));
+
+    for (auto channel : channels) {
         testNameValid(channel.subsystem);
     }
 }