Skip to content

Commit da60327

Browse files
bilal-alsharifibilal-alsharifi
committed
Simplify RPCGenericTests cases
1 parent 89cfe57 commit da60327

1 file changed

Lines changed: 11 additions & 36 deletions

File tree

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

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -187,48 +187,26 @@ private Map<String, List<Parameter>> getRPCParamsMap(String fileName, boolean in
187187

188188
if (paramType.equals("SyncMsgVersion")){
189189
paramType = "SdlMsgVersion";
190-
} else if (rpcName.equals("GPSData") && paramType.equals("Float")){
191-
paramType = "Double";
192-
} else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray){
193-
paramType = "Long";
194190
} else if (paramType.equals("OASISAddress")) {
195191
paramType = "OasisAddress";
196-
} else if (rpcName.equals("VideoStreamingCapability") && paramType.equals("Float")) {
192+
} else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray){
193+
paramType = "Long";
194+
} else if (Arrays.asList("GPSData", "VideoStreamingCapability").contains(rpcName) && paramType.equals("Float")){
195+
paramType = "Double";
196+
} else if (Arrays.asList("GetVehicleDataResponse", "OnVehicleData").contains(rpcName) && Arrays.asList("setInstantFuelConsumption", "setFuelLevel", "setSpeed", "setExternalTemperature", "setEngineTorque", "setAccPedalPosition", "setSteeringWheelAngle").contains(setterMethodName)) {
197+
paramType = "Double";
198+
} else if (rpcName.equals("ShowConstantTbt") && Arrays.asList("setDistanceToManeuver", "setDistanceToManeuverScale").contains(setterMethodName)) {
199+
paramType = "Double";
200+
} else if (rpcName.equals("SendLocation") && Arrays.asList("setLongitudeDegrees", "setLatitudeDegrees").contains(setterMethodName)) {
197201
paramType = "Double";
198202
} else if (rpcName.equals("UnsubscribeVehicleData") && setterMethodName.equals("setCloudAppVehicleID")) {
199203
paramType = "boolean";
200204
} else if (rpcName.equals("CloudAppProperties") && setterMethodName.equals("setEnabled")) {
201205
paramType = "boolean";
202-
} else if (rpcName.equals("SendLocation") && setterMethodName.equals("setLongitudeDegrees")) {
203-
paramType = "Double";
204-
} else if (rpcName.equals("SendLocation") && setterMethodName.equals("setLatitudeDegrees")) {
205-
paramType = "Double";
206206
} else if (rpcName.equals("GetVehicleData") && setterMethodName.equals("setCloudAppVehicleID")) {
207207
paramType = "boolean";
208-
} else if (rpcName.equals("SubscribeVehicleData") && setterMethodName.equals("setElectronicParkBrakeStatus")) {
209-
paramType = "boolean";
210-
} else if (rpcName.equals("SubscribeVehicleData") && setterMethodName.equals("setCloudAppVehicleID")) {
208+
} else if (rpcName.equals("SubscribeVehicleData") && Arrays.asList("setElectronicParkBrakeStatus", "setCloudAppVehicleID").contains(setterMethodName)) {
211209
paramType = "boolean";
212-
} else if (rpcName.equals("GetVehicleDataResponse") && Arrays.asList("setInstantFuelConsumption", "setFuelLevel", "setSpeed", "setExternalTemperature", "setEngineTorque", "setAccPedalPosition", "setSteeringWheelAngle").contains(setterMethodName)) {
213-
paramType = "Double";
214-
} else if (rpcName.equals("ShowConstantTbt") && setterMethodName.equals("setDistanceToManeuver")) {
215-
paramType = "Double";
216-
} else if (rpcName.equals("ShowConstantTbt") && setterMethodName.equals("setDistanceToManeuverScale")) {
217-
paramType = "Double";
218-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setSpeed")) {
219-
paramType = "Double";
220-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setFuelLevel")) {
221-
paramType = "Double";
222-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setInstantFuelConsumption")) {
223-
paramType = "Double";
224-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setExternalTemperature")) {
225-
paramType = "Double";
226-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setEngineTorque")) {
227-
paramType = "Double";
228-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setAccPedalPosition")) {
229-
paramType = "Double";
230-
} else if (rpcName.equals("OnVehicleData") && setterMethodName.equals("setSteeringWheelAngle")) {
231-
paramType = "Double";
232210
} else if (rpcName.equals("CancelInteraction") && setterMethodName.equals("setFunctionID")) {
233211
setterMethodName = "setInteractionFunctionID";
234212
} else if (rpcName.equals("NavigationCapability") && setterMethodName.equals("setGetWayPointsEnabled")) {
@@ -240,10 +218,7 @@ private Map<String, List<Parameter>> getRPCParamsMap(String fileName, boolean in
240218
} else if (rpcName.equals("SystemCapability") && !setterMethodName.equals("setSystemCapabilityType")) {
241219
setterMethodName = "setCapabilityForType";
242220
paramType = "SystemCapabilityType";
243-
}
244-
245-
246-
else if (rpcName.equals("OnDriverDistraction") && setterMethodName.equals("setLockScreenDismissalEnabled")) {
221+
} else if (rpcName.equals("OnDriverDistraction") && setterMethodName.equals("setLockScreenDismissalEnabled")) {
247222
setterMethodName = "setLockscreenDismissibility";
248223
paramType = "boolean";
249224
} else if (rpcName.equals("OnDriverDistraction") && setterMethodName.equals("setLockScreenDismissalWarning")) {

0 commit comments

Comments
 (0)