From ff205042ece395b75f6f7ff2d9ddc5c9c2f95647 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 16 Oct 2025 18:15:01 +0200
Subject: [PATCH] Fix tests.

---
 .../unifiedpush/UnifiedPushParserTest.kt      | 19 +++++++++++++------
 .../VectorUnifiedPushMessagingReceiverTest.kt |  3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
index 89d4fec3b2..a269f906fe 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
@@ -12,6 +12,7 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.tests.testutils.assertThrowsInDebug
+import kotlinx.serialization.json.Json
 import org.junit.Test
 
 class UnifiedPushParserTest {
@@ -25,7 +26,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test edge cases UnifiedPush`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         // Empty string
         assertThat(pushParser.parse("".toByteArray(), aClientSecret)).isNull()
         // Empty Json
@@ -36,13 +37,13 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test UnifiedPush format`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThat(pushParser.parse(UNIFIED_PUSH_DATA.toByteArray(), aClientSecret)).isEqualTo(validData)
     }
 
     @Test
     fun `test empty roomId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.replace(A_ROOM_ID.value, "").toByteArray(), aClientSecret)
         }
@@ -50,7 +51,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test invalid roomId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(A_ROOM_ID.value, "aRoomId:domain"), aClientSecret)
         }
@@ -58,7 +59,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test empty eventId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(AN_EVENT_ID.value, ""), aClientSecret)
         }
@@ -66,7 +67,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test invalid eventId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(AN_EVENT_ID.value, "anEventId"), aClientSecret)
         }
@@ -81,3 +82,9 @@ class UnifiedPushParserTest {
 private fun String.mutate(oldValue: String, newValue: String): ByteArray {
     return replace(oldValue, newValue).toByteArray()
 }
+
+fun createUnifiedPushParser(
+    json: Json = Json { ignoreUnknownKeys = true },
+) = UnifiedPushParser(
+    json = json,
+)
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
index 0215ff66ee..5465149642 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
@@ -191,6 +191,7 @@ class VectorUnifiedPushMessagingReceiverTest {
     }
 
     private fun TestScope.createVectorUnifiedPushMessagingReceiver(
+        unifiedPushParser: UnifiedPushParser = createUnifiedPushParser(),
         pushHandler: PushHandler = FakePushHandler(),
         unifiedPushStore: UnifiedPushStore = FakeUnifiedPushStore(),
         unifiedPushGatewayResolver: UnifiedPushGatewayResolver = FakeUnifiedPushGatewayResolver(),
@@ -199,7 +200,7 @@ class VectorUnifiedPushMessagingReceiverTest {
         endpointRegistrationHandler: EndpointRegistrationHandler = EndpointRegistrationHandler(),
     ): VectorUnifiedPushMessagingReceiver {
         return VectorUnifiedPushMessagingReceiver().apply {
-            this.pushParser = UnifiedPushParser()
+            this.pushParser = unifiedPushParser
             this.pushHandler = pushHandler
             this.guardServiceStarter = NoopGuardServiceStarter()
             this.unifiedPushStore = unifiedPushStore