changed floats to integers

6 files changed, 70 insertions, 48 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index ae64ec28b..ea94100c4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
@@ -40,6 +40,7 @@ import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
+import com.smartdevicelink.proxy.rpc.SpatialStruct;
 import com.smartdevicelink.proxy.rpc.StartTime;
 import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.TextField;
@@ -1476,6 +1477,38 @@ public class Validator{
     	
     	return true;
     }
+
+
+	public static boolean validateSpatialData (SpatialStruct item1, SpatialStruct item2) {
+		if (item1 == null) {
+			return ( item2 == null );
+		}
+		if (item2 == null) {
+			return ( item1 == null );
+		}
+
+		if (item1.getID() != item2.getID()) {
+			return false;
+		}
+
+		if (item1.getHeight() != item2.getHeight()) {
+			return false;
+		}
+
+		if (item1.getWidth() != item2.getWidth()) {
+			return false;
+		}
+
+		if (item1.getX() != item2.getX()) {
+			return false;
+		}
+
+		if (item1.getY() != item2.getY()) {
+			return false;
+		}
+
+		return true;
+	}
     
     public static boolean validateVrHelpItems (List<VrHelpItem> item1, List<VrHelpItem> item2) {
     	if (item1 == null) {
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SpatialStructTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SpatialStructTests.java
index e02716174..718ebe7a5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SpatialStructTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SpatialStructTests.java
@@ -24,10 +24,10 @@ public class SpatialStructTests extends TestCase {
 		msg = new SpatialStruct();
 
 		msg.setID(Test.GENERAL_INTEGER);
-		msg.setX(Test.GENERAL_FLOAT);
-		msg.setY(Test.GENERAL_FLOAT);
-		msg.setWidth(Test.GENERAL_FLOAT);
-		msg.setHeight(Test.GENERAL_FLOAT);
+		msg.setX(Test.GENERAL_INTEGER);
+		msg.setY(Test.GENERAL_INTEGER);
+		msg.setWidth(Test.GENERAL_INTEGER);
+		msg.setHeight(Test.GENERAL_INTEGER);
 	}
 
 	/**
@@ -36,17 +36,17 @@ public class SpatialStructTests extends TestCase {
 	public void testRpcValues () {
 		// Test Values
 		Integer id = msg.getID();
-		Float x = msg.getX();
-		Float y = msg.getY();
-		Float width = msg.getWidth();
-		Float height = msg.getHeight();
+		Integer x = msg.getX();
+		Integer y = msg.getY();
+		Integer width = msg.getWidth();
+		Integer height = msg.getHeight();
 
 		// Valid Tests
 		assertEquals(Test.MATCH, Test.GENERAL_INTEGER, id);
-		assertEquals(Test.MATCH, Test.GENERAL_FLOAT, x);
-		assertEquals(Test.MATCH, Test.GENERAL_FLOAT, y);
-		assertEquals(Test.MATCH, Test.GENERAL_FLOAT, width);
-		assertEquals(Test.MATCH, Test.GENERAL_FLOAT, height);
+		assertEquals(Test.MATCH, Test.GENERAL_INTEGER, x);
+		assertEquals(Test.MATCH, Test.GENERAL_INTEGER, y);
+		assertEquals(Test.MATCH, Test.GENERAL_INTEGER, width);
+		assertEquals(Test.MATCH, Test.GENERAL_INTEGER, height);
 
 		// Invalid/Null Tests
 		SpatialStruct msg = new SpatialStruct();
@@ -64,10 +64,10 @@ public class SpatialStructTests extends TestCase {
 
 		try {
 			reference.put(SpatialStruct.KEY_ID, Test.GENERAL_INTEGER);
-			reference.put(SpatialStruct.KEY_X, ((Float) Test.GENERAL_FLOAT));
-			reference.put(SpatialStruct.KEY_Y, ((Float) Test.GENERAL_FLOAT));
-			reference.put(SpatialStruct.KEY_WIDTH, ((Float) Test.GENERAL_FLOAT));
-			reference.put(SpatialStruct.KEY_HEIGHT, ((Float) Test.GENERAL_FLOAT));
+			reference.put(SpatialStruct.KEY_X, (Test.GENERAL_INTEGER));
+			reference.put(SpatialStruct.KEY_Y, (Test.GENERAL_INTEGER));
+			reference.put(SpatialStruct.KEY_WIDTH, (Test.GENERAL_INTEGER));
+			reference.put(SpatialStruct.KEY_HEIGHT, (Test.GENERAL_INTEGER));
 
 			JSONObject underTest = msg.serializeJSON();
 			assertEquals(Test.MATCH, reference.length(), underTest.length());
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
index 797428387..7d81b0d56 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
@@ -8,6 +8,7 @@ import com.smartdevicelink.proxy.rpc.SpatialStruct;
 import com.smartdevicelink.test.BaseRpcTests;
 import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.Test;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
 
 import org.json.JSONException;
@@ -15,10 +16,6 @@ import org.json.JSONObject;
 
 import java.util.Hashtable;
 
-/**
- * Created by brettywhite on 8/9/17.
- */
-
 public class SendHapticDataTests extends BaseRpcTests {
 
 	private SpatialStruct spatialStruct;
@@ -26,11 +23,11 @@ public class SendHapticDataTests extends BaseRpcTests {
 	@Override
 	protected RPCMessage createMessage(){
 		spatialStruct = new SpatialStruct();
-		spatialStruct.setID(Test.GENERAL_INT);
-		spatialStruct.setX(Test.GENERAL_FLOAT);
-		spatialStruct.setY(Test.GENERAL_FLOAT);
-		spatialStruct.setWidth(Test.GENERAL_FLOAT);
-		spatialStruct.setHeight(Test.GENERAL_FLOAT);
+		spatialStruct.setID(Test.GENERAL_INTEGER);
+		spatialStruct.setX(Test.GENERAL_INTEGER);
+		spatialStruct.setY(Test.GENERAL_INTEGER);
+		spatialStruct.setWidth(Test.GENERAL_INTEGER);
+		spatialStruct.setHeight(Test.GENERAL_INTEGER);
 
 		SendHapticData msg = new SendHapticData();
 		msg.setHapticSpatialData(spatialStruct);
@@ -89,6 +86,7 @@ public class SendHapticDataTests extends BaseRpcTests {
 		try {
 			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
 			SendHapticData cmd = new SendHapticData(hash);
+
 			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
 			assertNotNull(Test.NOT_NULL, body);
 
@@ -97,7 +95,9 @@ public class SendHapticDataTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
 
 			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendHapticData.KEY_HAPTIC_SPATIAL_DATA), cmd.getHapticSpatialData().serializeJSON());
+			JSONObject sendHapticData = JsonUtils.readJsonObjectFromJsonObject(parameters, SendHapticData.KEY_HAPTIC_SPATIAL_DATA);
+			SpatialStruct referenceSendHapticData = new SpatialStruct(JsonRPCMarshaller.deserializeJSONObject(sendHapticData));
+			assertTrue(Test.TRUE, Validator.validateSpatialData(referenceSendHapticData, cmd.getHapticSpatialData()));
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
index e55292aad..ab4763103 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
@@ -104,11 +104,6 @@ public class RPCMessage extends RPCStruct  {
 	}

 

 	@Override

-	public Float getFloat(String key) {

-		return (Float) parameters.get(key);

-	}

-

-	@Override

 	public Double getDouble(String key) {

 		return (Double) parameters.get(key);

 	}

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index 116c491df..f1911b121 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
@@ -231,10 +231,6 @@ public class RPCStruct {
 		return (Double) store.get(key);

 	}

 

-	public Float getFloat(String key) {

-		return (Float) store.get(key);

-	}

-

 	public Boolean getBoolean(String key) { return (Boolean) store.get(key); }

 

 	public Long getLong(String key){

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java
index b83134862..97ad1a297 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java
@@ -34,44 +34,42 @@ public class SpatialStruct extends RPCStruct {
 	/**
 	 * The X-coordinate of the user control
 	 */
-	public void setX(Float x) {
+	public void setX(Integer x) {
 		setValue(KEY_X, x);
 	}
 
-	public Float getX() {
-		return getFloat(KEY_X);
+	public Integer getX() {
+		return getInteger(KEY_X);
 	}
 
 	/**
 	 * The Y-coordinate of the user control
 	 */
-	public void setY(Float y) {
+	public void setY(Integer y) {
 		setValue(KEY_Y, y);
 	}
 
-	public Float getY() {
-		return getFloat(KEY_Y);
+	public Integer getY() {
+		return getInteger(KEY_Y);
 	}
 
 	/**
 	 * The width of the user control's bounding rectangle
 	 */
-	public void setWidth(Float width) {
+	public void setWidth(Integer width) {
 		setValue(KEY_WIDTH, width);
 	}
 
-	public Float getWidth() {
-		return getFloat(KEY_WIDTH);
+	public Integer getWidth() {
+		return getInteger(KEY_WIDTH);
 	}
 
 	/**
 	 * The height of the user control's bounding rectangle
 	 */
-	public void setHeight(Float height) {
+	public void setHeight(Integer height) {
 		setValue(KEY_HEIGHT, height);
 	}
 
-	public Float getHeight() {
-		return getFloat(KEY_HEIGHT);
-	}
+	public Integer getHeight() { return getInteger(KEY_HEIGHT); }
 }