Skip to content

Commit 9e77ff4

Browse files
bilal-alsharifibilal-alsharifi
authored
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
1 parent b656d25 commit 9e77ff4

20 files changed

Lines changed: 181 additions & 328 deletions

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ javaSE/javaSE/local.properties
77
javaEE/javaEE/out/
88
javaEE/javaEE/build/
99
javaEE/javaEE/local.properties
10-
baseAndroid/windows/
11-
1210

1311
##############################
1412
# OS generated files

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.smartdevicelink.SdlConnection.SdlSession;
1313
import com.smartdevicelink.managers.CompletionListener;
1414
import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;
15+
import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
16+
import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
1517
import com.smartdevicelink.protocol.enums.SessionType;
1618
import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
1719
import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -39,7 +41,9 @@
3941
import java.nio.ByteOrder;
4042

4143
import static org.mockito.ArgumentMatchers.any;
44+
import static org.mockito.ArgumentMatchers.anyBoolean;
4245
import static org.mockito.ArgumentMatchers.eq;
46+
import static org.mockito.ArgumentMatchers.isNull;
4347
import static org.mockito.Mockito.doAnswer;
4448
import static org.mockito.Mockito.doReturn;
4549
import static org.mockito.Mockito.mock;
@@ -65,9 +69,11 @@ public void tearDown() throws Exception {
6569

6670
public void testCreatingAudioStreamManager() {
6771
ISdl internalInterface = mock(ISdl.class);
72+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
73+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
6874
AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);
6975
doReturn(true).when(internalInterface).isConnected();
70-
doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);
76+
doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());
7177

7278
new AudioStreamManager(internalInterface, mContext);
7379
}
@@ -101,9 +107,11 @@ public Void answer(InvocationOnMock invocation) {
101107
};
102108

103109
ISdl internalInterface = mock(ISdl.class);
110+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
111+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
104112
AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);
105113
doReturn(true).when(internalInterface).isConnected();
106-
doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);
114+
doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());
107115
doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
108116
doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));
109117

@@ -289,8 +297,10 @@ public Void answer(InvocationOnMock invocation) {
289297
};
290298

291299
ISdl internalInterface = mock(ISdl.class);
300+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
301+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
292302
doReturn(true).when(internalInterface).isConnected();
293-
doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));
303+
doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());
294304
doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
295305
doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));
296306

@@ -517,8 +527,10 @@ public Void answer(InvocationOnMock invocation) {
517527
};
518528

519529
ISdl internalInterface = mock(ISdl.class);
530+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
531+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
520532
doReturn(true).when(internalInterface).isConnected();
521-
doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));
533+
doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());
522534
doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
523535
doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));
524536

@@ -594,8 +606,10 @@ public Void answer(InvocationOnMock invocation) {
594606
};
595607

596608
ISdl internalInterface = mock(ISdl.class);
609+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
610+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
597611
doReturn(true).when(internalInterface).isConnected();
598-
doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));
612+
doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());
599613
doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
600614
doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));
601615

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void testDeleteRemoteFilesWithNamesSuccess(){
248248
final ISdl internalInterface = mock(ISdl.class);
249249

250250
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
251-
doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
251+
doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
252252

253253
final List<String> fileNames = new ArrayList<>();
254254
fileNames.add("Julian");
@@ -280,7 +280,7 @@ public void testDeleteRemoteFilesWithNamesFail(){
280280
final ISdl internalInterface = mock(ISdl.class);
281281

282282
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
283-
doAnswer(onListDeleteRequestFail).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
283+
doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
284284

285285
final List<String> fileNames = new ArrayList<>();
286286
fileNames.add("Julian");
@@ -403,7 +403,7 @@ public void testListFilesUploadRetry(){
403403
final ISdl internalInterface = mock(ISdl.class);
404404

405405
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
406-
doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
406+
doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
407407

408408
SdlFile validFile2 = new SdlFile();
409409
validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -434,7 +434,7 @@ public void onComplete(Map<String, String> errors) {
434434

435435
}
436436
});
437-
verify(internalInterface, times(5)).sendRequests(any(List.class),any(OnMultipleRequestListener.class));
437+
verify(internalInterface, times(5)).sendRPCs(any(List.class),any(OnMultipleRequestListener.class));
438438
}
439439

