[0285]

- Fix showConstantTbt

3 files changed, 12 insertions, 15 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
index 8ab4f7672..e454fcf7a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
@@ -30,7 +30,7 @@ import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class :
- * {@link ShowConstantTbt}
+ * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbt}
  */
 public class ShowConstantTbtTests extends BaseRpcTests {
 
@@ -71,8 +71,8 @@ public class ShowConstantTbtTests extends BaseRpcTests {
             result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
             result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING);
             result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true);
-            result.put(ShowConstantTbt.KEY_DISTANCE_TO_MANEUVER, TestValues.GENERAL_DOUBLE);
-            result.put(ShowConstantTbt.KEY_DISTANCE_TO_MANEUVER_SCALE, TestValues.GENERAL_DOUBLE);
+            result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE);
+            result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE);
             result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING);
             result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING);
             result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING);
@@ -156,8 +156,8 @@ public class ShowConstantTbtTests extends BaseRpcTests {
             JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete());
-            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_DISTANCE_TO_MANEUVER), cmd.getDistanceToManeuver());
-            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_DISTANCE_TO_MANEUVER_SCALE), cmd.getDistanceToManeuverScale());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale());
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1());
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2());
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
index d327c6f75..220c05828 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
@@ -21,7 +21,7 @@ import static junit.framework.TestCase.assertNotNull;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class :
- * {@link ShowConstantTbtResponse}
+ * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse}
  */
 public class ShowConstantTbtResponseTests extends BaseRpcTests {
 
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
index f4ea0d0c8..22b85b5ff 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
@@ -33,7 +33,6 @@ package com.smartdevicelink.proxy.rpc;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.util.SdlDataTypeConverter;
 
 import java.util.Hashtable;
 import java.util.List;
@@ -56,8 +55,8 @@ public class ShowConstantTbt extends RPCRequest {
     public static final String KEY_TEXT2 = "navigationText2";
     public static final String KEY_ETA = "eta";
     public static final String KEY_TOTAL_DISTANCE = "totalDistance";
-    public static final String KEY_DISTANCE_TO_MANEUVER = "distanceToManeuver";
-    public static final String KEY_DISTANCE_TO_MANEUVER_SCALE = "distanceToManeuverScale";
+    public static final String KEY_MANEUVER_DISTANCE = "distanceToManeuver";
+    public static final String KEY_MANEUVER_DISTANCE_SCALE = "distanceToManeuverScale";
     public static final String KEY_MANEUVER_IMAGE = "turnIcon";
     public static final String KEY_NEXT_MANEUVER_IMAGE = "nextTurnIcon";
     public static final String KEY_MANEUVER_COMPLETE = "maneuverComplete";
@@ -211,7 +210,7 @@ public class ShowConstantTbt extends RPCRequest {
      * @since SmartDeviceLink 2.0.0
      */
     public ShowConstantTbt setDistanceToManeuver(Double distanceToManeuver) {
-        setParameters(KEY_DISTANCE_TO_MANEUVER, distanceToManeuver);
+        setParameters(KEY_MANEUVER_DISTANCE, distanceToManeuver);
         return this;
     }
 
@@ -223,8 +222,7 @@ public class ShowConstantTbt extends RPCRequest {
      * @since SmartDeviceLink 2.0.0
      */
     public Double getDistanceToManeuver() {
-        Object object = getParameters(KEY_DISTANCE_TO_MANEUVER);
-        return SdlDataTypeConverter.objectToDouble(object);
+        return getDouble(KEY_MANEUVER_DISTANCE);
     }
 
     /**
@@ -236,7 +234,7 @@ public class ShowConstantTbt extends RPCRequest {
      * @since SmartDeviceLink 2.0.0
      */
     public ShowConstantTbt setDistanceToManeuverScale(Double distanceToManeuverScale) {
-        setParameters(KEY_DISTANCE_TO_MANEUVER_SCALE, distanceToManeuverScale);
+        setParameters(KEY_MANEUVER_DISTANCE_SCALE, distanceToManeuverScale);
         return this;
     }
 
@@ -249,8 +247,7 @@ public class ShowConstantTbt extends RPCRequest {
      * @since SmartDeviceLink 2.0.0
      */
     public Double getDistanceToManeuverScale() {
-        Object object = getParameters(KEY_DISTANCE_TO_MANEUVER_SCALE);
-        return SdlDataTypeConverter.objectToDouble(object);
+        return getDouble(KEY_MANEUVER_DISTANCE_SCALE);
     }
 
     /**