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

Commit a2ee6846 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"... 

Merge "Update vibrator VTS to only validate support from required primitives" into sc-dev am: afb4bfa1 am: 59fda6bc

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

Change-Id: If6181bc2f04ae914a0b395df040a789725e94fc8
parents 6798b424 59fda6bc

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+8 −7
Original line number Diff line number Diff line
@@ -60,9 +60,10 @@ 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 = {
@@ -393,11 +394,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);

        }

    }

}