Resolve VideoStreamManagerTests

Author: RHenigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java

@@ -19,8 +19,11 @@
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
+import com.smartdevicelink.proxy.rpc.RegisterAppInterface;
+import com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse;
 import com.smartdevicelink.proxy.rpc.TouchCoord;
 import com.smartdevicelink.proxy.rpc.TouchEvent;
+import com.smartdevicelink.proxy.rpc.VehicleType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.enums.TouchType;
@@ -99,6 +102,12 @@ public void testInitialization(){
 		ISdl internalInterface = mock(ISdl.class);
 		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,1,0));
 
+		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+		VehicleType mockVehicleType = new VehicleType();
+		mockVehicleType.setMake("Ford");
+		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
 		Answer<Void> onAddServiceListener = new Answer<Void>() {
 			@Override
 			public Void answer(InvocationOnMock invocation) {
@@ -126,6 +135,13 @@ public void testHMILevelNotFull(){
 		final ISdl internalInterface = mock(ISdl.class);
 
 		when(internalInterface.getProtocolVersion()).thenReturn((new Version(5,0,0)));
+
+		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+		VehicleType mockVehicleType = new VehicleType();
+		mockVehicleType.setMake("Ford");
+		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
 		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
@@ -143,6 +159,12 @@ public void onComplete(boolean success) {
 	public void testRemoteDisplayStream(){
 		ISdl internalInterface = mock(ISdl.class);
 
+		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+		VehicleType mockVehicleType = new VehicleType();
+		mockVehicleType.setMake("Ford");
+		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
 		final Set<Object> listenerSet = new HashSet<>();
 
 		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,0,0));
@@ -252,6 +274,13 @@ public void onComplete(boolean success) {
 
 	public void testConvertTouchEvent() {
 		ISdl internalInterface = mock(ISdl.class);
+
+		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+		VehicleType mockVehicleType = new VehicleType();
+		mockVehicleType.setMake("Ford");
+		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
 		VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		List<MotionEvent> motionEventList;
 		long e1TS = 1558124390L, e2TS = 1558125390L, e3TS = 1558126390L;
@@ -467,6 +496,12 @@ public void testConvertTouchEvent_Scale_1_5() {
     private void assertMotionEventWithScale(int width, int height, float scale) {
         ISdl internalInterface = mock(ISdl.class);
 
+		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+		VehicleType mockVehicleType = new VehicleType();
+		mockVehicleType.setMake("Ford");
+		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
         // Preferred Resolution capability
         ImageResolution resolution = new ImageResolution(width, height);