Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30c5f24b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update vibrator VTS to only validate support from required primitives" am: 394fae6e 

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

Change-Id: I87e2bbfaaa35112bb42ef3c624381cdeef39d848
parents 7d1b211f 394fae6e

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+10 −7
Original line number Diff line number Diff line
@@ -55,9 +55,12 @@ const std::vector<CompositePrimitive> kCompositePrimitives{ 
        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 @@ TEST_P(VibratorAidl, GetSupportedPrimitives) { 
        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);

        }

    }

}