Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 13:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "vibrator: vts: Utilize New toString() Support" am: aa4af6bf03 am: 0683ad7f7f

Browse Source 
Change-Id: I7e7fe219138ac9d57beaab5e0712611ce374464f
This commit is contained in:
Automerger Merge Worker
2019-12-11 07:01:22 +00:00
parent 6d3e344091 0683ad7f7f
commit 23d87349de
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
View File

@@ -135,13 +135,12 @@ TEST_P(VibratorAidl, ValidateEffect) {
Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs); Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs);
if (isEffectSupported) { if (isEffectSupported) {
EXPECT_TRUE(status.isOk()) EXPECT_TRUE(status.isOk()) << toString(effect) << " " << toString(strength);
<< static_cast<int>(effect) << " " << static_cast<int>(strength);
EXPECT_GT(lengthMs, 0); EXPECT_GT(lengthMs, 0);
usleep(lengthMs * 1000); usleep(lengthMs * 1000);
} else { } else {
EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION) EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION)
<< static_cast<int>(effect) << " " << static_cast<int>(strength); << toString(effect) << " " << toString(strength);
EXPECT_EQ(lengthMs, 0); EXPECT_EQ(lengthMs, 0);
} }
} }
@@ -202,7 +201,7 @@ TEST_P(VibratorAidl, InvalidEffectsUnsupported) {
int32_t lengthMs; int32_t lengthMs;
Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs); Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs);
EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION) EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION)
<< static_cast<int>(effect) << " " << static_cast<int>(strength); << toString(effect) << " " << toString(strength);
} }
} }
for (Effect effect : kEffects) { for (Effect effect : kEffects) {
@@ -210,7 +209,7 @@ TEST_P(VibratorAidl, InvalidEffectsUnsupported) {
int32_t lengthMs; int32_t lengthMs;
Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs); Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs);
EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION) EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION)
<< static_cast<int>(effect) << " " << static_cast<int>(strength); << toString(effect) << " " << toString(strength);
} }
} }
} }