fix test cases

Author: burak-58

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/StatsCollector.java

@@ -96,7 +96,7 @@ private void parseStats(RTCStatsReport report) {
                     if(value.getMembers().containsKey(SSRC)) {
                         TrackStats audioTrackStats = publishStats.getAudioTrackStats();
 
-                        long packetsSent = ((Long) value.getMembers().get(PACKETS_SENT)).longValue();
+                        long packetsSent = ((BigInteger) value.getMembers().get(PACKETS_SENT)).longValue();
                         audioTrackStats.setPacketsSent(packetsSent);
 
                         BigInteger bytesSent = ((BigInteger) value.getMembers().get(BYTES_SENT));
@@ -141,7 +141,7 @@ private void parseStats(RTCStatsReport report) {
                         }
 
                         if (value.getMembers().containsKey(PACKETS_SENT)) {
-                            long packetsSent = ((Long) value.getMembers().get(PACKETS_SENT)).longValue();
+                            long packetsSent = ((BigInteger) value.getMembers().get(PACKETS_SENT)).longValue();
                             videoTrackStats.setPacketsSent(packetsSent);
                         }
 

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java

@@ -1383,19 +1383,17 @@ public void onIceDisconnected(String streamId) {
                 config.webRTCListener.onIceDisconnected(streamId);
             }
 
-           if (peers.size() == 1) {
-               if (streamStoppedByUser) {
-                   release(true);
-                   return;
-               }
-
-               if (config.reconnectionEnabled) {
-                   rePublishPlay();
-               }
-
-               if (isConference()) {
-                   releaseRemoteRenderers();
-               }
+           if (streamStoppedByUser) {
+               release(true);
+               return;
+           }
+
+           if (config.reconnectionEnabled) {
+               rePublishPlay();
+           }
+
+           if (isConference()) {
+               releaseRemoteRenderers();
            }
 
         });

webrtc-android-framework/src/test/java/io/antmedia/webrtcandroidframework/WebRTCClientTest.java

@@ -74,6 +74,7 @@
 import io.antmedia.webrtcandroidframework.api.IDataChannelObserver;
 import io.antmedia.webrtcandroidframework.api.IWebRTCClient;
 import io.antmedia.webrtcandroidframework.api.IWebRTCListener;
+import io.antmedia.webrtcandroidframework.api.PlayParams;
 import io.antmedia.webrtcandroidframework.apprtc.AppRTCAudioManager;
 import io.antmedia.webrtcandroidframework.core.BlackFrameSender;
 import io.antmedia.webrtcandroidframework.core.CustomVideoCapturer;
@@ -209,6 +210,7 @@ public void testStreamPlayParameters() {
         String streamId = "stream" + RandomStringUtils.random(5);
         String token = "token" + RandomStringUtils.random(5);
         String subscriberId = "mySubscriber" + RandomStringUtils.random(5);
+        String subscriberName = "name" + RandomStringUtils.random(5);
         String subscriberCode = "code" + RandomStringUtils.random(5);
         String viewerInfo = "info" + RandomStringUtils.random(5);
 
@@ -220,9 +222,20 @@ public void testStreamPlayParameters() {
         webRTCClient.setAudioEnabled(audioCallEnabled);
         webRTCClient.setVideoEnabled(videoCallEnabled);
 
-        webRTCClient.play(streamId, token, null, subscriberId, subscriberCode, viewerInfo);
+        PlayParams params = new PlayParams();
+        params.setStreamId(streamId);
+        params.setToken(token);
+        params.setTracks(null);
+        params.setSubscriberId(subscriberId);
+        params.setSubscriberName(subscriberName);
+        params.setSubscriberCode(subscriberCode);
+        params.setViewerInfo(viewerInfo);
+        params.setDisableTracksByDefault(false);
 
-        verify(wsHandler, times(1)).startPlay(streamId, token, null, subscriberId, "", subscriberCode, viewerInfo, false);
+
+        webRTCClient.play(params);
+
+        verify(wsHandler, times(1)).startPlay(streamId, token, null, subscriberId, subscriberName, subscriberCode, viewerInfo, false);
 
         ArgumentCaptor<String> jsonCaptor = ArgumentCaptor.forClass(String.class);
         verify(wsHandler, times(1)).sendTextMessage(jsonCaptor.capture());
@@ -233,9 +246,12 @@ public void testStreamPlayParameters() {
             json.put(WebSocketConstants.STREAM_ID, streamId);
             json.put(WebSocketConstants.TOKEN, token);
             json.put(WebSocketConstants.SUBSCRIBER_ID, subscriberId);
+            json.put(WebSocketConstants.SUBSCRIBER_NAME, subscriberName);
             json.put(WebSocketConstants.SUBSCRIBER_CODE, subscriberCode);
             json.put(WebSocketConstants.VIEWER_INFO, viewerInfo);
             json.put(WebSocketConstants.TRACK_LIST, new JSONArray());
+            json.put(WebSocketConstants.DISABLE_TRACKS_BY_DEFAULT, false);
+
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -351,9 +367,11 @@ public void testJoinRoomParameters() {
             jsonPlay.put(WebSocketConstants.STREAM_ID, roomName);
             jsonPlay.put(WebSocketConstants.TOKEN, "");
             jsonPlay.put(WebSocketConstants.SUBSCRIBER_ID, "");
+            jsonPlay.put(WebSocketConstants.SUBSCRIBER_NAME, "");
             jsonPlay.put(WebSocketConstants.SUBSCRIBER_CODE, "");
             jsonPlay.put(WebSocketConstants.VIEWER_INFO, "");
             jsonPlay.put(WebSocketConstants.TRACK_LIST, new JSONArray());
+            jsonPlay.put(WebSocketConstants.DISABLE_TRACKS_BY_DEFAULT, false);
         } catch (JSONException e) {
             e.printStackTrace();
         }

webrtc-android-framework/src/test/java/io/antmedia/webrtcandroidframework/WebSocketHandlerTest.java

@@ -194,6 +194,7 @@ public void testStartPlay() throws JSONException {
         expectedJson.put(WebSocketConstants.SUBSCRIBER_CODE, subscriberCode);
         expectedJson.put(WebSocketConstants.SUBSCRIBER_NAME, subscriberName);
         expectedJson.put(WebSocketConstants.VIEWER_INFO, viewerInfo);
+        expectedJson.put(WebSocketConstants.DISABLE_TRACKS_BY_DEFAULT, false);
 
         assertEquals(expectedJson.toString(), jsonCaptor.getValue());
     }