From d87c5ca616f02bd6e721edf09397baf85bcfc5ae Mon Sep 17 00:00:00 2001
From: Quentin Monnier <quentin.monnier38@gmail.com>
Date: Tue, 6 Dec 2022 11:30:10 -0500
Subject: [PATCH] update gitlab-ci and screport submodule

---
 .gitlab-ci-files/job-uitests.yml                | 17 +++++++++--------
 app/build.gradle                                | 11 +++++++----
 .../org/linphone/testsuites/CallTestSuite.kt    |  4 +++-
 screport                                        |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci-files/job-uitests.yml b/.gitlab-ci-files/job-uitests.yml
index f2cacda4e..9ee4993f6 100644
--- a/.gitlab-ci-files/job-uitests.yml
+++ b/.gitlab-ci-files/job-uitests.yml
@@ -28,22 +28,23 @@ job-android-uitests:
     - echo no | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager --verbose create avd --force --name $emulator_name --package $android_system_image --tag google_$emulator_type --abi $system_architecture --device $emulator_device > emulatorCreation.log
     - ${ANDROID_HOME}/platform-tools/adb start-server
     - ${ANDROID_HOME}/emulator/emulator -avd $emulator_name &
-    - ${WAIT_FOR_ANDROID_EMULATOR_EXE}
-    - ${ANDROID_HOME}/platform-tools/adb shell input keyevent 82
+    - ${UTILS}/wait-for-android-emulator
 
   script:
-  - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.call.OutgoingCallUITests -PscreportAutoClose=true connectedAndroidTest
+    - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.call.OutgoingCallUITests -PscreportAutoClose=true connectedAndroidTest
+    - ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
+	- ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
+    - ${ANDROID_HOME}/platform-tools/adb kill-server
 
   after_script:
-    - ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
-    - ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
-    - ${ANDROID_HOME}/platform-tools/adb kill-server
+    - ${UTILS}/html2xml-report -p app/build/reports/androidTests/connected/
+    - mkdir results & mv app/build/reports/androidTests/connected/* results
     
   artifacts:
     paths:
-      - app/build/reports/androidTests/connected/*
+      - results/*
     when: always
     reports:
       junit:
-        - app/build/reports/androidTests/connected/*.html
+        - results/*.xml
     expire_in: 4 week
diff --git a/app/build.gradle b/app/build.gradle
index 49ce515c2..2a275c049 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -331,10 +331,13 @@ def embedScreenshotsTask = task('embedScreenshots', group: 'reporting') {
                     def failedTestCaseDescription = failedTestCase.name
                     def pt1 = failedTestCaseDescription.indexOf(".")
                     def line = failedTestCaseDescription.substring(0, pt1)
-                    def pt2 = failedTestCaseDescription.indexOf(".", pt1)
-                    def name = failedTestCaseDescription.substring(pt1, pt2)
-                    def pt3 = failedTestCaseDescription.indexOf(".", pt2)
-                    if (pt3 != -1) name += " (${failedTestCaseDescription.substring(pt3)})"
+                    def pt2 = failedTestCaseDescription.indexOf(".", pt1+1)
+                    def name = ""
+                    if (pt2 != -1) {
+                        name = failedTestCaseDescription.substring(pt1 + 1, pt2)
+                        def pt3 = failedTestCaseDescription.indexOf(".", pt2)
+                        name += " (${failedTestCaseDescription.substring(pt3)})"
+                    } else name = failedTestCaseDescription.substring(pt1 + 1)
 
                     def failedTestClassJunitReportFile = new File(reportsDirectory, "${failedTestClassName}.html")
 
diff --git a/app/src/androidTest/java/org/linphone/testsuites/CallTestSuite.kt b/app/src/androidTest/java/org/linphone/testsuites/CallTestSuite.kt
index 807b978e4..62fcd7ea3 100644
--- a/app/src/androidTest/java/org/linphone/testsuites/CallTestSuite.kt
+++ b/app/src/androidTest/java/org/linphone/testsuites/CallTestSuite.kt
@@ -2,10 +2,12 @@ package org.linphone.testsuites
 
 import org.junit.runner.RunWith
 import org.junit.runners.Suite
+import org.linphone.call.IncomingCallUITests
 import org.linphone.call.OutgoingCallUITests
 
 @RunWith(Suite::class)
 @Suite.SuiteClasses(
-    OutgoingCallUITests::class
+    OutgoingCallUITests::class,
+    IncomingCallUITests::class
 )
 class CallTestSuite
diff --git a/screport b/screport
index 4a66b0bda..a8f3e58a0 160000
--- a/screport
+++ b/screport
@@ -1 +1 @@
-Subproject commit 4a66b0bda01e97e4b5b8c1bfd6389fa2dd1514fd
+Subproject commit a8f3e58a0043b40d57d0da925088fcfa5981f22f