initialising a new matrix instance for android tests, ideally this would also be backed back the test module instead of the singleton state

vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt

@@ -38,7 +38,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.HomeActivity
@@ -47,7 +47,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.session.Session
 
 @RunWith(AndroidJUnit4::class)
@@ -61,8 +60,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
 
     @Before
     fun createSessionWithCrossSigning() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val matrix = getMatrixInstance()
-        val matrix = Matrix.getInstance(context)
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         stubAllExternalIntents()

vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt

@@ -33,7 +33,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.home.HomeActivity
 import org.hamcrest.CoreMatchers.not
@@ -41,7 +41,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
@@ -66,8 +65,7 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
 
     @Before
     fun createSessionWithCrossSigning() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val matrix = getMatrixInstance()
-        val matrix = Matrix.getInstance(context)
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {

vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt

@@ -34,6 +34,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
 import im.vector.app.features.crypto.recover.BootstrapCrossSigningTask
@@ -45,7 +46,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
@@ -67,7 +67,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
     @Before
     fun createSessionWithCrossSigningAnd4S() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val matrix = Matrix.getInstance(context)
+        val matrix = getMatrixInstance()
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {
@@ -90,7 +90,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
 
         runBlocking {
             task.execute(Params(
-                    userInteractiveAuthInterceptor =  object : UserInteractiveAuthInterceptor {
+                    userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
                         override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                             promise.resume(
                                     UserPasswordAuth(

vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.utils
+
+import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixConfiguration
+
+fun getMatrixInstance(): Matrix {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    val configuration = MatrixConfiguration(
+            roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(context)
+    )
+    Matrix.initialize(context, configuration)
+    return Matrix.getInstance(context)
+}