440440
/**
@@ -552,7 +552,7 @@ public void testMultipleFileUploadsForStaticIcon() {
552552
ISdl internalInterface = mock(ISdl.class);
553553

554554
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
555-
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
555+
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
556556

557557
FileManagerConfig fileManagerConfig = new FileManagerConfig();
558558
final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -573,7 +573,7 @@ public void onComplete(Map<String, String> errors) {
573573
});
574574
}
575575
});
576-
verify(internalInterface, times(0)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
576+
verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
577577
}
578578

579579
/**
@@ -584,7 +584,7 @@ public void testMultipleFileUploadsForPartialStaticIcon() {
584584
ISdl internalInterface = mock(ISdl.class);
585585

586586
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
587-
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
587+
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
588588

589589
FileManagerConfig fileManagerConfig = new FileManagerConfig();
590590
final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -606,7 +606,7 @@ public void onComplete(Map<String, String> errors) {
606606
});
607607
}
608608
});
609-
verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
609+
verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
610610
}
611611

612612
/**
@@ -702,7 +702,7 @@ public void testMultipleFileUpload() {
702702
ISdl internalInterface = mock(ISdl.class);
703703

704704
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
705-
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
705+
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
706706

707707
FileManagerConfig fileManagerConfig = new FileManagerConfig();
708708

@@ -739,7 +739,7 @@ public void testMultipleFileUploadPartialFailure() {
739739
ISdl internalInterface = mock(ISdl.class);
740740

741741
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
742-
doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
742+
doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
743743

744744
SdlFile validFile2 = new SdlFile();
745745
validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -788,7 +788,7 @@ public void testMultipleArtworkUploadSuccess(){
788788
ISdl internalInterface = mock(ISdl.class);
789789

790790
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
791-
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
791+
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
792792

793793
FileManagerConfig fileManagerConfig = new FileManagerConfig();
794794
final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -908,7 +908,7 @@ public void testOverWriteFilePropertyListFiles() {
908908
final ISdl internalInterface = mock(ISdl.class);
909909

910910
doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
911-
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
911+
doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
912912

913913
final SdlFile validFile2 = new SdlFile();
914914
validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -944,7 +944,7 @@ public void onComplete(Map<String, String> errors) {
944944

945945
}
946946
});
947-
verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
947+
verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
948948
}
949949

950950
/**

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

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -959,17 +959,9 @@ public void removeServiceListener(SessionType serviceType, ISdlServiceListener s
959959
@Override
960960
public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) { }
961961

962-
@Override
963-
public void sendRPCRequest(RPCRequest message) {}
964-
965962
@Override
966963
public void sendRPC(RPCMessage message) {}
967964

968-
@Override
969-
public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
970-
971-
}
972-
973965
@Override
974966
public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
975967

@@ -1021,23 +1013,12 @@ public boolean removeOnRPCListener(FunctionID messageId, OnRPCListener listener)
10211013
return false;
10221014
}
10231015

1024-
@Override
1025-
public Object getCapability(SystemCapabilityType systemCapabilityType){return null;}
1026-
1027-
@Override
1028-
public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
1029-
}
10301016

10311017
@Override
10321018
public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
10331019
return null;
10341020
}
10351021

1036-
@Override
1037-
public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
1038-
return null;
1039-
}
1040-
10411022
@Override
10421023
public SdlMsgVersion getSdlMsgVersion() {
10431024
return null;
@@ -1048,46 +1029,24 @@ public Version getProtocolVersion() {
10481029
return new Version(1,0,0);
10491030
}
10501031

1051-
1052-
@Override
1053-
public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
1054-
return false;
1055-
}
1056-
1057-
@Override
1058-
public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { }
1059-
1060-
@Override
1061-
public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { return false; }
1062-
10631032
@Override
10641033
public boolean isTransportForServiceAvailable(SessionType serviceType) {
10651034
return false;
10661035
}
10671036

10681037
@Override
1069-
public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
1070-
AudioStreamingParams params) {}
1038+
public void startAudioService(boolean encrypted){}
10711039

10721040
@Override
1073-
public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters){
1074-
return null;
1075-
}
1041+
public void startRPCEncryption() {}
10761042

10771043
@Override
1078-
public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
1079-
AudioStreamingParams params) {
1044+
public Taskmaster getTaskmaster() {
10801045
return null;
10811046
}
10821047

10831048
@Override
1084-
public void startAudioService(boolean encrypted){}
1085-
1086-
@Override
1087-
public void startRPCEncryption() {}
1088-
1089-
@Override
1090-
public Taskmaster getTaskmaster() {
1049+
public SystemCapabilityManager getSystemCapabilityManager() {
10911050
return null;
10921051
}
10931052
}

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
import androidx.test.ext.junit.runners.AndroidJUnit4;
55

6-
import com.smartdevicelink.managers.CompletionListener;
76
import com.livio.taskmaster.Taskmaster;
87
import com.smartdevicelink.managers.file.FileManager;
98
import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
109
import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
1110
import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
11+
import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
1212
import com.smartdevicelink.protocol.enums.FunctionID;
1313
import com.smartdevicelink.proxy.interfaces.ISdl;
1414
import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -51,6 +51,7 @@
5151
import static org.mockito.ArgumentMatchers.any;
5252
import static org.mockito.ArgumentMatchers.eq;
5353
import static org.mockito.Mockito.doAnswer;
54+
import static org.mockito.Mockito.doReturn;
5455
import static org.mockito.Mockito.mock;
5556
import static org.mockito.Mockito.when;
5657

@@ -89,7 +90,7 @@ public Void answer(InvocationOnMock invocation) {
8990
doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
9091

9192

92-
// When internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
93+
// When internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
9394
// inside SoftButtonManager, respond with a fake response to let the SoftButtonManager continue working.
9495
Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
9596
@Override
@@ -108,8 +109,9 @@ public Void answer(InvocationOnMock invocation) {
108109
return null;
109110
}
110111
};
111-
doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
112-
112+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
113+
doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
114+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
113115

114116
// When fileManager.uploadArtworks() is called inside the SoftButtonManager, respond with
115117
// a fake onComplete() callback to let the SoftButtonManager continue working.

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.smartdevicelink.managers.file.FileManager;
1212
import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
1313
import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
14+
import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
1415
import com.smartdevicelink.protocol.enums.FunctionID;
1516
import com.smartdevicelink.proxy.interfaces.ISdl;
1617
import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -43,6 +44,7 @@
4344
import static org.mockito.ArgumentMatchers.any;
4445
import static org.mockito.ArgumentMatchers.eq;
4546
import static org.mockito.Mockito.doAnswer;
47+
import static org.mockito.Mockito.doReturn;
4648
import static org.mockito.Mockito.mock;
4749
import static org.mockito.Mockito.when;
4850

@@ -102,7 +104,9 @@ public Void answer(InvocationOnMock invocation) {
102104
return null;
103105
}
104106
};
105-
doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
107+
SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
108+
doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
109+
doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
106110

107111
textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
108112
}

0 commit comments

Comments
 (0)