Post merge test adjustments.

12 files changed, 223 insertions, 111 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java b/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
index e9e24eeca..35ce94192 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
@@ -151,6 +151,24 @@ public final class JsonUtils {
 		
 		return null;
 	}
+	
+	public static List<Long> readLongListFromJsonObject(JSONObject json, String key){
+		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+		
+		if(jsonArray != null){
+			int len = jsonArray.length();
+			List<Long> result = new ArrayList<Long>(len);
+			for(int i=0; i<len; i++){
+				try {
+					Long str = jsonArray.getLong(i);
+					result.add(str);
+				} catch (JSONException e) {}
+			}
+			return result;
+		}
+		
+		return null;
+	}
 
 	public static List<JSONObject> readJsonObjectListFromJsonObject(JSONObject json, String key){
 		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
index 091117e37..8a8634cc4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
@@ -12,115 +12,114 @@ public class SessionTypeTests extends TestCase {
 	private Vector<SessionType> list = SessionType.getList();
 	
 	// Verifies the values are not null upon valid assignment.
-		// These are not actual enums for packeting reasons so testing is different.
-		public void testValidEnums () {
+	// These are not actual enums for packeting reasons so testing is different.
+	public void testValidEnums () {
+		
+		final byte   HEARTBEAT_BYTE   = (byte) 0x00;
+		final String HEARTBEAT_STRING = "CONTROL";
+		
+		final byte   RPC_BYTE   = (byte) 0x07;
+		final String RPC_STRING = "RPC";
+		
+		final byte   PCM_BYTE   = (byte) 0x0A;
+		final String PCM_STRING = "PCM";
+		
+		final byte   NAV_BYTE   = (byte) 0x0B;
+		final String NAV_STRING = "NAV";
+		
+		final byte   BULK_DATA_BYTE   = (byte) 0x0F;
+		final String BULK_DATA_STRING = "BULK_DATA";
+		
+		try {
 			
-			final byte   HEARTBEAT_BYTE   = (byte) 0x00;
-			final String HEARTBEAT_STRING = "Heartbeat_Service";
+			assertNotNull("SessionType list returned null", list);
 			
-			final byte   RPC_BYTE   = (byte) 0x07;
-			final String RPC_STRING = "RPC";
+			// Check the byte values
+			SessionType enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_BYTE);
+			SessionType enumRPC       = (SessionType) SessionType.get(list, RPC_BYTE);
+			SessionType enumPCM       = (SessionType) SessionType.get(list, PCM_BYTE);
+			SessionType enumNAV       = (SessionType) SessionType.get(list, NAV_BYTE);
+			SessionType enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_BYTE);
 			
-			final byte   PCM_BYTE   = (byte) 0x0A;
-			final String PCM_STRING = "PCM";
+			assertNotNull("Start session byte match returned null", enumHeartbeat);
+			assertNotNull("Single byte match returned null",        enumRPC);
+			assertNotNull("First byte match returned null",         enumPCM);
+			assertNotNull("Consecutive byte match returned null",   enumNAV);
+			assertNotNull("Consecutive byte match returned null",   enumBulkData);
 			
-			final byte   NAV_BYTE   = (byte) 0x0B;
-			final String NAV_STRING = "NAV";
+			// Check the string values
+			enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_STRING);
+			enumRPC       = (SessionType) SessionType.get(list, RPC_STRING);
+			enumPCM       = (SessionType) SessionType.get(list, PCM_STRING);
+			enumNAV       = (SessionType) SessionType.get(list, NAV_STRING);
+			enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_STRING);
 			
-			final byte   BULK_DATA_BYTE   = (byte) 0x0F;
-			final String BULK_DATA_STRING = "Bulk_Data";
+			assertNotNull("Start session string match returned null", enumHeartbeat);
+			assertNotNull("Single string match returned null",        enumRPC);
+			assertNotNull("First string match returned null",         enumPCM);
+			assertNotNull("Consecutive string match returned null",   enumNAV);
+			assertNotNull("Consecutive string match returned null",   enumBulkData);
 			
-			try {
-				
-				assertNotNull("SessionType list returned null", list);
-				
-				// Check the byte values
-				SessionType enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_BYTE);
-				SessionType enumRPC       = (SessionType) SessionType.get(list, RPC_BYTE);
-				SessionType enumPCM       = (SessionType) SessionType.get(list, PCM_BYTE);
-				SessionType enumNAV       = (SessionType) SessionType.get(list, NAV_BYTE);
-				SessionType enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_BYTE);
-				
-				assertNotNull("Start session byte match returned null", enumHeartbeat);
-				assertNotNull("Single byte match returned null",        enumRPC);
-				assertNotNull("First byte match returned null",         enumPCM);
-				assertNotNull("Consecutive byte match returned null",   enumNAV);
-				assertNotNull("Consecutive byte match returned null",   enumBulkData);
-				
-				// Check the string values
-				enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_STRING);
-				enumRPC       = (SessionType) SessionType.get(list, RPC_STRING);
-				enumPCM       = (SessionType) SessionType.get(list, PCM_STRING);
-				enumNAV       = (SessionType) SessionType.get(list, NAV_STRING);
-				enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_STRING);
-				
-				assertNotNull("Start session string match returned null", enumHeartbeat);
-				assertNotNull("Single string match returned null",        enumRPC);
-				assertNotNull("First string match returned null",         enumPCM);
-				assertNotNull("Consecutive string match returned null",   enumNAV);
-				assertNotNull("Consecutive string match returned null",   enumBulkData);
-				
-			} catch (NullPointerException exception) {
-	            fail("Null enum list throws NullPointerException.");
-			}		
-		}
+		} catch (NullPointerException exception) {
+            fail("Null enum list throws NullPointerException.");
+		}		
+	}
 		
