Feature/0296 possibility to update video streaming capabilities

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java

@@ -99,6 +99,7 @@ public void setUp() throws Exception {
         videoStreamingCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
         videoStreamingCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
         videoStreamingCapability.setPreferredFPS(TestValues.GENERAL_INTEGER);
+        videoStreamingCapability.setAdditionalVideoStreamingCapabilities(TestValues.GENERAL_ADDITIONAL_CAPABILITY_LIST);
         systemCapability.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
     }
 
@@ -214,6 +215,7 @@ public void testGetVSCapability() {
         VideoStreamingCapability vsCapability = new VideoStreamingCapability();
         vsCapability.setMaxBitrate(TestValues.GENERAL_INT);
         vsCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
+        vsCapability.setAdditionalVideoStreamingCapabilities(TestValues.GENERAL_ADDITIONAL_CAPABILITY_LIST);
         vsCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
         vsCapability.setPreferredFPS(TestValues.GENERAL_INTEGER);
 
@@ -325,7 +327,7 @@ public void testGetCapability() {
         scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
         retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
         assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
-        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
         verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
@@ -338,7 +340,7 @@ public void testGetCapability() {
         scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
         retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
         assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
-        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
 
 
         // Test case 4 (capability cached, listener null, forceUpdate false)
@@ -384,7 +386,7 @@ public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabi
         OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
         doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
         scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
         verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
@@ -412,7 +414,7 @@ public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabi
         // When the last listener is removed, GetSystemCapability request should go out with subscribe=false
         doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
         scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
     }
 
     @Test
@@ -506,7 +508,7 @@ public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCap
         // When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
         doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
         scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
     }
 
     @Test
@@ -553,7 +555,7 @@ public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCap
         // When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
         doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
         scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
     }
 
     @Test
@@ -578,8 +580,8 @@ public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsA
 
         // Get Capability (should notify listener1 again)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(2)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
         // Add listener2
@@ -590,9 +592,9 @@ public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsA
 
         // Get Capability (should notify listener1 & listener2 again)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(3)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener2, times(2)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
         // Add listener3
@@ -603,10 +605,10 @@ public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsA
 
         // Get Capability (should notify listener1 & listener2 & listener3 again)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(3)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener2, times(3)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener3, times(2)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
         // Remove listener1
@@ -615,10 +617,10 @@ public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsA
 
         // Get Capability (should notify listener2 & listener3 again)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(4)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener3, times(3)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
         // Remove listener2
@@ -627,23 +629,23 @@ public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsA
 
         // Get Capability (should notify listener3 again)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
         // Remove listener3
         scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-        verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
 
 
         // Get Capability (should not notify any listener again because they are all removed)
         scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-        verify(internalInterface, times(6)).sendRPC(any(GetSystemCapability.class));
-        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-        verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
     }
 
     @Test
@@ -961,7 +963,7 @@ public void removeServiceListener(SessionType serviceType, ISdlServiceListener s
         }
 
         @Override
