Skip to content

Commit 791c90a

Browse files
committed
Fix tests.
1 parent f431ebe commit 791c90a

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ import org.junit.Assert.assertThrows
3232
import org.junit.Test
3333
import org.junit.runner.RunWith
3434
import org.robolectric.RobolectricTestRunner
35+
import org.unifiedpush.android.connector.FailedReason
36+
import org.unifiedpush.android.connector.data.PublicKeySet
37+
import org.unifiedpush.android.connector.data.PushEndpoint
38+
import org.unifiedpush.android.connector.data.PushMessage
3539

3640
@RunWith(RobolectricTestRunner::class)
3741
class VectorUnifiedPushMessagingReceiverTest {
@@ -56,7 +60,7 @@ class VectorUnifiedPushMessagingReceiverTest {
5660
fun `onRegistrationFailed does nothing`() = runTest {
5761
val context = InstrumentationRegistry.getInstrumentation().context
5862
val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver()
59-
vectorUnifiedPushMessagingReceiver.onRegistrationFailed(context, A_SECRET)
63+
vectorUnifiedPushMessagingReceiver.onRegistrationFailed(context, FailedReason.NETWORK, A_SECRET)
6064
}
6165

6266
@Test
@@ -68,7 +72,7 @@ class VectorUnifiedPushMessagingReceiverTest {
6872
handleResult = pushHandlerResult
6973
),
7074
)
71-
vectorUnifiedPushMessagingReceiver.onMessage(context, UnifiedPushParserTest.UNIFIED_PUSH_DATA.toByteArray(), A_SECRET)
75+
vectorUnifiedPushMessagingReceiver.onMessage(context, aPushMessage(), A_SECRET)
7276
advanceUntilIdle()
7377
pushHandlerResult.assertions()
7478
.isCalledOnce()
@@ -96,7 +100,7 @@ class VectorUnifiedPushMessagingReceiverTest {
96100
handleInvalidResult = handleInvalidResult,
97101
),
98102
)
99-
vectorUnifiedPushMessagingReceiver.onMessage(context, "".toByteArray(), A_SECRET)
103+
vectorUnifiedPushMessagingReceiver.onMessage(context, aPushMessage(""), A_SECRET)
100104
advanceUntilIdle()
101105
handleInvalidResult.assertions().isCalledOnce()
102106
}
@@ -127,7 +131,7 @@ class VectorUnifiedPushMessagingReceiverTest {
127131
unifiedPushNewGatewayHandler = unifiedPushNewGatewayHandler,
128132
)
129133
endpointRegistrationHandler.state.test {
130-
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, "anEndpoint", A_SECRET)
134+
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, aPushEndpoint("anEndpoint"), A_SECRET)
131135
advanceUntilIdle()
132136
assertThat(awaitItem()).isEqualTo(
133137
RegistrationResult(
@@ -170,7 +174,7 @@ class VectorUnifiedPushMessagingReceiverTest {
170174
unifiedPushNewGatewayHandler = unifiedPushNewGatewayHandler,
171175
)
172176
endpointRegistrationHandler.state.test {
173-
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, "anEndpoint", A_SECRET)
177+
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, aPushEndpoint(), A_SECRET)
174178
advanceUntilIdle()
175179
assertThat(awaitItem()).isEqualTo(
176180
RegistrationResult(
@@ -207,3 +211,19 @@ class VectorUnifiedPushMessagingReceiverTest {
207211
}
208212
}
209213
}
214+
215+
private fun aPushMessage(
216+
data: String = UnifiedPushParserTest.UNIFIED_PUSH_DATA,
217+
decrypted: Boolean = true,
218+
) = PushMessage(
219+
content = data.toByteArray(),
220+
decrypted = decrypted,
221+
)
222+
223+
private fun aPushEndpoint(
224+
url: String = "anEndpoint",
225+
pubKeySet: PublicKeySet? = null,
226+
) = PushEndpoint(
227+
url = url,
228+
pubKeySet = pubKeySet,
229+
)

0 commit comments

Comments
 (0)