diff options
Diffstat (limited to 'android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java')
| -rw-r--r-- | android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java index da8a7cbfe..d3454ab8e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java @@ -3,7 +3,7 @@ package com.smartdevicelink.test.rpc.datatypes; import com.smartdevicelink.proxy.rpc.MassageCushionFirmness; import com.smartdevicelink.proxy.rpc.enums.MassageCushion; import com.smartdevicelink.test.JsonUtils; -import com.smartdevicelink.test.Test; +import com.smartdevicelink.test.TestValues; import junit.framework.TestCase; @@ -24,8 +24,8 @@ public class MassageCushionFirmnessTest extends TestCase { public void setUp() { msg = new MassageCushionFirmness(); - msg.setCushion(Test.GENERAL_MASSAGECUSHION); - msg.setFirmness(Test.GENERAL_INT); + msg.setCushion(TestValues.GENERAL_MASSAGECUSHION); + msg.setFirmness(TestValues.GENERAL_INT); } /** @@ -37,35 +37,35 @@ public class MassageCushionFirmnessTest extends TestCase { Integer firmness = msg.getFirmness(); // Valid Tests - assertEquals(Test.MATCH, Test.GENERAL_MASSAGECUSHION, cushion); - assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, firmness); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGECUSHION, cushion); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, firmness); // Invalid/Null Tests MassageCushionFirmness msg = new MassageCushionFirmness(); - assertNotNull(Test.NOT_NULL, msg); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(Test.NULL, msg.getCushion()); - assertNull(Test.NULL, msg.getFirmness()); + assertNull(TestValues.NULL, msg.getCushion()); + assertNull(TestValues.NULL, msg.getFirmness()); } public void testJson() { JSONObject reference = new JSONObject(); try { - reference.put(MassageCushionFirmness.KEY_CUSHION, Test.GENERAL_MASSAGECUSHION); - reference.put(MassageCushionFirmness.KEY_FIRMNESS, Test.GENERAL_INT); + reference.put(MassageCushionFirmness.KEY_CUSHION, TestValues.GENERAL_MASSAGECUSHION); + reference.put(MassageCushionFirmness.KEY_FIRMNESS, TestValues.GENERAL_INT); JSONObject underTest = msg.serializeJSON(); - assertEquals(Test.MATCH, reference.length(), underTest.length()); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); while (iterator.hasNext()) { String key = (String) iterator.next(); - assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } catch (JSONException e) { - fail(Test.JSON_FAIL); + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file |