jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix E2EShareConfigTest

This commit is contained in:
valere 2023-03-31 09:33:22 +02:00
parent 69b7efdfa1
commit 507cd98304
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt
View File

@ -221,7 +221,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
enableEncryption() enableEncryption()
}) })
commonTestHelper.retryPeriodically { commonTestHelper.retryWithBackoff {
aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true
} }
val roomAlice = aliceSession.roomService().getRoom(roomId)!! val roomAlice = aliceSession.roomService().getRoom(roomId)!!
@ -238,20 +238,28 @@ class E2EShareKeysConfigTest : InstrumentedTest {
val megolmBackupCreationInfo = keysBackupService.prepareKeysBackupVersion(keyBackupPassword, null) val megolmBackupCreationInfo = keysBackupService.prepareKeysBackupVersion(keyBackupPassword, null)
val version = keysBackupService.createKeysBackupVersion(megolmBackupCreationInfo) val version = keysBackupService.createKeysBackupVersion(megolmBackupCreationInfo)
Log.v("#E2E TEST", "... Backup created.")
commonTestHelper.retryPeriodically { commonTestHelper.retryPeriodically {
Log.v("#E2E TEST", "Backup status ${keysBackupService.getTotalNumbersOfBackedUpKeys()}/${keysBackupService.getTotalNumbersOfKeys()}")
keysBackupService.getTotalNumbersOfKeys() == keysBackupService.getTotalNumbersOfBackedUpKeys() keysBackupService.getTotalNumbersOfKeys() == keysBackupService.getTotalNumbersOfBackedUpKeys()
} }
val aliceId = aliceSession.myUserId
// signout // signout
Log.v("#E2E TEST", "Sign out alice")
commonTestHelper.signOutAndClose(aliceSession) commonTestHelper.signOutAndClose(aliceSession)
val newAliceSession = commonTestHelper.logIntoAccount(aliceSession.myUserId, SessionTestParams(true)) Log.v("#E2E TEST", "Sign in a new alice device")
val newAliceSession = commonTestHelper.logIntoAccount(aliceId, SessionTestParams(true))
newAliceSession.cryptoService().enableShareKeyOnInvite(true) newAliceSession.cryptoService().enableShareKeyOnInvite(true)
newAliceSession.cryptoService().keysBackupService().let { kbs -> newAliceSession.cryptoService().keysBackupService().let { kbs ->
val keyVersionResult = kbs.getVersion(version.version) val keyVersionResult = kbs.getVersion(version.version)
Log.v("#E2E TEST", "Restore new backup")
val importedResult = kbs.restoreKeyBackupWithPassword( val importedResult = kbs.restoreKeyBackupWithPassword(
keyVersionResult!!, keyVersionResult!!,
keyBackupPassword, keyBackupPassword,
@ -265,9 +273,12 @@ class E2EShareKeysConfigTest : InstrumentedTest {
// Now let's invite sam // Now let's invite sam
// Invite a new user // Invite a new user
Log.v("#E2E TEST", "Create Sam account")
val samSession = commonTestHelper.createAccount(TestConstants.USER_SAM, SessionTestParams(withInitialSync = true)) val samSession = commonTestHelper.createAccount(TestConstants.USER_SAM, SessionTestParams(withInitialSync = true))
// Let alice invite sam // Let alice invite sam
Log.v("#E2E TEST", "Let alice invite sam")
newAliceSession.getRoom(roomId)!!.membershipService().invite(samSession.myUserId) newAliceSession.getRoom(roomId)!!.membershipService().invite(samSession.myUserId)
commonTestHelper.waitForAndAcceptInviteInRoom(samSession, roomId) commonTestHelper.waitForAndAcceptInviteInRoom(samSession, roomId)
@ -283,7 +294,12 @@ class E2EShareKeysConfigTest : InstrumentedTest {
listOf(sharableMessage), listOf(sharableMessage),
samSession, samSession,
roomId, roomId,
listOf(roomAlice.getTimelineEvent(sharableMessage)?.root?.getClearContent()?.get("body") as String) listOf(newAliceSession.getRoom(roomId)!!
.getTimelineEvent(sharableMessage)
?.root
?.getClearContent()
?.get("body") as String
)
) )
} }
} }