Skip to content

Commit 455ac3d

Browse files
Add exceptional cases to fix broken tests in RPCGenericTests
1 parent 28b873d commit 455ac3d

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@ private Map<String, RPC> getRPCsMap(String fileName, boolean includeMandatoryPar
242242
rpcName = "OasisAddress";
243243
} else if (rpcName.equals("ShowConstantTBT")) {
244244
rpcName = "ShowConstantTbt";
245+
} else if (rpcName.equals("messageType")) {
246+
rpcName = "MessageType";
247+
} else if (rpcName.equals("DisplayCapabilities")) {
248+
isDeprecated = false;
245249
} else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse") || rpcName.equals("FunctionID")) {
246250
skipRPC = true;
247251
}
@@ -304,6 +308,8 @@ private Map<String, RPC> getRPCsMap(String fileName, boolean includeMandatoryPar
304308
paramType = "boolean";
305309
} else if (rpcName.equals("SubscribeVehicleData") && Arrays.asList("setElectronicParkBrakeStatus", "setCloudAppVehicleID").contains(setterMethodName)) {
306310
paramType = "boolean";
311+
} else if (rpcName.equals("Show") && setterMethodName.equalsIgnoreCase("setMediaClock")) {
312+
isDeprecated = true;
307313
} else if (rpcName.equals("CancelInteraction") && setterMethodName.equals("setFunctionID")) {
308314
setterMethodName = "setInteractionFunctionID";
309315
} else if (rpcName.equals("NavigationCapability") && setterMethodName.equals("setGetWayPointsEnabled")) {
@@ -422,6 +428,12 @@ private Map<String, RPC> getRPCsMap(String fileName, boolean includeMandatoryPar
422428
skipElement = false;
423429
String elementName = myParser.getAttributeValue(null, "name");
424430

431+
// -------------- Exceptional cases because of mismatch between the RPC spec and the Android code --------------
432+
if (rpcName.equalsIgnoreCase("MessageType")) {
433+
elementName = elementName.toUpperCase();
434+
}
435+
// -------------------------------------------------------------------------------------------------------------
436+
425437
Element element = new Element()
426438
.setRPCName(rpcName)
427439
.setName(elementName)

0 commit comments

Comments
 (0)