Skip to content

Feature/fga/fix sdk integration tests #4568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmarty merged 9 commits into from
Dec 3, 2021
Merged

Feature/fga/fix sdk integration tests #4568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67975e0
Matrix: introduce MatrixWorkerFactory to remove internal usage of Mat…
ganfra Nov 19, 2021
69720ff
Android tests: introduce TestBackgroundDetectionObserver so sync is n…
ganfra Nov 19, 2021
1d9da6c
Tests: do some clean-up and fix bunch of them
ganfra Nov 24, 2021
ccdeeea
Tests: fix timeline tests + some small others
ganfra Nov 26, 2021
cfaa726
Tests: clean up a bit
ganfra Nov 26, 2021
30fe564
Throw clear error when MatrixWorkerFactory is not set up on worker co…
ganfra Nov 29, 2021
51f46d1
Tests: clean after review
ganfra Nov 30, 2021
f0ecfbb
Tests: TestMatrix should only be used internally by sdk tests
ganfra Nov 30, 2021
667bf1a
Tests: fix internal TestMatrix
ganfra Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/TestMatrix.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

@bmarty bmarty Nov 30, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I told you!

@bmarty bmarty Nov 30, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI does not like this change though. I think some other test classes have to be declared internal


@Inject internal lateinit var legacySessionImporter: LegacySessionImporter
@Inject internal lateinit var authenticationService: AuthenticationService
Expand Down
3 changes: 1 addition & 2 deletions vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<Unit> {
Expand Down
3 changes: 1 addition & 2 deletions vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<Unit> {
Expand Down