Skip to content

Commit f096673

Browse files
committed
Fix tests.
1 parent 32014f7 commit f096673

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()
@@ -93,7 +97,7 @@ class VectorUnifiedPushMessagingReceiverTest {
9397
handleResult = pushHandlerResult
9498
),
9599
)
96-
vectorUnifiedPushMessagingReceiver.onMessage(context, "".toByteArray(), A_SECRET)
100+
vectorUnifiedPushMessagingReceiver.onMessage(context, aPushMessage(""), A_SECRET)
97101
advanceUntilIdle()
98102
pushHandlerResult.assertions()
99103
.isNeverCalled()
@@ -125,7 +129,7 @@ class VectorUnifiedPushMessagingReceiverTest {
125129
unifiedPushNewGatewayHandler = unifiedPushNewGatewayHandler,
126130
)
127131
endpointRegistrationHandler.state.test {
128-
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, "anEndpoint", A_SECRET)
132+
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, aPushEndpoint("anEndpoint"), A_SECRET)
129133
advanceUntilIdle()
130134
assertThat(awaitItem()).isEqualTo(
131135
RegistrationResult(
@@ -168,7 +172,7 @@ class VectorUnifiedPushMessagingReceiverTest {
168172
unifiedPushNewGatewayHandler = unifiedPushNewGatewayHandler,
169173
)
170174
endpointRegistrationHandler.state.test {
171-
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, "anEndpoint", A_SECRET)
175+
vectorUnifiedPushMessagingReceiver.onNewEndpoint(context, aPushEndpoint(), A_SECRET)
172176
advanceUntilIdle()
173177
assertThat(awaitItem()).isEqualTo(
174178
RegistrationResult(
@@ -205,3 +209,19 @@ class VectorUnifiedPushMessagingReceiverTest {
205209
}
206210
}
207211
}
212+
213+
private fun aPushMessage(
214+
data: String = UnifiedPushParserTest.UNIFIED_PUSH_DATA,
215+
decrypted: Boolean = true,
216+
) = PushMessage(
217+
content = data.toByteArray(),
218+
decrypted = decrypted,
219+
)
220+
221+
private fun aPushEndpoint(
222+
url: String = "anEndpoint",
223+
pubKeySet: PublicKeySet? = null,
224+
) = PushEndpoint(
225+
url = url,
226+
pubKeySet = pubKeySet,
227+
)

0 commit comments

Comments
 (0)