General json rpc test fixes; json serialization, json array vs arraylist, etc.

11 files changed, 85 insertions, 88 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java b/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
index 5f487dc42..eba03ad4c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
@@ -94,12 +94,7 @@ public abstract class BaseRpcTests extends TestCase {
     public void testJson(){
         try{
             JSONObject reference = buildJsonStore();
-            JSONObject underTest = msg.serializeJSON();
-
-            System.out.println("testJson");
-            System.out.println("REFERENCE: " + reference.toString(2));
-            System.out.println("UNDER TEST: " + underTest.toString(2));
-
+            JSONObject underTest = msg.serializeJSON();            
             assertEquals("Size of JSON under test didn't match expected size.", reference.length(), underTest.length());
 
             // loop through all values and verifies they match the RPCMessage parameters
@@ -149,15 +144,10 @@ public abstract class BaseRpcTests extends TestCase {
     }
     
     private void testJsonArray(JSONArray reference, JSONArray underTest, String key) throws JSONException{
-        System.out.println("testJsonArray for key: " + key);
         assertEquals("Size of JSON array didn't match expected size.", reference.length(), underTest.length());
         int len = reference.length();
         for(int i=0; i<len; i++){
             Object array1Obj = reference.get(i), array2Obj = underTest.get(i);
-            System.out.println("testJsonArray");
-            System.out.println("KEY: " + key);
-            System.out.println("REFERENCE: " + array1Obj + " " + array1Obj.getClass());
-            System.out.println("UNDER TEST: " + array2Obj + " " + array2Obj.getClass());
             if(array1Obj instanceof JSONObject){
                 testJsonParameters((JSONObject) array1Obj, (JSONObject) array2Obj);
             }
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/Test.java b/sdl_android_tests/src/com/smartdevicelink/test/Test.java
index 2b6fe90aa..5d7ce4d82 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/Test.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/Test.java
@@ -110,23 +110,23 @@ public class Test {
 	public static final List<Choice>                    GENERAL_CHOICE_LIST                    = new ArrayList<Choice>();
 	public static final List<String>                    GENERAL_STRING_LIST                    = Arrays.asList(new String[] { "a", "b"});
 	public static final List<Integer>                   GENERAL_INTEGER_LIST                   = Arrays.asList(new Integer[]{ -1, -2});
-	public static final List<TTSChunk>                  GENERAL_TTSCHUNK_LIST                  = new ArrayList<TTSChunk>();
-	public static final List<TextField>                 GENERAL_TEXTFIELD_LIST                 = new ArrayList<TextField>();
-	public static final List<DIDResult>                 GENERAL_DIDRESULT_LIST                 = new ArrayList<DIDResult>();
-	public static final List<AppHMIType>                GENERAL_APPHMITYPE_LIST                = new ArrayList<AppHMIType>();
-	public static final List<VrHelpItem>                GENERAL_VRHELPITEM_LIST                = new ArrayList<VrHelpItem>();
-	public static final List<SoftButton>                GENERAL_SOFTBUTTON_LIST                = new ArrayList<SoftButton>();
-	public static final List<ImageField> 			    GENERAL_IMAGEFIELD_LIST				   = new ArrayList<ImageField>();
-	public static final List<GlobalProperty>            GENERAL_GLOBALPROPERTY_LIST            = new ArrayList<GlobalProperty>();
-	public static final List<VrCapabilities>		    GENERAL_VRCAPABILITIES_LIST            = new ArrayList<VrCapabilities>();
-	public static final List<MediaClockFormat>          GENERAL_MEDIACLOCKFORMAT_LIST		   = new ArrayList<MediaClockFormat>();
-	public static final List<VehicleDataResult>         GENERAL_VEHICLEDATARESULT_LIST         = new ArrayList<VehicleDataResult>();
-	public static final List<PrerecordedSpeech>         GENERAL_PRERECORDEDSPEECH_LIST		   = new ArrayList<PrerecordedSpeech>();
-	public static final List<SpeechCapabilities>        GENERAL_SPEECHCAPABILITIES_LIST        = new ArrayList<SpeechCapabilities>();
-	public static final List<ButtonCapabilities>        GENERAL_BUTTONCAPABILITIES_LIST        = new ArrayList<ButtonCapabilities>();
-	public static final List<HmiZoneCapabilities>       GENERAL_HMIZONECAPABILITIES_LIST       = new ArrayList<HmiZoneCapabilities>();
-	public static final List<SoftButtonCapabilities>    GENERAL_SOFTBUTTONCAPABILITIES_LIST    = new ArrayList<SoftButtonCapabilities>();
-	public static final List<AudioPassThruCapabilities> GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST = new ArrayList<AudioPassThruCapabilities>();
+	public static final List<TTSChunk>                  GENERAL_TTSCHUNK_LIST                  = new ArrayList<TTSChunk>(2);
+	public static final List<TextField>                 GENERAL_TEXTFIELD_LIST                 = new ArrayList<TextField>(1);
+	public static final List<DIDResult>                 GENERAL_DIDRESULT_LIST                 = new ArrayList<DIDResult>(1);
+	public static final List<AppHMIType>                GENERAL_APPHMITYPE_LIST                = new ArrayList<AppHMIType>(2);
+	public static final List<VrHelpItem>                GENERAL_VRHELPITEM_LIST                = new ArrayList<VrHelpItem>(2);
+	public static final List<SoftButton>                GENERAL_SOFTBUTTON_LIST                = new ArrayList<SoftButton>(1);
+	public static final List<ImageField> 			    GENERAL_IMAGEFIELD_LIST				   = new ArrayList<ImageField>(1);
+	public static final List<GlobalProperty>            GENERAL_GLOBALPROPERTY_LIST            = new ArrayList<GlobalProperty>(2);
+	public static final List<VrCapabilities>		    GENERAL_VRCAPABILITIES_LIST            = new ArrayList<VrCapabilities>(1);
+	public static final List<MediaClockFormat>          GENERAL_MEDIACLOCKFORMAT_LIST		   = new ArrayList<MediaClockFormat>(2);
+	public static final List<VehicleDataResult>         GENERAL_VEHICLEDATARESULT_LIST         = new ArrayList<VehicleDataResult>(VehicleDataType.values().length);
+	public static final List<PrerecordedSpeech>         GENERAL_PRERECORDEDSPEECH_LIST		   = new ArrayList<PrerecordedSpeech>(2);
+	public static final List<SpeechCapabilities>        GENERAL_SPEECHCAPABILITIES_LIST        = new ArrayList<SpeechCapabilities>(2);
+	public static final List<ButtonCapabilities>        GENERAL_BUTTONCAPABILITIES_LIST        = new ArrayList<ButtonCapabilities>(2);
+	public static final List<HmiZoneCapabilities>       GENERAL_HMIZONECAPABILITIES_LIST       = new ArrayList<HmiZoneCapabilities>(2);
+	public static final List<SoftButtonCapabilities>    GENERAL_SOFTBUTTONCAPABILITIES_LIST    = new ArrayList<SoftButtonCapabilities>(1);
+	public static final List<AudioPassThruCapabilities> GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST = new ArrayList<AudioPassThruCapabilities>(1);
 	
 	public static final JSONArray  JSON_TURNS                     = new JSONArray();
 	public static final JSONArray  JSON_CHOICES                   = new JSONArray();	
@@ -149,7 +149,7 @@ public class Test {
 	public static final JSONObject JSON_KEYBOARDPROPERTIES        = new JSONObject();
 	public static final JSONObject JSON_DISPLAYCAPABILITIES       = new JSONObject();
 	public static final JSONObject JSON_PRESETBANKCAPABILITIES    = new JSONObject();
-	
+		
 	static {
 		// TextField List Setup
 		TextField item = new TextField();
@@ -210,17 +210,14 @@ public class Test {
 		GENERAL_MENUPARAMS.setMenuName(GENERAL_STRING);
 		GENERAL_MENUPARAMS.setParentID(GENERAL_INT);
 		GENERAL_MENUPARAMS.setPosition(GENERAL_INT);
-		
-		// String List Setup
-		GENERAL_STRING_LIST.add("Command 1");
-		GENERAL_STRING_LIST.add("Command 2");
-		
+				
 		// VrHelpItem List Setup
 		VrHelpItem vrItem1 = new VrHelpItem();
     	vrItem1.setText(GENERAL_STRING);
     	vrItem1.setImage(GENERAL_IMAGE);
-    	vrItem1.setPosition(0);	    	
+    	vrItem1.setPosition(100);	    	
     	GENERAL_VRHELPITEM_LIST.add(vrItem1);
+    	vrItem1 = new VrHelpItem();
     	
     	// TTSChunk List Setup
     	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle"));
@@ -231,7 +228,7 @@ public class Test {
     	GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
     	GENERAL_KEYBOARDPROPERTIES.setKeyboardLayout(KeyboardLayout.QWERTY);
     	GENERAL_KEYBOARDPROPERTIES.setLanguage(Language.EN_US);
-    	GENERAL_KEYBOARDPROPERTIES.setLimitedCharacterList(GENERAL_STRING_LIST);
+    	GENERAL_KEYBOARDPROPERTIES.setLimitedCharacterList(Test.GENERAL_STRING_LIST);
     	
     	// StartTime Setup
     	GENERAL_STARTTIME.setHours(0);
@@ -243,6 +240,10 @@ public class Test {
         choice.setChoiceID(GENERAL_INT);
         choice.setMenuName(GENERAL_STRING);
         choice.setSecondaryText(GENERAL_STRING);
+        choice.setImage(GENERAL_IMAGE);
+        choice.setSecondaryImage(GENERAL_IMAGE);
+        choice.setTertiaryText(GENERAL_STRING);
+        choice.setVrCommands(GENERAL_STRING_LIST);
         GENERAL_CHOICE_LIST.add(choice);
         
         // DeviceInfo Setup
@@ -295,10 +296,10 @@ public class Test {
         
         // ButtonCapabilities List Setup
         ButtonCapabilities testButton = new ButtonCapabilities();
-        testButton.setLongPressAvailable(GENERAL_BOOLEAN);
-        testButton.setShortPressAvailable(GENERAL_BOOLEAN);
-        testButton.setUpDownAvailable(GENERAL_BOOLEAN);
-        testButton.setName(ButtonName.OK);        
+        testButton.setLongPressAvailable(false);
+        testButton.setShortPressAvailable(true);
+        testButton.setUpDownAvailable(true);
+        testButton.setName(ButtonName.SEEKRIGHT);        
         GENERAL_BUTTONCAPABILITIES_LIST.add(testButton);
         
         // SoftButtonCapabilities List Setup
@@ -375,13 +376,17 @@ public class Test {
 	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Welcome to the jungle");
 	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
 	    	JSON_TTSCHUNKS.put(jsonTtsChunk);
+	    	jsonTtsChunk = new JSONObject();
+	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Say a command");
+	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
+	    	JSON_TTSCHUNKS.put(jsonTtsChunk);
 	    	
 	    	// Json KeyboardProperties Setup
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, GENERAL_STRING);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYPRESS_MODE, KeypressMode.SINGLE_KEYPRESS);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, KeyboardLayout.QWERTY);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LANGUAGE, Language.EN_US);
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST, GENERAL_STRING_LIST);
+	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
 	    	
 	    	// Json StartTime Setup
 			JSON_STARTTIME.put(StartTime.KEY_HOURS, GENERAL_STARTTIME.getHours());
@@ -393,10 +398,10 @@ public class Test {
 			jsonChoice.put(Choice.KEY_CHOICE_ID, GENERAL_INT);
 			jsonChoice.put(Choice.KEY_IMAGE, JSON_IMAGE);
 			jsonChoice.put(Choice.KEY_MENU_NAME, GENERAL_STRING);
+			jsonChoice.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
 			jsonChoice.put(Choice.KEY_SECONDARY_IMAGE, JSON_IMAGE);
 			jsonChoice.put(Choice.KEY_SECONDARY_TEXT, GENERAL_STRING);
-			jsonChoice.put(Choice.KEY_TERTIARY_TEXT, GENERAL_STRING);
-			jsonChoice.put(Choice.KEY_VR_COMMANDS, GENERAL_STRING_LIST);
+			jsonChoice.put(Choice.KEY_TERTIARY_TEXT, GENERAL_STRING);			
 			JSON_CHOICES.put(jsonChoice);
 			
 			// Json DeviceInfo Setup
@@ -423,10 +428,10 @@ public class Test {
 			
 			// Json ButtonCapabilities List Setup
 			JSONObject jsonButton = new JSONObject();
-			jsonButton.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+			jsonButton.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, false);
 			jsonButton.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
 			jsonButton.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(ButtonCapabilities.KEY_NAME, GENERAL_STRING);
+			jsonButton.put(ButtonCapabilities.KEY_NAME, ButtonName.SEEKRIGHT);
 			JSON_BUTTONCAPABILITIES.put(jsonButton);
 			
 			// Json SoftButtonCapabilities List Setup
@@ -473,7 +478,7 @@ public class Test {
 			JSON_SCREENPARAMS.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, jsonTEC);
 			
 			// Json DisplayCapabilities Setup
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_TYPE, GENERAL_STRING);
+			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_TYPE, DisplayType.TYPE2);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, GENERAL_BOOLEAN);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_IMAGE_FIELDS, JSON_IMAGEFIELDS);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS, JsonUtils.createJsonArray(GENERAL_MEDIACLOCKFORMAT_LIST));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/CreateInteractionChoiceSet.json b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/CreateInteractionChoiceSet.json
index f2fcbe855..6f01500db 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/CreateInteractionChoiceSet.json
+++ b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/CreateInteractionChoiceSet.json
@@ -16,7 +16,11 @@
           "vrCommands":[
             "vr1",
             "vr2",
-            "vr3"
+            "vr3",
+            "vr4",
+            "vr5",
+            "vr6",
+            "vr7"
           ],
           "choiceID":1,
           "image":{
@@ -33,9 +37,13 @@
           },
           "menuName":"Menu Name 2",
           "vrCommands":[
+            "vr1",
+            "vr2",
+            "vr3",
             "vr4",
             "vr5",
-            "vr6"
+            "vr6",
+            "vr7"
           ],
           "choiceID":2,
           "image":{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/SetGlobalProperties.json b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/SetGlobalProperties.json
index efc700df9..955d657a2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/SetGlobalProperties.json
+++ b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/SetGlobalProperties.json
@@ -14,12 +14,7 @@
         "keyboardLayout":"QWERTY",
         "limitedCharacterList":[
           "a",
-          "b",
-          "c",
-          "d",
-          "e",
-          "f",
-          "g"
+          "b"
         ],
         "autoCompleteText":"something goes here",
         "language":"EN-US",
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
index b5c60fdb1..964d7ef71 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
@@ -51,8 +51,8 @@ public class AlertManeuverTests extends BaseRpcTests {
 		JSONObject result = new JSONObject();
         
         try {
-			result.put(AlertManeuver.KEY_TTS_CHUNKS, Test.GENERAL_TTSCHUNK_LIST);
-            result.put(AlertManeuver.KEY_SOFT_BUTTONS, Test.GENERAL_SOFTBUTTON_LIST);			
+			result.put(AlertManeuver.KEY_TTS_CHUNKS, Test.JSON_TTSCHUNKS);
+            result.put(AlertManeuver.KEY_SOFT_BUTTONS, Test.JSON_SOFTBUTTONS);			
         } catch(JSONException e){
         	fail(Test.JSON_FAIL);
         }
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
index 65463dcb2..450a8b9f8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
@@ -67,7 +67,7 @@ public class PerformInteractionTests extends BaseRpcTests {
 			result.put(PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST, JsonUtils.createJsonArray(Test.GENERAL_INTEGER_LIST));
 			result.put(PerformInteraction.KEY_INTERACTION_LAYOUT, Test.GENERAL_LAYOUTMODE);
 			result.put(PerformInteraction.KEY_INITIAL_TEXT, Test.GENERAL_STRING);
-			result.put(PerformInteraction.KEY_INTERACTION_MODE,   Test.GENERAL_INTERACTIONMODE);
+			result.put(PerformInteraction.KEY_INTERACTION_MODE, Test.GENERAL_INTERACTIONMODE);
 			result.put(PerformInteraction.KEY_TIMEOUT, Test.GENERAL_INT);			
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
index ab44c6ea6..6734ead05 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
@@ -71,7 +71,7 @@ public class RegisterAppInterfaceTests extends BaseRpcTests {
 			result.put(RegisterAppInterface.KEY_LANGUAGE_DESIRED, Test.GENERAL_LANGUAGE);
 			result.put(RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED, Test.GENERAL_LANGUAGE);
 			result.put(RegisterAppInterface.KEY_HASH_ID, Test.GENERAL_STRING);
-			result.put(RegisterAppInterface.KEY_TTS_NAME, Test.GENERAL_TTSCHUNK_LIST);
+			result.put(RegisterAppInterface.KEY_TTS_NAME, Test.JSON_TTSCHUNKS);
 			result.put(RegisterAppInterface.KEY_VR_SYNONYMS, JsonUtils.createJsonArray(Test.GENERAL_STRING_LIST));
 			result.put(RegisterAppInterface.KEY_APP_HMI_TYPE, JsonUtils.createJsonArrayOfJsonNames(Test.GENERAL_APPHMITYPE_LIST, SDL_VERSION_UNDER_TEST));
 			result.put(RegisterAppInterface.KEY_IS_MEDIA_APPLICATION, Test.GENERAL_BOOLEAN);
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 32f37c793..4b789b3d3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -17,7 +17,6 @@ import com.smartdevicelink.proxy.rpc.DeviceStatus;
 import com.smartdevicelink.proxy.rpc.ECallInfo;
 import com.smartdevicelink.proxy.rpc.EmergencyEvent;
 import com.smartdevicelink.proxy.rpc.GPSData;
-import com.smartdevicelink.proxy.rpc.GetVehicleData;
 import com.smartdevicelink.proxy.rpc.GetVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.MyKey;
@@ -379,33 +378,33 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 	 */
 	public void testRpcValues(){		
 		// Valid Tests
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getSpeed());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getRpm());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getExternalTemperature());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getFuelLevel());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getPrndl());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getTirePressure());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getEngineTorque());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getOdometer());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getGps());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getFuelLevelState());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getInstantFuelConsumption());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getBeltStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getBodyInformation());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getDeviceStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getDriverBraking());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getWiperStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getHeadLampStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getAccPedalPosition());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getSteeringWheelAngle());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getECallInfo());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getAirbagStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getEmergencyEvent());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getClusterModeStatus());
-		assertTrue(Test.TRUE,( (GetVehicleData) msg ).getMyKey());
+		assertEquals(Test.MATCH, VehicleDataHelper.SPEED, ( (GetVehicleDataResponse) msg ).getSpeed());
+		assertEquals(Test.MATCH, (Integer) VehicleDataHelper.RPM, ( (GetVehicleDataResponse) msg ).getRpm());
+		assertEquals(Test.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, ( (GetVehicleDataResponse) msg ).getExternalTemperature());
+		assertEquals(Test.MATCH, VehicleDataHelper.FUEL_LEVEL, ( (GetVehicleDataResponse) msg ).getFuelLevel());
+		assertEquals(Test.MATCH, VehicleDataHelper.PRNDL_FINAL, ( (GetVehicleDataResponse) msg ).getPrndl());
+		assertEquals(Test.MATCH, VehicleDataHelper.TIRE_PRESSURE, ( (GetVehicleDataResponse) msg ).getTirePressure());
+		assertEquals(Test.MATCH, VehicleDataHelper.ENGINE_TORQUE, ( (GetVehicleDataResponse) msg ).getEngineTorque());
+		assertEquals(Test.MATCH, (Integer) VehicleDataHelper.ODOMETER, ( (GetVehicleDataResponse) msg ).getOdometer());
+		assertEquals(Test.MATCH, VehicleDataHelper.GPS, ( (GetVehicleDataResponse) msg ).getGps());
+		assertEquals(Test.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, ( (GetVehicleDataResponse) msg ).getFuelLevelState());
+		assertEquals(Test.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, ( (GetVehicleDataResponse) msg ).getInstantFuelConsumption());
+		assertEquals(Test.MATCH, VehicleDataHelper.BELT_STATUS, ( (GetVehicleDataResponse) msg ).getBeltStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.BODY_INFORMATION, ( (GetVehicleDataResponse) msg ).getBodyInformation());
+		assertEquals(Test.MATCH, VehicleDataHelper.DEVICE_STATUS, ( (GetVehicleDataResponse) msg ).getDeviceStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.DRIVER_BRAKING, ( (GetVehicleDataResponse) msg ).getDriverBraking());
+		assertEquals(Test.MATCH, VehicleDataHelper.WIPER_STATUS, ( (GetVehicleDataResponse) msg ).getWiperStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.HEAD_LAMP_STATUS, ( (GetVehicleDataResponse) msg ).getHeadLampStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, ( (GetVehicleDataResponse) msg ).getAccPedalPosition());
+		assertEquals(Test.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, ( (GetVehicleDataResponse) msg ).getSteeringWheelAngle());
+		assertEquals(Test.MATCH, VehicleDataHelper.E_CALL_INFO, ( (GetVehicleDataResponse) msg ).getECallInfo());
+		assertEquals(Test.MATCH, VehicleDataHelper.AIRBAG_STATUS, ( (GetVehicleDataResponse) msg ).getAirbagStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.EMERGENCY_EVENT, ( (GetVehicleDataResponse) msg ).getEmergencyEvent());
+		assertEquals(Test.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ( (GetVehicleDataResponse) msg ).getClusterModeStatus());
+		assertEquals(Test.MATCH, VehicleDataHelper.MY_KEY, ( (GetVehicleDataResponse) msg ).getMyKey());
 		
 		// Invalid/Null Tests
