commit 121b6d6b543dc4afee4390b164ec291b65b5fac7
author Matthew Sedam <matthewsedam@google.com> Thu Jan 19 19:04:53 2023 +0000
committer Matthew Sedam <matthewsedam@google.com> Thu Jan 19 19:05:38 2023 +0000
tree 4e94c40f69cafb1aeea8c060205a5eed4644ed0b
parent 91d39dc33ca4488abf408f35598f56f102f154e2

Use GTEST_SKIP when a function is not supported on older HAL versions

Bug: 258074235
Test: atest VtsAidlHalContextHubTargetTest
Change-Id: Ibf25b63d4f5a6a822318a131ebfacbf2fb5d622c

contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp

diff --git a/contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp b/contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp
index f7ff73d..228a569 100644
--- a/contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp
+++ b/contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp
@@ -88,20 +88,20 @@
     Status status = contextHub->setTestMode(true);
     if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION ||
         status.transactionError() == android::UNKNOWN_TRANSACTION) {
-        return;  // not supported -> old API; or not implemented
+        GTEST_SKIP() << "Not supported -> old API; or not implemented";
+    } else {
+        ASSERT_TRUE(status.isOk());
     }
-
-    ASSERT_TRUE(status.isOk());
 }
 
 TEST_P(ContextHubAidl, TestDisableTestMode) {
     Status status = contextHub->setTestMode(false);
     if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION ||
         status.transactionError() == android::UNKNOWN_TRANSACTION) {
-        return;  // not supported -> old API; or not implemented
+        GTEST_SKIP() << "Not supported -> old API; or not implemented";
+    } else {
+        ASSERT_TRUE(status.isOk());
     }
-
-    ASSERT_TRUE(status.isOk());
 }
 
 class EmptyContextHubCallback : public android::hardware::contexthub::BnContextHubCallback {
@@ -186,11 +186,11 @@
     Status status = contextHub->getPreloadedNanoappIds(&preloadedNanoappIds);
     if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION ||
         status.transactionError() == android::UNKNOWN_TRANSACTION) {
-        return;  // not supported -> old API; or not implemented
+        GTEST_SKIP() << "Not supported -> old API; or not implemented";
+    } else {
+        ASSERT_TRUE(status.isOk());
+        ASSERT_FALSE(preloadedNanoappIds.empty());
     }
-
-    ASSERT_TRUE(status.isOk());
-    ASSERT_FALSE(preloadedNanoappIds.empty());
 }
 
 // Helper callback that puts the TransactionResult for the expectedTransactionId into a