-		// Verifies that an invalid assignment is null.
-		public void testInvalidEnum () {
-			
-			final byte   INVALID_BYTE   = (byte) 0xAB;
-			final String INVALID_STRING = "Invalid";
-			
-			try {
-				
-				// Check the byte value
-				SessionType enumInvalid = (SessionType) SessionType.get(list, INVALID_BYTE);
-				assertNull("Invalid byte match didn't return null", enumInvalid);
-				
-				// Check the string value
-				enumInvalid = (SessionType) SessionType.get(list, INVALID_STRING);
-				assertNull("Invalid string match didn't return null", enumInvalid);
-				
-			} catch (IllegalArgumentException exception) {
-				fail("Invalid enum throws IllegalArgumentException.");
-			}
-		}
+	// Verifies that an invalid assignment is null.
+	public void testInvalidEnum () {
 		
-		// Verifies that a null assignment is invalid.
-		public void testNullEnum () {		
-			try {
-				
-				// Check null string lookup
-				SessionType enumNull = (SessionType) SessionType.get(list, null);
-				assertNull("Null lookup returns a value", enumNull);
-				
-			} catch (NullPointerException exception) {
-	            fail("Null string throws NullPointerException.");
-			}
-		}
+		final byte   INVALID_BYTE   = (byte) 0xAB;
+		final String INVALID_STRING = "Invalid";
 		
-		// Verifies the possible enum values of SessionType.
-		public void testListEnum () {
-			// Test Vector
-			Vector<SessionType> enumTestList = new Vector<SessionType>();			
-			enumTestList.add(SessionType.RPC);
-			enumTestList.add(SessionType.PCM);
-			enumTestList.add(SessionType.NAV);
-			enumTestList.add(SessionType.BULK_DATA);
-			enumTestList.add(SessionType.CONTROL);
+		try {
 			
-			assertTrue("List does not match enum test list.",
-						list.containsAll(enumTestList) &&
-						enumTestList.containsAll(list));
+			// Check the byte value
+			SessionType enumInvalid = (SessionType) SessionType.get(list, INVALID_BYTE);
+			assertNull("Invalid byte match didn't return null", enumInvalid);
 			
-			// Test Array
-			SessionType[] enumValueArray = SessionType.values();
-			SessionType[] enumTestArray = { SessionType.RPC, SessionType.PCM, 
-										    SessionType.NAV, SessionType.BULK_DATA,
-										    SessionType.CONTROL };
+			// Check the string value
+			enumInvalid = (SessionType) SessionType.get(list, INVALID_STRING);
+			assertNull("Invalid string match didn't return null", enumInvalid);
 			
-			assertTrue("Array does not match enum values array.",
-						Validator.validateSessionTypeArray(enumValueArray, enumTestArray));
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
 		}
-
-}
+	}
+	
+	// Verifies that a null assignment is invalid.
+	public void testNullEnum () {		
+		try {
+			
+			// Check null string lookup
+			SessionType enumNull = (SessionType) SessionType.get(list, null);
+			assertNull("Null lookup returns a value", enumNull);
+			
+		} catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+		}
+	}
+	
+	// Verifies the possible enum values of SessionType.
+	public void testListEnum () {
+		// Test Vector
+		Vector<SessionType> enumTestList = new Vector<SessionType>();			
+		enumTestList.add(SessionType.RPC);
+		enumTestList.add(SessionType.PCM);
+		enumTestList.add(SessionType.NAV);
+		enumTestList.add(SessionType.BULK_DATA);
+		enumTestList.add(SessionType.CONTROL);
+		
+		assertTrue("List does not match enum test list.",
+					list.containsAll(enumTestList) &&
+					enumTestList.containsAll(list));
+		
+		// Test Array
+		SessionType[] enumValueArray = SessionType.values();
+		SessionType[] enumTestArray = { SessionType.RPC, SessionType.PCM, 
+									    SessionType.NAV, SessionType.BULK_DATA,
+									    SessionType.CONTROL };
+		
+		assertTrue("Array does not match enum values array.",
+					Validator.validateSessionTypeArray(enumValueArray, enumTestArray));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
index f7bfa5c85..5b6686129 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
@@ -75,8 +75,8 @@ public class TouchEventTest extends TestCase {
 				if (key.equals(TouchEvent.KEY_C)) {
 	                assertTrue(Test.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key));
 	            } else if (key.equals(TouchEvent.KEY_TS)) {				
-					List<Integer> tsListReference = JsonUtils.readIntegerListFromJsonObject(reference, key);
-					List<Integer> tsListTest = JsonUtils.readIntegerListFromJsonObject(underTest, key);
+					List<Long> tsListReference = JsonUtils.readLongListFromJsonObject(reference, key);
+					List<Long> tsListTest = JsonUtils.readLongListFromJsonObject(underTest, key);
 					assertTrue(Test.TRUE, tsListReference.containsAll(tsListTest) && tsListTest.containsAll(tsListReference));
 				} else {
 					assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index 23f2c0cc0..8896d13e7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
@@ -40,7 +40,9 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		AppInterfaceUnregisteredReason enumFactoryDefaults = AppInterfaceUnregisteredReason.valueForString(example);
 		example = "APP_UNAUTHORIZED";
 		AppInterfaceUnregisteredReason enumAppAuthorized = AppInterfaceUnregisteredReason.valueForString(example);
-		
+		example = "PROTOCOL_VIOLATION";
+		AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example);
+				
 		assertNotNull("USER_EXIT returned null", enumUserExit);
 		assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
 		assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
@@ -52,6 +54,7 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		assertNotNull("MASTER_RESET returned null", enumMasterReset);
 		assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults);
 		assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized);
