commit 46819a16756da3c4a270106a144524258c6e5fb1
author Lais Andrade <lsandrade@google.com> Fri Jul 09 12:52:35 2021 +0000
committer Lais Andrade <lsandrade@google.com> Thu Jul 15 12:23:40 2021 +0000
tree 2e73721e3edb18929dbdfb3cbf0e8601360a8eb0
parent d4019c41396e4c089d5e5b31e5a0b843cb677db5

Update vibrator VTS to only validate support from required primitives

Change-Id: I93cf92636af7a89371f1e87a5a0b40de9d3ee3ed
Fix: 193196353
Test: VtsHalVibratorTargetTest
Merged-In: Icb69a799d204102880efd685312d3a0e2e22b7bb
Merged-In: I7ec2f0d82290f42259f8383db9ff00a126a2a7a4

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
index e51f594..4364df2 100644
--- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
+++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
@@ -55,9 +55,12 @@
         android::enum_range<CompositePrimitive>().begin(),
         android::enum_range<CompositePrimitive>().end()};
 
-const std::vector<CompositePrimitive> kOptionalPrimitives = {
-        CompositePrimitive::THUD,
-        CompositePrimitive::SPIN,
+const std::vector<CompositePrimitive> kRequiredPrimitives = {
+        CompositePrimitive::CLICK,
+        CompositePrimitive::LIGHT_TICK,
+        CompositePrimitive::QUICK_RISE,
+        CompositePrimitive::SLOW_RISE,
+        CompositePrimitive::QUICK_FALL,
 };
 
 const std::vector<CompositePrimitive> kInvalidPrimitives = {
@@ -274,11 +277,11 @@
         for (auto primitive : kCompositePrimitives) {
             bool isPrimitiveSupported =
                     std::find(supported.begin(), supported.end(), primitive) != supported.end();
-            bool isPrimitiveOptional =
-                    std::find(kOptionalPrimitives.begin(), kOptionalPrimitives.end(), primitive) !=
-                    kOptionalPrimitives.end();
+            bool isPrimitiveRequired =
+                    std::find(kRequiredPrimitives.begin(), kRequiredPrimitives.end(), primitive) !=
+                    kRequiredPrimitives.end();
 
-            EXPECT_TRUE(isPrimitiveSupported || isPrimitiveOptional) << toString(primitive);
+            EXPECT_TRUE(isPrimitiveSupported || !isPrimitiveRequired) << toString(primitive);
         }
     }
 }