diff options
| author | Brett W <geekman3454@protonmail.com> | 2017-08-25 11:01:35 -0400 |
|---|---|---|
| committer | Brett W <geekman3454@protonmail.com> | 2017-08-25 11:01:35 -0400 |
| commit | e3218120152c31860b67b9a2ddb303e80ed81b78 (patch) | |
| tree | 970ce3bc6a8c1f560f4d6dce39c14d61eee212e5 | |
| parent | 10e84a38d6a6625be89c3d08e4b49ab36ea924b6 (diff) | |
| download | sdl_android-e3218120152c31860b67b9a2ddb303e80ed81b78.tar.gz | |
fixing a few small issues
3 files changed, 8 insertions, 7 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java index 100d9f8c4..b87881b0d 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java @@ -125,7 +125,7 @@ public class Test { public static final Integer GENERAL_INTEGER = 100; public static final Long GENERAL_LONG = 100L; public static final Turn GENERAL_TURN = new Turn(); - public static final float GENERAL_FLOAT = 100f; + public static final Float GENERAL_FLOAT = 100f; public static final Image GENERAL_IMAGE = new Image(); public static final Choice GENERAL_CHOICE = new Choice(); public static final String GENERAL_STRING = "test"; diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java index 5a3eb820e..569a4db83 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java @@ -59,10 +59,10 @@ public class RectangleTests extends TestCase { JSONObject reference = new JSONObject(); try { - reference.put(Rectangle.KEY_X, ((Float) Test.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_Y, ((Float) Test.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_WIDTH, ((Float) Test.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_HEIGHT, ((Float) Test.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_X, (Test.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_Y, (Test.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_WIDTH, (Test.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_HEIGHT, (Test.GENERAL_FLOAT)); 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 cc68d1fea..b89c46358 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 @@ -21,6 +21,7 @@ import java.util.List; public class SendHapticDataTests extends BaseRpcTests { private HapticRect hapticRect; + private ArrayList<HapticRect> hapticArray; @Override protected RPCMessage createMessage(){ @@ -28,7 +29,7 @@ public class SendHapticDataTests extends BaseRpcTests { hapticRect.setId(Test.GENERAL_INTEGER); hapticRect.setRect(Test.GENERAL_RECTANGLE); - ArrayList<HapticRect> hapticArray = new ArrayList<HapticRect>(); + hapticArray = new ArrayList<HapticRect>(); hapticArray.add(0,hapticRect); SendHapticData msg = new SendHapticData(); @@ -52,7 +53,7 @@ public class SendHapticDataTests extends BaseRpcTests { JSONObject result = new JSONObject(); try{ - result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, hapticRect.serializeJSON()); + result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, hapticArray); }catch(JSONException e){ fail(Test.JSON_FAIL); } |