-		GetVehicleData msg = new GetVehicleData();
+		GetVehicleDataResponse msg = new GetVehicleDataResponse();
 		assertNotNull(Test.NOT_NULL, msg);
 		testNullBase(msg);
 		
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
index 9418cf707..169667b7e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
@@ -78,12 +78,12 @@ public class RegisterAppInterfaceResponseTest extends BaseRpcTests {
 			result.put(RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE, Test.GENERAL_LANGUAGE);
 			result.put(RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES, JsonUtils.createJsonArray(Test.GENERAL_INTEGER_LIST));			
 			result.put(RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION, Test.JSON_SDLMSGVERSION);
-			result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, Test.GENERAL_VEHICLETYPE);
+			result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, Test.GENERAL_VEHICLETYPE.serializeJSON());
 			result.put(RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES, Test.JSON_PRESETBANKCAPABILITIES);
 			result.put(RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES, Test.JSON_DISPLAYCAPABILITIES);	
 			result.put(RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES, Test.JSON_BUTTONCAPABILITIES);
 			result.put(RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES, Test.JSON_SOFTBUTTONCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, Test.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST);				
+			result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, Test.JSON_AUDIOPASSTHRUCAPABILITIES);
 			result.put(RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES, JsonUtils.createJsonArray(Test.GENERAL_SPEECHCAPABILITIES_LIST));
 			result.put(RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES, JsonUtils.createJsonArray(Test.GENERAL_VRCAPABILITIES_LIST));	
 			result.put(RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES, JsonUtils.createJsonArray(Test.GENERAL_HMIZONECAPABILITIES_LIST));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index 51d6015fe..304f20cfa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
@@ -80,7 +80,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 			result.put(SubscribeVehicleDataResponse.KEY_SPEED, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_RPM, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
+	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_PRNDL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index 6f0f53393..987f3b3c0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
@@ -82,7 +82,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 			result.put(SubscribeVehicleDataResponse.KEY_SPEED, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_RPM, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
+	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_PRNDL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());