From f0ecfbbab2ddad00f42f6fb70ec44beda425fa3a Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 30 Nov 2021 17:22:50 +0100 Subject: [PATCH] Tests: TestMatrix should only be used internally by sdk tests --- .../androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt | 2 +- .../androidTest/java/im/vector/app/SecurityBootstrapTest.kt | 3 +-- .../androidTest/java/im/vector/app/VerificationTestBase.kt | 4 ++-- .../java/im/vector/app/VerifySessionInteractiveTest.kt | 3 +-- .../java/im/vector/app/VerifySessionPassphraseTest.kt | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt index 4c7a77b208..def5b34948 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt @@ -44,7 +44,7 @@ import javax.inject.Inject /** * This mimics the Matrix class but using TestMatrixComponent internally instead of regular MatrixComponent. */ -class TestMatrix constructor(context: Context, matrixConfiguration: MatrixConfiguration) { +internal class TestMatrix constructor(context: Context, matrixConfiguration: MatrixConfiguration) { @Inject internal lateinit var legacySessionImporter: LegacySessionImporter @Inject internal lateinit var authenticationService: AuthenticationService diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt index fb3180e624..0d0ec3dd2b 100644 --- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt +++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt @@ -48,7 +48,6 @@ 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.TestMatrix import org.matrix.android.sdk.api.session.Session @RunWith(AndroidJUnit4::class) @@ -63,7 +62,7 @@ class SecurityBootstrapTest : VerificationTestBase() { @Before fun createSessionWithCrossSigning() { val context = InstrumentationRegistry.getInstrumentation().targetContext - val matrix = TestMatrix.getInstance(context) + val matrix = Matrix.getInstance(context) val userName = "foobar_${System.currentTimeMillis()}" existingSession = createAccountAndSync(matrix, userName, password, true) stubAllExternalIntents() diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt index df3066cd3b..47e1e43be3 100644 --- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt +++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt @@ -25,8 +25,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout import org.junit.Assert +import org.matrix.android.sdk.api.Matrix import org.matrix.android.sdk.api.MatrixCallback -import org.matrix.android.sdk.api.TestMatrix import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig import org.matrix.android.sdk.api.auth.registration.RegistrationResult import org.matrix.android.sdk.api.session.Session @@ -41,7 +41,7 @@ abstract class VerificationTestBase { protected val uiTestBase = OnboardingRobot() - fun createAccountAndSync(matrix: TestMatrix, + fun createAccountAndSync(matrix: Matrix, userName: String, password: String, withInitialSync: Boolean): Session { diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt index 69814759a2..982a421425 100644 --- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt +++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt @@ -42,7 +42,6 @@ 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.TestMatrix import org.matrix.android.sdk.api.auth.UIABaseAuth import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor import org.matrix.android.sdk.api.auth.UserPasswordAuth @@ -68,7 +67,7 @@ class VerifySessionInteractiveTest : VerificationTestBase() { @Before fun createSessionWithCrossSigning() { val context = InstrumentationRegistry.getInstrumentation().targetContext - val matrix = TestMatrix.getInstance(context) + val matrix = Matrix.getInstance(context) val userName = "foobar_${System.currentTimeMillis()}" existingSession = createAccountAndSync(matrix, userName, password, true) doSync { diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt index 8c6d8b56dc..c51ff29669 100644 --- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt +++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt @@ -46,7 +46,6 @@ 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.TestMatrix import org.matrix.android.sdk.api.auth.UIABaseAuth import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor import org.matrix.android.sdk.api.auth.UserPasswordAuth @@ -68,7 +67,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() { @Before fun createSessionWithCrossSigningAnd4S() { val context = InstrumentationRegistry.getInstrumentation().targetContext - val matrix = TestMatrix.getInstance(context) + val matrix = Matrix.getInstance(context) val userName = "foobar_${System.currentTimeMillis()}" existingSession = createAccountAndSync(matrix, userName, password, true) doSync {