@@ -41,16 +41,15 @@ import org.matrix.android.sdk.internal.crypto.model.rest.UpdateDeviceInfoBody
41
41
import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
42
42
import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendToDeviceTask
43
43
import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
44
- import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
45
44
46
45
class DefaultSendToDeviceTaskTest {
47
46
48
- val users = listOf (
47
+ private val users = listOf (
49
48
" @alice:example.com" to listOf (" D0" , " D1" ),
50
49
" bob@example.com" to listOf (" D2" , " D3" )
51
50
)
52
51
53
- val fakeEncryptedContent = mapOf (
52
+ private val fakeEncryptedContent = mapOf (
54
53
" algorithm" to " m.olm.v1.curve25519-aes-sha2" ,
55
54
" sender_key" to " gMObR+/4dqL5T4DisRRRYBJpn+OjzFnkyCFOktP6Eyw" ,
56
55
" ciphertext" to mapOf (
@@ -67,14 +66,14 @@ class DefaultSendToDeviceTaskTest {
67
66
68
67
val sendToDeviceTask = DefaultSendToDeviceTask (
69
68
cryptoApi = fakeCryptoAPi,
70
- globalErrorReceiver = mockk< GlobalErrorReceiver > (relaxed = true )
69
+ globalErrorReceiver = mockk(relaxed = true )
71
70
)
72
71
73
72
val contentMap = MXUsersDevicesMap <Any >()
74
73
75
- users.forEach {
76
- val userId = it .first
77
- it .second.forEach {
74
+ users.forEach { pairOfUserDevices ->
75
+ val userId = pairOfUserDevices .first
76
+ pairOfUserDevices .second.forEach {
78
77
contentMap.setObject(userId, it, fakeEncryptedContent)
79
78
}
80
79
}
@@ -89,10 +88,10 @@ class DefaultSendToDeviceTaskTest {
89
88
}
90
89
91
90
val generatedIds = mutableListOf<String >()
92
- users.forEach {
93
- val userId = it .first
94
- it .second.forEach {
95
- val modifiedContent = fakeCryptoAPi.body!! .messages!! [userId]!! [it] as Map <String , * >
91
+ users.forEach { pairOfUserDevices ->
92
+ val userId = pairOfUserDevices .first
93
+ pairOfUserDevices .second.forEach {
94
+ val modifiedContent = fakeCryptoAPi.body!! .messages!! [userId]!! [it] as Map <* , * >
96
95
Assert .assertNotNull(" Tracing id should have been added" , modifiedContent[" org.matrix.msgid" ])
97
96
generatedIds.add(modifiedContent[" org.matrix.msgid" ] as String )
98
97
0 commit comments