Change engine oil life type from double to floatfeature/issue_593

5 files changed, 16 insertions, 9 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index 0f0ec0a8e..551d2ad5b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
@@ -45,7 +45,7 @@ public class VehicleDataHelper{
 	public static final PRNDL PRNDL_FINAL = PRNDL.SECOND;
 	public static final TireStatus TIRE_PRESSURE = new TireStatus();
 	public static final double ENGINE_TORQUE = 518.3;
-	public static final double ENGINE_OIL_LIFE = 19.3;
+	public static final float ENGINE_OIL_LIFE = 19.3f;
 	public static final int ODOMETER = 140000;
 	public static final GPSData GPS = new GPSData();
 	public static final ComponentVolumeStatus FUEL_LEVEL_STATE = ComponentVolumeStatus.ALERT;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 9e9d0d03a..6e78dbe1e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -103,7 +103,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
     	PRNDL prndl = ( (OnVehicleData) msg).getPrndl();
     	TireStatus pressure = ( (OnVehicleData) msg).getTirePressure();
     	Double torque = ( (OnVehicleData) msg).getEngineTorque();
-    	Double engineOilLife = ( (OnVehicleData) msg).getEngineOilLife();
+    	Float engineOilLife = ( (OnVehicleData) msg).getEngineOilLife();
     	int odometer = ( (OnVehicleData) msg).getOdometer();
     	GPSData gps = ( (OnVehicleData) msg).getGps();
     	ComponentVolumeStatus state = ( (OnVehicleData) msg).getFuelLevelState();
@@ -438,6 +438,9 @@ public class OnVehicleDataTests extends BaseRpcTests{
 						new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
 						new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
 				}
+				else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) {
+					assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
+				}
 				else {
 					assertEquals(Test.TRUE, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 	            }				
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 6e123349c..6b3bda584 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -362,6 +362,10 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 									new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
 									new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
 				}
+				else if (key.equals(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE)) {
+					assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
+							JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
+				}
 				else {
 					assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
 							JsonUtils.readObjectFromJsonObject(reference, key),
@@ -470,7 +474,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 			assertTrue(Test.TRUE, Validator.validateTireStatus(tireStatus, cmd.getTirePressure()) );
 
 			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
-			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
+			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife(), 0.0002);
 			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_ODOMETER), cmd.getOdometer());
 			
 			JSONObject gpsDataObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GPS);
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index 9baf3e2fa..df0cea59f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
@@ -182,12 +182,12 @@ public class GetVehicleDataResponse extends RPCResponse {
         Object object = getParameters(KEY_ENGINE_TORQUE);

         return SdlDataTypeConverter.objectToDouble(object);

     }

-    public void setEngineOilLife(Double engineOilLife) {

+    public void setEngineOilLife(Float engineOilLife) {

         setParameters(KEY_ENGINE_OIL_LIFE, engineOilLife);

     }

-    public Double getEngineOilLife() {

+    public Float getEngineOilLife() {

         Object object = getParameters(KEY_ENGINE_OIL_LIFE);

-        return SdlDataTypeConverter.objectToDouble(object);

+        return SdlDataTypeConverter.objectToFloat(object);

     }

 

     public void setAccPedalPosition(Double accPedalPosition) {

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index aacf8f728..f767c0d8f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -415,12 +415,12 @@ public class OnVehicleData extends RPCNotification {
         Object object = getParameters(KEY_ENGINE_TORQUE);

         return SdlDataTypeConverter.objectToDouble(object);

     }

-    public void setEngineOilLife(Double engineOilLife) {

+    public void setEngineOilLife(Float engineOilLife) {

         setParameters(KEY_ENGINE_OIL_LIFE, engineOilLife);

     }

-    public Double getEngineOilLife() {

+    public Float getEngineOilLife() {

         Object object = getParameters(KEY_ENGINE_OIL_LIFE);

-        return SdlDataTypeConverter.objectToDouble(object);

+        return SdlDataTypeConverter.objectToFloat(object);

     }

     public void setAccPedalPosition(Double accPedalPosition) {

         setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);