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

Test framework cleaning

This commit is contained in:
valere 2023-04-07 11:34:27 +02:00
parent 89267256ef
commit 1b12db9270
6 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
View File

@ -87,15 +87,13 @@ class CommonTestHelper internal constructor(context: Context, val cryptoConfig:
internal fun runCryptoTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CryptoTestHelper, CommonTestHelper) -> Unit) { internal fun runCryptoTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CryptoTestHelper, CommonTestHelper) -> Unit) {
val testHelper = CommonTestHelper(context, cryptoConfig) val testHelper = CommonTestHelper(context, cryptoConfig)
val cryptoTestHelper = CryptoTestHelper(testHelper) val cryptoTestHelper = CryptoTestHelper(testHelper)
return try { return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis) {
runTest(dispatchTimeoutMs = TestConstants.timeOutMillis * 2) { try {
withContext(Dispatchers.Main) { withContext(Dispatchers.Default) {
block(cryptoTestHelper, testHelper) block(cryptoTestHelper, testHelper)
} }
} } finally {
} finally { if (autoSignoutOnClose) {
if (autoSignoutOnClose) {
runBlocking {
testHelper.cleanUpOpenedSessions() testHelper.cleanUpOpenedSessions()
} }
} }

20
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
View File

@ -193,8 +193,8 @@ class KeyShareTests : InstrumentedTest {
cryptoTestHelper.ensureCanDecrypt(listOf(receivedEvent.eventId), aliceSession2, roomId, listOf(sentEventText ?: "")) cryptoTestHelper.ensureCanDecrypt(listOf(receivedEvent.eventId), aliceSession2, roomId, listOf(sentEventText ?: ""))
commonTestHelper.signOutAndClose(aliceSession) // commonTestHelper.signOutAndClose(aliceSession)
commonTestHelper.signOutAndClose(aliceSession2) // commonTestHelper.signOutAndClose(aliceSession2)
} }
// See E2ESanityTest for a test regarding secret sharing // See E2ESanityTest for a test regarding secret sharing
@ -272,8 +272,8 @@ class KeyShareTests : InstrumentedTest {
ownDeviceReply != null && ownDeviceReply.result is RequestResult.Success ownDeviceReply != null && ownDeviceReply.result is RequestResult.Success
} }
commonTestHelper.signOutAndClose(aliceSession) // commonTestHelper.signOutAndClose(aliceSession)
commonTestHelper.signOutAndClose(aliceNewSession) // commonTestHelper.signOutAndClose(aliceNewSession)
} }
@Test @Test
@ -387,9 +387,9 @@ class KeyShareTests : InstrumentedTest {
result != null && result is RequestResult.Success && result.chainIndex == 3 result != null && result is RequestResult.Success && result.chainIndex == 3
} }
commonTestHelper.signOutAndClose(aliceNewSession) // commonTestHelper.signOutAndClose(aliceNewSession)
commonTestHelper.signOutAndClose(aliceSession) // commonTestHelper.signOutAndClose(aliceSession)
commonTestHelper.signOutAndClose(bobSession) // commonTestHelper.signOutAndClose(bobSession)
} }
@Test @Test
@ -479,8 +479,8 @@ class KeyShareTests : InstrumentedTest {
val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession } val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
assertEquals("The request should be canceled", OutgoingRoomKeyRequestState.SENT_THEN_CANCELED, outgoing!!.state) assertEquals("The request should be canceled", OutgoingRoomKeyRequestState.SENT_THEN_CANCELED, outgoing!!.state)
commonTestHelper.signOutAndClose(aliceNewSession) // commonTestHelper.signOutAndClose(aliceNewSession)
commonTestHelper.signOutAndClose(aliceSession) // commonTestHelper.signOutAndClose(aliceSession)
commonTestHelper.signOutAndClose(bobSession) // commonTestHelper.signOutAndClose(bobSession)
} }
} }

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
View File

@ -88,7 +88,7 @@ class QuadSTests : InstrumentedTest {
assertNotNull(defaultKeyAccountData?.content) assertNotNull(defaultKeyAccountData?.content)
assertEquals("Unexpected default key ${defaultKeyAccountData?.content}", TEST_KEY_ID, defaultKeyAccountData?.content?.get("key")) assertEquals("Unexpected default key ${defaultKeyAccountData?.content}", TEST_KEY_ID, defaultKeyAccountData?.content?.get("key"))
testHelper.signOutAndClose(aliceSession) // testHelper.signOutAndClose(aliceSession)
} }
@Test @Test

6
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
View File

@ -300,8 +300,8 @@ class VerificationTest : InstrumentedTest {
requests.any { it.cancelConclusion == CancelCode.AcceptedByAnotherDevice } requests.any { it.cancelConclusion == CancelCode.AcceptedByAnotherDevice }
} }
testHelper.signOutAndClose(aliceSessionToVerify) // testHelper.signOutAndClose(aliceSessionToVerify)
testHelper.signOutAndClose(aliceSessionThatVerifies) // testHelper.signOutAndClose(aliceSessionThatVerifies)
testHelper.signOutAndClose(aliceSessionThatReceivesCanceledEvent) // testHelper.signOutAndClose(aliceSessionThatReceivesCanceledEvent)
} }
} }

4
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
View File

@ -124,8 +124,8 @@ class SpaceCreationTest : InstrumentedTest {
assertEquals("Room name should be set", roomName, spaceBobPov?.asRoom()?.roomSummary()?.name) assertEquals("Room name should be set", roomName, spaceBobPov?.asRoom()?.roomSummary()?.name)
assertEquals("Room topic should be set", topic, spaceBobPov?.asRoom()?.roomSummary()?.topic) assertEquals("Room topic should be set", topic, spaceBobPov?.asRoom()?.roomSummary()?.topic)
commonTestHelper.signOutAndClose(aliceSession) // commonTestHelper.signOutAndClose(aliceSession)
commonTestHelper.signOutAndClose(bobSession) // commonTestHelper.signOutAndClose(bobSession)
} }
@Test @Test

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
View File

@ -334,7 +334,7 @@ class SpaceHierarchyTest : InstrumentedTest {
} }
) )
commonTestHelper.signOutAndClose(session) // commonTestHelper.signOutAndClose(session)
} }
data class TestSpaceCreationResult( data class TestSpaceCreationResult(