Merge branch 'betterStatsCollector' into fixP2P

ant-media · Aug 6, 2024 · 48f13bc · 48f13bc
2 parents b744809 + 387715b
commit 48f13bc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -134,7 +134,7 @@ jobs:
 
       - name: Run ffmpeg
         #send test stream to the server to play test
-        run: ffmpeg -re -stream_loop 10 -i ./webrtc-android-sample-app/src/androidTest/resources/test.flv -codec copy -f flv rtmp://test.antmedia.io/LiveApp/stream556677i4d 2>&1 < /dev/null &
+        run: ffmpeg -re -stream_loop 20 -i ./webrtc-android-sample-app/src/androidTest/resources/test.flv -codec copy -f flv rtmp://test.antmedia.io/LiveApp/stream556677i4d 2>&1 < /dev/null &
 
       - uses: browser-actions/setup-chrome@v1
         id: setup-chrome

diff --git a/multitrack-conference-server.py b/multitrack-conference-server.py
@@ -1,4 +1,4 @@
-import os
+import os 
 from selenium import webdriver
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.chrome.options import Options
@@ -12,8 +12,6 @@
 from selenium.webdriver.chrome.service import Service
 
 
-
-
 class Browser:
   def init(self, is_headless):
     chrome_path = os.getenv('CHROME_PATH')
@@ -38,7 +36,6 @@ def init(self, is_headless):
     service = Service(executable_path=chromedriver_path) 
     #service = Service(executable_path='C:/Users/yunus/Desktop/antmedia/chromedriver-win64/chromedriver.exe')
 
-
     self.driver = webdriver.Chrome(service=service, options=browser_options)
 
   def open_in_new_tab(self, url, tab_id):

diff --git a/...pp/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java b/...pp/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java
@@ -169,10 +169,15 @@ public void testJoinWithExternalParticipant() throws InterruptedException {
 
         onView(withId(R.id.show_stats_button)).perform(click());
 
-        Thread.sleep(5000);
+        Thread.sleep(10000);
+
+        onView(withId(R.id.stats_popup_container)).perform(swipeUp());
 
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview)).inRoot(isDialog()).check(matches(isDisplayed()));
 
+
+        Thread.sleep(5000);
+
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview))
                 .check((view, noViewFoundException) -> {
                     if (noViewFoundException != null) {
@@ -338,8 +343,12 @@ public void testConferenceReconnect() throws IOException, InterruptedException {
 
         Thread.sleep(5000);
 
+        onView(withId(R.id. stats_popup_container)).perform(swipeUp());
+
+        Thread.sleep(5000);
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview)).inRoot(isDialog()).check(matches(isDisplayed()));
 
+
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview))
                 .check((view, noViewFoundException) -> {
                     if (noViewFoundException != null) {

diff --git a/...mple-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/PlayActivityTest.java b/...mple-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/PlayActivityTest.java
@@ -106,13 +106,10 @@ public void testPlayReconnection() throws InterruptedException, IOException {
         Intent intent = new Intent(ApplicationProvider.getApplicationContext(), PlayActivity.class);
         ActivityScenario<PlayActivity> scenario = ActivityScenario.launch(intent);
 
-        scenario.onActivity(new ActivityScenario.ActivityAction<PlayActivity>() {
-            @Override
-            public void perform(PlayActivity activity) {
-                mIdlingResource = activity.getIdlingResource();
-                IdlingRegistry.getInstance().register(mIdlingResource);
-                activity.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-            }
+        scenario.onActivity(activity -> {
+            mIdlingResource = activity.getIdlingResource();
+            IdlingRegistry.getInstance().register(mIdlingResource);
+            activity.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
         });
 
         //stream556677i4d is the stream id in github actions

diff --git a/...ple-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/StatsActivityTest.java b/...ple-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/StatsActivityTest.java
@@ -98,7 +98,6 @@ public void testStatsCollector() throws InterruptedException {
                 R.id.stats_popup_packets_sent_audio_textview,
                 R.id.stats_popup_bytes_sent_audio_textview,
                 R.id.stats_popup_packets_sent_per_second_audio_textview,
-                R.id.stats_popup_local_audio_bitrate_textview
         };
 
         int[] videoTrackStatsTextViewIds = {
@@ -108,13 +107,13 @@ public void testStatsCollector() throws InterruptedException {
                 R.id.stats_popup_frames_encoded_video_textview,
                 R.id.stats_popup_bytes_sent_video_textview,
                 R.id.stats_popup_packets_sent_per_second_video_textview,
-                R.id.stats_popup_local_video_bitrate_textview
         };
 
         for (int id : audioTrackStatsTextViewIds) {
             onView(withId(id)).check((view, noViewFoundException) -> {
                 String text = ((TextView) view).getText().toString();
                 float value = Float.parseFloat(text);
+
                 assertTrue(value > 0f);
             });
         }