+		assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation);
 	}
 	
 	/**
@@ -99,7 +102,8 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		enumTestList.add(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE);	
 		enumTestList.add(AppInterfaceUnregisteredReason.MASTER_RESET);
 		enumTestList.add(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS);	
-		enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED);	
+		enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED);
+		enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
index a6cd64332..13937cd89 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
@@ -40,7 +40,9 @@ public class ImageFieldNameTests extends TestCase {
 		ImageFieldName enumShowConstantTbtIcon = ImageFieldName.valueForString(example);
 		example = "showConstantTBTNextTurnIcon";
 		ImageFieldName enumShowConstantTbtNextTurnIcon = ImageFieldName.valueForString(example);
-		
+		example = "locationImage";
+		ImageFieldName enumLocationImage = ImageFieldName.valueForString(example);
+				
 		assertNotNull("softButtonImage returned null", enumSoftButtonImage);
 		assertNotNull("choiceImage returned null", enumChoiceImage);
 		assertNotNull("choiceSecondaryImage returned null", enumSecondaryImage);
@@ -52,6 +54,7 @@ public class ImageFieldNameTests extends TestCase {
 		assertNotNull("graphic returned null", enumGraphicIcon);
 		assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon);
 		assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon);
+		assertNotNull("location image returned null", enumLocationImage);
 	}
 
 	/**
@@ -100,6 +103,7 @@ public class ImageFieldNameTests extends TestCase {
 		enumTestList.add(ImageFieldName.graphic);
 		enumTestList.add(ImageFieldName.showConstantTBTIcon);	
 		enumTestList.add(ImageFieldName.showConstantTBTNextTurnIcon);	
+		enumTestList.add(ImageFieldName.locationImage);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
index ba0b979bf..71448acf6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
@@ -26,11 +26,14 @@ public class KeyboardEventTests extends TestCase {
 		KeyboardEvent enumEntryCancelled = KeyboardEvent.valueForString(example);
 		example = "ENTRY_ABORTED";
 		KeyboardEvent enumEntryAborted = KeyboardEvent.valueForString(example);
+		example = "ENTRY_VOICE";
+		KeyboardEvent enumEntryVoice = KeyboardEvent.valueForString(example);
 		
 		assertNotNull("KEYPRESS returned null", enumKeypress);
 		assertNotNull("ENTRY_SUBMITTED returned null", enumEntrySubmitted);
 		assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled);
 		assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted);
+		assertNotNull("ENTRY_VOICE returned null", enumEntryVoice);
 	}
 
 	/**
@@ -72,6 +75,7 @@ public class KeyboardEventTests extends TestCase {
 		enumTestList.add(KeyboardEvent.ENTRY_SUBMITTED);
 		enumTestList.add(KeyboardEvent.ENTRY_CANCELLED);
 		enumTestList.add(KeyboardEvent.ENTRY_ABORTED);
+		enumTestList.add(KeyboardEvent.ENTRY_VOICE);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
index f81e04213..ea50b11b1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
@@ -7,6 +7,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
+import com.smartdevicelink.test.Test;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -31,12 +32,56 @@ public class RequestTypeTests extends TestCase {
 		example = "PROPRIETARY";
 		RequestType enumProprietary = RequestType.valueForString(example);
 		
+		example = "QUERY_APPS";
+		RequestType enumQueryApps = RequestType.valueForString(example);
+		example = "LAUNCH_APP";
+		RequestType enumLaunchApp = RequestType.valueForString(example);
+		example = "LOCK_SCREEN_ICON_URL";
+		RequestType enumLockScreen = RequestType.valueForString(example);
+		example = "TRAFFIC_MESSAGE_CHANNEL";
+		RequestType enumTrafficMessage = RequestType.valueForString(example);
+		example = "DRIVER_PROFILE";
+		RequestType enumDriverProfile = RequestType.valueForString(example);
+		example = "VOICE_SEARCH";
+		RequestType enumVoiceSearch = RequestType.valueForString(example);
+		example = "NAVIGATION";
+		RequestType enumNavigation = RequestType.valueForString(example);
+		example = "PHONE";
+		RequestType enumPhone = RequestType.valueForString(example);
+		example = "CLIMATE";
+		RequestType enumClimate = RequestType.valueForString(example);
+		example = "SETTINGS";
+		RequestType enumSettings = RequestType.valueForString(example);
+		example = "VEHICLE_DIAGNOSTICS";
+		RequestType enumDiagnostics = RequestType.valueForString(example);
+		example = "EMERGENCY";
+		RequestType enumEmergency = RequestType.valueForString(example);
+		example = "MEDIA";
+		RequestType enumMedia = RequestType.valueForString(example);
+		example = "FOTA";
+		RequestType enumFota = RequestType.valueForString(example);
+		
 		assertNotNull("HTTP returned null", enumHttp);
 		assertNotNull("FILE_RESUME returned null", enumFileResume);
 		assertNotNull("AUTH_REQUEST returned null", enumAuthRequest);
 		assertNotNull("AUTH_CHALLENGE returned null", enumAuthChallenge);
 		assertNotNull("AUTH_ACK returned null", enumAuthAck);
 		assertNotNull("PROPRIETARY returned null", enumProprietary);
+		
+		assertNotNull(Test.NOT_NULL, enumQueryApps);
+		assertNotNull(Test.NOT_NULL, enumLaunchApp);
+		assertNotNull(Test.NOT_NULL, enumLockScreen);
+		assertNotNull(Test.NOT_NULL, enumTrafficMessage);
+		assertNotNull(Test.NOT_NULL, enumDriverProfile);
+		assertNotNull(Test.NOT_NULL, enumVoiceSearch);
+		assertNotNull(Test.NOT_NULL, enumNavigation);
+		assertNotNull(Test.NOT_NULL, enumPhone);
+		assertNotNull(Test.NOT_NULL, enumClimate);
+		assertNotNull(Test.NOT_NULL, enumSettings);
+		assertNotNull(Test.NOT_NULL, enumDiagnostics);
+		assertNotNull(Test.NOT_NULL, enumEmergency);
+		assertNotNull(Test.NOT_NULL, enumMedia);
+		assertNotNull(Test.NOT_NULL, enumFota);
 	}
 
 	/**
@@ -79,7 +124,22 @@ public class RequestTypeTests extends TestCase {
 		enumTestList.add(RequestType.AUTH_REQUEST);
 		enumTestList.add(RequestType.AUTH_CHALLENGE);
 		enumTestList.add(RequestType.AUTH_ACK);
-		enumTestList.add(RequestType.PROPRIETARY);		
+		enumTestList.add(RequestType.PROPRIETARY);	
+		
+		enumTestList.add(RequestType.QUERY_APPS);	
+		enumTestList.add(RequestType.LAUNCH_APP);	
+		enumTestList.add(RequestType.LOCK_SCREEN_ICON_URL);	
+		enumTestList.add(RequestType.TRAFFIC_MESSAGE_CHANNEL);	
+		enumTestList.add(RequestType.DRIVER_PROFILE);	
+		enumTestList.add(RequestType.VOICE_SEARCH);	
+		enumTestList.add(RequestType.NAVIGATION);	
+		enumTestList.add(RequestType.PHONE);	
+		enumTestList.add(RequestType.CLIMATE);	
+		enumTestList.add(RequestType.SETTINGS);	
+		enumTestList.add(RequestType.VEHICLE_DIAGNOSTICS);	
+		enumTestList.add(RequestType.EMERGENCY);	
+		enumTestList.add(RequestType.MEDIA);	
+		enumTestList.add(RequestType.FOTA);	
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index e8e7b7d7e..7e91e7feb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
@@ -159,7 +159,7 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		assertEquals(Test.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS));
 		assertEquals(Test.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED));
 		assertEquals(Test.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT));
-		assertEquals(Test.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
+		assertNull(Test.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
 	}
 	
 }
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index c8a80fc25..7d0050e66 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
@@ -7,6 +7,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
+import com.smartdevicelink.test.Test;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -66,6 +67,14 @@ public class TextFieldNameTests extends TestCase {
 		TextFieldName enumTertiaryText = TextFieldName.valueForString(example);
 		example = "menuTitle";
 		TextFieldName enumMenuTitle = TextFieldName.valueForString(example);
+		example = "locationName";
+		TextFieldName enumLocName = TextFieldName.valueForString(example);
+		example = "locationDescription";
+		TextFieldName enumLocDesc = TextFieldName.valueForString(example);
+		example = "addressLines";
+		TextFieldName enumAddLines = TextFieldName.valueForString(example);
+		example = "phoneNumber";
+		TextFieldName enumPhone = TextFieldName.valueForString(example);
 		
 		assertNotNull("mainField1 returned null", enumMainField1);
 		assertNotNull("mainField2 returned null", enumMainField2);
@@ -91,6 +100,11 @@ public class TextFieldNameTests extends TestCase {
 		assertNotNull("secondaryText returned null", enumSecondaryText);
 		assertNotNull("tertiaryText returned null", enumTertiaryText);
 		assertNotNull("menuTitle returned null", enumMenuTitle);
+		
+		assertNotNull(Test.NOT_NULL, enumLocName);
+		assertNotNull(Test.NOT_NULL, enumLocDesc);
+		assertNotNull(Test.NOT_NULL, enumAddLines);
+		assertNotNull(Test.NOT_NULL, enumPhone);
 	}
 
 	/**
@@ -152,6 +166,11 @@ public class TextFieldNameTests extends TestCase {
 		enumTestList.add(TextFieldName.secondaryText);		
 		enumTestList.add(TextFieldName.tertiaryText);
 		enumTestList.add(TextFieldName.menuTitle);	
+		
+		enumTestList.add(TextFieldName.locationName);	
+		enumTestList.add(TextFieldName.locationDescription);	
+		enumTestList.add(TextFieldName.addressLines);	
+		enumTestList.add(TextFieldName.phoneNumber);	
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
index 2f7ea567d..e2161474a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
@@ -20,6 +20,8 @@ public class VehicleDataResultCodeTests extends TestCase {
 	public void testValidEnums () {	
 		String example = "SUCCESS";
 		VehicleDataResultCode enumSuccess = VehicleDataResultCode.valueForString(example);
+		example = "TRUNCATED_DATA";
+		VehicleDataResultCode enumTruncData = VehicleDataResultCode.valueForString(example);
 		example = "DISALLOWED";
 		VehicleDataResultCode enumDisallowed = VehicleDataResultCode.valueForString(example);
 		example = "USER_DISALLOWED";
@@ -36,6 +38,7 @@ public class VehicleDataResultCodeTests extends TestCase {
 		VehicleDataResultCode enumIgnored = VehicleDataResultCode.valueForString(example);
 		
 		assertNotNull("SUCCESS returned null", enumSuccess);
+		assertNotNull("TRUNCATED_DATA returned null", enumTruncData);
 		assertNotNull("DISALLOWED returned null", enumDisallowed);
 		assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
 		assertNotNull("INVALID_ID returned null", enumInvalidId);
@@ -81,6 +84,7 @@ public class VehicleDataResultCodeTests extends TestCase {
 
 		List<VehicleDataResultCode> enumTestList = new ArrayList<VehicleDataResultCode>();
 		enumTestList.add(VehicleDataResultCode.SUCCESS);
+		enumTestList.add(VehicleDataResultCode.TRUNCATED_DATA);
 		enumTestList.add(VehicleDataResultCode.DISALLOWED);
 		enumTestList.add(VehicleDataResultCode.USER_DISALLOWED);
 		enumTestList.add(VehicleDataResultCode.INVALID_ID);
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java
index fec575206..59fbcfdb0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java
@@ -52,8 +52,8 @@ public class PutFileTests extends BaseRpcTests {
 			result.put(PutFile.KEY_FILE_TYPE, Test.GENERAL_FILETYPE);
 			result.put(PutFile.KEY_PERSISTENT_FILE, Test.GENERAL_BOOLEAN);
 			result.put(PutFile.KEY_SYSTEM_FILE, Test.GENERAL_BOOLEAN);
-			result.put(PutFile.KEY_OFFSET, Test.GENERAL_INT);
-			result.put(PutFile.KEY_LENGTH, Test.GENERAL_INT);			
+			result.put(PutFile.KEY_OFFSET, Test.GENERAL_LONG);
+			result.put(PutFile.KEY_LENGTH, Test.GENERAL_LONG);			
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -114,7 +114,7 @@ public class PutFileTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_SYSTEM_FILE), cmd.getSystemFile());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_FILE_TYPE), cmd.getFileType().toString());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
-			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET), cmd.getOffset());
+			assertEquals(Test.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET).longValue(), cmd.getOffset());
 			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_LENGTH), cmd.getLength());		
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
index 9e6999678..3128b2ed3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
@@ -123,8 +123,8 @@ public class SendLocationTests 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.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES).floatValue(), cmd.getLatitudeDegrees());
-			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES).floatValue(), cmd.getLongitudeDegrees());
+			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES), cmd.getLatitudeDegrees());
+			assertEquals(Test.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES), cmd.getLongitudeDegrees());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_NAME), cmd.getLocationName());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_DESCRIPTION), cmd.getLocationDescription());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_PHONE_NUMBER), cmd.getPhoneNumber());