Remove Deprecated Isdl methods (#1485)

* Remove deprecated video streaming apis from isdl

* Fix unit tests

* Remove deprecated RPC sending methods from Isdl

* Remove deprecated rpc sending usages from managers

* Fix unit tests

* Remove deprecated SCM methods from Isdl

* Update SCM Isdl calls in VideoStreamManager

* Update SCM Isdl calls in AudioStreamManager

* Update SCM Isdl calls in ScreenManager

* Update SystemCapabilityManagerTests

* Fix TextAndGraphicManagerTests

* Fix SoftButtonManagerTests

* Fix SoftButtonManagerTests

* Fix AudioStreamManager tests

* Update gitignore

6 files changed, 63 insertions, 84 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index c5837c2cb..1d5d12059 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
@@ -12,6 +12,8 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

+import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;

+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;

 import com.smartdevicelink.proxy.interfaces.ISdl;

@@ -39,7 +41,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

 

 import static org.mockito.ArgumentMatchers.any;

+import static org.mockito.ArgumentMatchers.anyBoolean;

 import static org.mockito.ArgumentMatchers.eq;

+import static org.mockito.ArgumentMatchers.isNull;

 import static org.mockito.Mockito.doAnswer;

 import static org.mockito.Mockito.doReturn;

 import static org.mockito.Mockito.mock;

@@ -65,9 +69,11 @@ public class AudioStreamManagerTest extends TestCase {
 

     public void testCreatingAudioStreamManager() {

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

 

         new AudioStreamManager(internalInterface, mContext);

     }

@@ -101,9 +107,11 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -289,8 +297,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -517,8 +527,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -594,8 +606,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index 8908346d2..34cc6bf2a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -248,7 +248,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -280,7 +280,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -403,7 +403,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -434,7 +434,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(5)).sendRequests(any(List.class),any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(5)).sendRPCs(any(List.class),any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -552,7 +552,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -573,7 +573,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(0)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -584,7 +584,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -606,7 +606,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -702,7 +702,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 
@@ -739,7 +739,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -788,7 +788,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -908,7 +908,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -944,7 +944,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
index 109bf6316..a14e98383 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
@@ -960,17 +960,9 @@ public class SystemCapabilityManagerTests {
 		public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {	}
 
 		@Override
-		public void sendRPCRequest(RPCRequest message) {}
-
-		@Override
 		public void sendRPC(RPCMessage message) {}
 
 		@Override
-		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-
-		}
-
-		@Override
 		public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
 
 		}
@@ -1021,12 +1013,6 @@ public class SystemCapabilityManagerTests {
 			return false;
 		}
 
-		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType){return null;}
-
-		@Override
-		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
-		}
 
 		@Override
 		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
@@ -1034,11 +1020,6 @@ public class SystemCapabilityManagerTests {
 		}
 
 		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-			return null;
-		}
-
-		@Override
 		public SdlMsgVersion getSdlMsgVersion() {
 			return null;
 		}
@@ -1048,46 +1029,24 @@ public class SystemCapabilityManagerTests {
 			return new Version(1,0,0);
 		}
 
-
-		@Override
-		public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
-			return false;
-		}
-
-		@Override
-		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { }
-
-		@Override
-		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { return false; }
-
 		@Override
 		public boolean isTransportForServiceAvailable(SessionType serviceType) {
 			return false;
 		}
 
 		@Override
-		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
-									  AudioStreamingParams params) {}
+		public void startAudioService(boolean encrypted){}
 
 		@Override
-		public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters){
-			return null;
-		}
+		public void startRPCEncryption() {}
 
 		@Override
-		public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
-													 AudioStreamingParams params) {
+		public Taskmaster getTaskmaster() {
 			return null;
 		}
 
 		@Override
-		public void startAudioService(boolean encrypted){}
-
-		@Override
-		public void startRPCEncryption() {}
-
-		@Override
-		public Taskmaster getTaskmaster() {
+		public SystemCapabilityManager getSystemCapabilityManager() {
 			return null;
 		}
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index e5daf375b..b43be2af6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -3,12 +3,12 @@ package com.smartdevicelink.managers.screen;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.managers.CompletionListener;
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -51,6 +51,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -89,7 +90,7 @@ public class SoftButtonManagerTests {
         doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
 
 
-        // When internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
+        // When internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
         // inside SoftButtonManager, respond with a fake response to let the SoftButtonManager continue working.
         Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
             @Override
@@ -108,8 +109,9 @@ public class SoftButtonManagerTests {
                 return null;
             }
         };
-        doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
-
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
         // When fileManager.uploadArtworks() is called inside the SoftButtonManager, respond with
         // a fake onComplete() callback to let the SoftButtonManager continue working.
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 2bb0164fb..e5deb7f30 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -11,6 +11,7 @@ import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -43,6 +44,7 @@ import static junit.framework.TestCase.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -102,7 +104,9 @@ public class TextAndGraphicManagerTests {
 				return null;
 			}
 		};
-		doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
 		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index a393bf34f..2a09311e9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
@@ -2,20 +2,21 @@ package com.smartdevicelink.managers.video;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
@@ -39,13 +40,13 @@ import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
@@ -54,11 +55,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
  * This is a unit test class for the SmartDeviceLink video streaming manager class :
@@ -139,6 +140,9 @@ public class VideoStreamManagerTests {
 	public void testHMILevelNotFull(){
 		final ISdl internalInterface = mock(ISdl.class);
 
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+
 		when(internalInterface.getProtocolVersion()).thenReturn((new Version(5,0,0)));
 
 		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
@@ -147,7 +151,7 @@ public class VideoStreamManagerTests {
 		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
 		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
 
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {
@@ -174,7 +178,10 @@ public class VideoStreamManagerTests {
 		final Set<Object> listenerSet = new HashSet<>();
 
 		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,0,0));
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		Answer<Void> onGetCapability = new Answer<Void>() {
 			@Override
@@ -186,7 +193,7 @@ public class VideoStreamManagerTests {
 			}
 		};
 
-		doAnswer(onGetCapability).when(internalInterface).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class));
+		doAnswer(onGetCapability).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean());
 
 		Answer<Void> onAddServiceListener = new Answer<Void>() {
 			@Override
@@ -247,14 +254,7 @@ public class VideoStreamManagerTests {
 
 		doAnswer(onRemoveServiceListener).when(internalInterface).removeServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
 
-		when(internalInterface.startVideoStream(anyBoolean(), any(VideoStreamingParameters.class))).thenReturn(new IVideoStreamListener() {
-			@Override
-			public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs) throws ArrayIndexOutOfBoundsException {}
-			@Override
-			public void sendFrame(ByteBuffer data, long presentationTimeUs) {}
-		});
-
-		when(internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
+		when(systemCapabilityManager.getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean())).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {