Merge pull request #1403 from LuxoftSDL/Feature/webengine_projection_mode

Feature/webengine projection mode

4 files changed, 19 insertions, 2 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
index 85c74e8e4..af0881ad6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
@@ -42,6 +42,8 @@ public class AppHmiTypeTests extends TestCase {
 		AppHMIType enumSystem = AppHMIType.valueForString(example);
 		example = "REMOTE_CONTROL";
 		AppHMIType enumRemoteControl = AppHMIType.valueForString(example);
+		example = "WEB_VIEW";
+		AppHMIType enumWebView = AppHMIType.valueForString(example);
 		
 		assertNotNull("DEFAULT returned null", enumDefault);
 		assertNotNull("COMMUNICATION returned null", enumCommunication);
@@ -55,6 +57,7 @@ public class AppHmiTypeTests extends TestCase {
 		assertNotNull("TESTING returned null", enumTesting);
 		assertNotNull("SYSTEM returned null", enumSystem);
 		assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl);
+		assertNotNull("WEB_VIEW returned null", enumWebView);
 	}
 	
 	/**
@@ -104,6 +107,7 @@ public class AppHmiTypeTests extends TestCase {
 		enumTestList.add(AppHMIType.TESTING);
 		enumTestList.add(AppHMIType.SYSTEM);
 		enumTestList.add(AppHMIType.REMOTE_CONTROL);
+		enumTestList.add(AppHMIType.WEB_VIEW);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index cc59924d4..bf1d5e65b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
@@ -44,6 +44,8 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example);
 		example = "UNSUPPORTED_HMI_RESOURCE";
 		AppInterfaceUnregisteredReason enumUnsupportedHMIResource = AppInterfaceUnregisteredReason.valueForString(example);
+		example = "RESOURCE_CONSTRAINT";
+		AppInterfaceUnregisteredReason enumResourceConstraint = AppInterfaceUnregisteredReason.valueForString(example);
 				
 		assertNotNull("USER_EXIT returned null", enumUserExit);
 		assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
@@ -58,6 +60,7 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized);
 		assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation);
 		assertNotNull("UNSUPPORTED_HMI_RESOURCE returned null", enumUnsupportedHMIResource);
+		assertNotNull("RESOURCE_CONSTRAINT returned null", enumResourceConstraint);
 	}
 	
 	/**
@@ -108,6 +111,7 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED);
 		enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION);
 		enumTestList.add(AppInterfaceUnregisteredReason.UNSUPPORTED_HMI_RESOURCE);
+		enumTestList.add(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
index 26b32d08b..4c5526eec 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
@@ -58,6 +58,8 @@ public class PredefinedLayoutTests extends TestCase {
 		PredefinedLayout double_graphic_with_softbuttons = PredefinedLayout.valueForString(example);
 		example = "LARGE_GRAPHIC_ONLY";
 		PredefinedLayout large_graphic_only = PredefinedLayout.valueForString(example);
+		example = "WEB_VIEW";
+		PredefinedLayout web_view = PredefinedLayout.valueForString(example);
 
 		assertNotNull("DEFAULT returned null", defaultenum);
 		assertNotNull("MEDIA returned null", media);
@@ -79,6 +81,7 @@ public class PredefinedLayoutTests extends TestCase {
 		assertNotNull("LARGE_GRAPHIC_WITH_SOFTBUTTONS returned null", large_graphic_with_softbuttons);
 		assertNotNull("DOUBLE_GRAPHIC_WITH_SOFTBUTTONS returned null", double_graphic_with_softbuttons);
 		assertNotNull("LARGE_GRAPHIC_ONLY returned null", large_graphic_only);
+		assertNotNull("WEB_VIEW returned null", web_view);
 	}
 
 	/**
@@ -137,6 +140,7 @@ public class PredefinedLayoutTests extends TestCase {
 		enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_WITH_SOFTBUTTONS);
 		enumTestList.add(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS);
 		enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_ONLY);
+		enumTestList.add(PredefinedLayout.WEB_VIEW);
 
 		assertTrue("Enum value list does not match enum class list",
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index d4c22354e..3f2ee110d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
@@ -64,7 +64,9 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		SdlDisconnectedReason enumLegacyMode = SdlDisconnectedReason.valueForString(example);
 		example = "RPC_SESSION_ENDED";
 		SdlDisconnectedReason enumRpcSessionEnded = SdlDisconnectedReason.valueForString(example);
-		
+		example = "RESOURCE_CONSTRAINT";
+		SdlDisconnectedReason resourceConstraint = SdlDisconnectedReason.valueForString(example);
+
 		assertNotNull("USER_EXIT returned null", enumUserExit);
 		assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
 		assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
@@ -87,6 +89,7 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		assertNotNull("GENERIC_ERROR returned null", enumGenericError);
 		assertNotNull("LEGACY_BLUETOOTH_MODE_ENABLED returned null", enumLegacyMode);
 		assertNotNull("RPC_SESSION_ENDED returned null", enumRpcSessionEnded);
+		assertNotNull("RESOURCE_CONSTRAINT returned null", resourceConstraint);
 	}
 
 	/**
@@ -149,6 +152,7 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		enumTestList.add(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST);
 		enumTestList.add(SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED);
 		enumTestList.add(SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED);
+		enumTestList.add(SdlDisconnectedReason.RESOURCE_CONSTRAINT);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
@@ -156,7 +160,7 @@ public class SdlDisconnectedReasonTests extends TestCase {
 	
 	/**
 	 * Verifies the valid returns of the conversion method,
-	 * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceunregisteredReason(AppInterfaceUnregisteredReason)}
+	 * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason)}
 	 */
 	public void testConvertMethod () {		
 		assertEquals(TestValues.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED));
@@ -170,6 +174,7 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		assertEquals(TestValues.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS));
 		assertEquals(TestValues.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED));
 		assertEquals(TestValues.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT));
+		assertEquals(TestValues.MATCH, SdlDisconnectedReason.RESOURCE_CONSTRAINT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT));
 		assertNull(TestValues.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
 	}