From d7bc32d7cadf69560bd922a71807fed32cab1ed6 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 17:22:19 +0100
Subject: [PATCH 1/3] including tech orchestrator in the vector module script,
 fixes the no tests found error

---
 vector/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/build.gradle b/vector/build.gradle
index a9b8adf883..f0c66116b0 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -508,4 +508,5 @@ dependencies {
     androidTestImplementation('com.adevinta.android:barista:4.1.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
+    androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }

From 4f340f6b90090d549e266079a85fc6d158f4b165 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 20:21:24 +0100
Subject: [PATCH 2/3] adding extra sleeps in order to get the tests completing
 more consistently locally

---
 .../java/im/vector/app/ui/UiAllScreensSanityTest.kt          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index bad5d29e06..e2dbacd517 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -283,6 +283,7 @@ class UiAllScreensSanityTest {
         clickListItem(R.id.matrixProfileRecyclerView, 9)
         // File tab
         clickOn(R.string.uploads_files_title)
+        sleep(1000)
         pressBack()
 
         assertDisplayed(R.id.roomProfileAvatarView)
@@ -334,6 +335,7 @@ class UiAllScreensSanityTest {
     private fun navigateToRoomPeople() {
         // Open first user
         clickListItem(R.id.roomSettingsRecyclerView, 1)
+        sleep(1000)
         assertDisplayed(R.id.memberProfilePowerLevelView)
 
         // Verification
@@ -342,8 +344,9 @@ class UiAllScreensSanityTest {
 
         // Role
         clickListItem(R.id.matrixProfileRecyclerView, 3)
+        sleep(1000)
         clickDialogNegativeButton()
-
+        sleep(1000)
         clickBack()
     }
 

From 7bd889027606f165c991bb2ac7d9bdf548f74678 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 20:24:16 +0100
Subject: [PATCH 3/3] extracting orchestrator dependency to the
 dependencies.gradle file

---
 dependencies.gradle             | 1 +
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 13dc57d7fd..b62cdc1f1e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -58,6 +58,7 @@ ext.libs = [
                 'pagingRuntimeKtx'        : "androidx.paging:paging-runtime-ktx:2.1.2",
                 'coreTesting'             : "androidx.arch.core:core-testing:2.1.0",
                 'testCore'                : "androidx.test:core:$androidxTest",
+                'orchestrator'            : "androidx.test:orchestrator:$androidxTest",
                 'testRunner'              : "androidx.test:runner:$androidxTest",
                 'testRules'               : "androidx.test:rules:$androidxTest",
                 'espressoCore'            : "androidx.test.espresso:espresso-core:$espresso",
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 588d0f760e..1af95dc89b 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -179,5 +179,5 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation libs.tests.timberJunitRule
 
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
+    androidTestUtil libs.androidx.orchestrator
 }
diff --git a/vector/build.gradle b/vector/build.gradle
index f0c66116b0..fbbe57e16c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -508,5 +508,5 @@ dependencies {
     androidTestImplementation('com.adevinta.android:barista:4.1.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
+    androidTestUtil libs.androidx.orchestrator
 }