VTS: Skip the Check if getDisplayStateById is not Supported
Test: atest VtsHalEvsTargetTest
Bug: 276974949
Change-Id: I44d41b937611e06823fe8d2c8ef9d1da783bd17a
diff --git a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp
index a6d99ad..3419b3c 100644
--- a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp
+++ b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp
@@ -2291,11 +2291,12 @@
}
for (const auto displayIdToQuery : displayIds) {
DisplayState state;
- if (displayIdToQuery == displayId) {
- EXPECT_TRUE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
+ bool get_state_ok =
+ mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk();
+ if (displayIdToQuery != displayId) {
+ EXPECT_FALSE(get_state_ok);
+ } else if (get_state_ok) {
EXPECT_EQ(state, DisplayState::NOT_VISIBLE);
- } else {
- EXPECT_FALSE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
}
}
@@ -2313,11 +2314,12 @@
}
for (const auto displayIdToQuery : displayIds) {
DisplayState state;
- if (displayIdToQuery == displayId) {
- EXPECT_TRUE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
+ bool get_state_ok =
+ mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk();
+ if (displayIdToQuery != displayId) {
+ EXPECT_FALSE(get_state_ok);
+ } else if (get_state_ok) {
EXPECT_EQ(state, DisplayState::VISIBLE_ON_NEXT_FRAME);
- } else {
- EXPECT_FALSE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
}
}
@@ -2343,11 +2345,12 @@
}
for (const auto displayIdToQuery : displayIds) {
DisplayState state;
- if (displayIdToQuery == displayId) {
- EXPECT_TRUE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
+ bool get_state_ok =
+ mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk();
+ if (displayIdToQuery != displayId) {
+ EXPECT_FALSE(get_state_ok);
+ } else if (get_state_ok) {
EXPECT_EQ(state, DisplayState::VISIBLE);
- } else {
- EXPECT_FALSE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
}
}
@@ -2366,11 +2369,12 @@
}
for (const auto displayIdToQuery : displayIds) {
DisplayState state;
- if (displayIdToQuery == displayId) {
- EXPECT_TRUE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
+ bool get_state_ok =
+ mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk();
+ if (displayIdToQuery != displayId) {
+ EXPECT_FALSE(get_state_ok);
+ } else if (get_state_ok) {
EXPECT_EQ(state, DisplayState::NOT_VISIBLE);
- } else {
- EXPECT_FALSE(mEnumerator->getDisplayStateById(displayIdToQuery, &state).isOk());
}
}