-        public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {
+        public void startVideoService(VideoStreamingParameters parameters, boolean encrypted, boolean withPendingRestart) {
         }
 
         @Override

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

@@ -40,6 +40,7 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -70,6 +71,7 @@ public class VideoStreamManagerTests {
     public static final String TAG = "VideoStreamManagerTests";
     private Context mTestContext;
     private static boolean touchEventOccured = false;
+    private static boolean viewResizedCalled = false;
 
     // SETUP / HELPERS
 
@@ -93,6 +95,11 @@ protected void onCreate(Bundle savedInstanceState) {
             setContentView(simulatedView);
         }
 
+        @Override
+        public void onViewResized(int width, int height) {
+            viewResizedCalled = true;
+        }
+
         @Override
         public boolean onTouchEvent(@NonNull MotionEvent event) {
             touchEventOccured = true;
@@ -106,6 +113,7 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
     public void testInitialization() {
         ISdl internalInterface = mock(ISdl.class);
         when(internalInterface.getProtocolVersion()).thenReturn(new Version(5, 1, 0));
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
 
         RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
         VehicleType mockVehicleType = new VehicleType();
@@ -160,14 +168,15 @@ public void onComplete(boolean success) {
                 VideoStreamingParameters params = new VideoStreamingParameters();
                 boolean encrypted = false;
                 videoStreamManager.startStreaming(params, encrypted);
-                verify(internalInterface, times(0)).startVideoService(params, encrypted);
+                verify(internalInterface, times(0)).startVideoService(params, encrypted, false);
             }
         });
     }
 
     @Test
     public void testRemoteDisplayStream() {
         ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
 
         RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
         VehicleType mockVehicleType = new VehicleType();
@@ -268,19 +277,65 @@ public void onComplete(boolean success) {
                 hmiListener[0].onNotified(fullNotification);
 
                 videoStreamManager.startRemoteDisplayStream(mTestContext, TestPresentation.class, null, false);
-
-                //assertTrue(touchEventOccured);
-
+                assertTrue(touchEventOccured);
                 videoStreamManager.dispose();
                 assertTrue(listenerSet.isEmpty());
             }
         });
 
     }
 
+    @Test
+    public void testOnViewResized() {
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
+
+        final OnRPCNotificationListener[] hmiListener = {null};
+
+        Answer<Void> onAddHMIListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                hmiListener[0] = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+
+        doAnswer(onAddHMIListener).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+
+        final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
+        videoStreamManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                OnHMIStatus fullNotification = new OnHMIStatus();
+                fullNotification.setHmiLevel(HMILevel.HMI_FULL);
+                hmiListener[0].onNotified(fullNotification);
+
+                videoStreamManager.startRemoteDisplayStream(mTestContext, TestPresentation.class, null, false);
+
+                Field sdlRemoteDisplayField = null;
+                try {
+                    sdlRemoteDisplayField =
+                            VideoStreamManager.class.getDeclaredField("sdlRemoteDisplay");
+                } catch (NoSuchFieldException e) { e.printStackTrace(); }
+                sdlRemoteDisplayField.setAccessible(true);
+
+                SdlRemoteDisplay display = null;
+                try {
+                    display = (SdlRemoteDisplay) sdlRemoteDisplayField.get(videoStreamManager);
+                } catch (IllegalAccessException e) { e.printStackTrace(); }
+                display.onViewResized(100, 100);
+
+                assertTrue(viewResizedCalled);
+            }
+        });
+    }
+
     @Test
     public void testConvertTouchEvent() {
         ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
 
         RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
         VehicleType mockVehicleType = new VehicleType();
@@ -495,6 +550,7 @@ public void testConvertTouchEvent_Scale_1_5() {
 
     private void assertMotionEventWithScale(int width, int height, float scale) {
         ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
 
         RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
         VehicleType mockVehicleType = new VehicleType();
@@ -528,13 +584,16 @@ private void assertMotionEventWithScale(int width, int height, float scale) {
 
         motionEvent = motionEventList.get(0);
         assertEquals(1, motionEvent.getPointerCount());
-        assertEquals(Math.round(e1x / scale), Math.round(motionEvent.getX(0)));
-        assertEquals(Math.round(e1y / scale), Math.round(motionEvent.getY(0)));
+        assertEquals(Math.round(e1x * scale), Math.round(motionEvent.getX(0)));
+        assertEquals(Math.round(e1y * scale), Math.round(motionEvent.getY(0)));
     }
 
     @Test
     public void testIsHMIStateVideoStreamCapable() {
-        VideoStreamManager videoStreamManager = new VideoStreamManager(mock(ISdl.class));
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getSystemCapabilityManager()).thenReturn(mock(SystemCapabilityManager.class));
+
+        VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 
         // Case 1 (VideoStreamingState = STREAMABLE)
         assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, VideoStreamingState.STREAMABLE)));