Fix CI issues

Author: CrisBarreiro

content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/WebCompatMessagingPlugin.kt

@@ -71,8 +71,7 @@ class WebCompatMessagingPlugin @Inject constructor(
                         .map { it.getGlobalJsMessageHandler() }
                         .filter { it.method == jsMessage.method }
                         .forEach { handler ->
-                                handler.process(jsMessage, jsMessageCallback) {
-                            }
+                            handler.process(jsMessage, jsMessageCallback) { }
                         }
 
                     // Process with feature handlers

content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/WebCompatMessagingPluginTest.kt

@@ -17,6 +17,7 @@
 package com.duckduckgo.contentscopescripts.impl.messaging
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebViewCompat.WebMessageListener
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.plugins.PluginPoint
@@ -25,8 +26,8 @@ import com.duckduckgo.contentscopescripts.api.GlobalJsMessageHandler
 import com.duckduckgo.contentscopescripts.api.WebCompatContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.impl.AdsJsContentScopeScripts
 import com.duckduckgo.js.messaging.api.JsMessage
-import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.WebCompatMessageHandler
+import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
 import kotlinx.coroutines.test.runTest
@@ -44,6 +45,7 @@ class WebCompatMessagingPluginTest {
 
     private val adsJsContentScopeScripts: AdsJsContentScopeScripts = mock()
     private val handlers: PluginPoint<WebCompatContentScopeJsMessageHandlersPlugin> = FakePluginPoint()
+    private val mockReplyProxy: JavaScriptReplyProxy = mock()
     private val globalHandlers: PluginPoint<GlobalContentScopeJsMessageHandlersPlugin> = FakeGlobalHandlersPluginPoint()
     private lateinit var testee: WebCompatMessagingPlugin
 
@@ -57,9 +59,16 @@ class WebCompatMessagingPluginTest {
                 return object : WebCompatMessageHandler {
                     override fun process(
                         jsMessage: JsMessage,
-                        jsMessageCallback: JsMessageCallback?,
+                        jsMessageCallback: WebViewCompatMessageCallback?,
+                        onResponse: (JSONObject) -> Unit,
                     ) {
-                        jsMessageCallback?.process(jsMessage.featureName, jsMessage.method, jsMessage.id, jsMessage.params)
+                        jsMessageCallback?.process(
+                            jsMessage.featureName,
+                            jsMessage.method,
+                            jsMessage.id,
+                            jsMessage.params,
+                            onResponse,
+                        )
                     }
 
                     override val featureName: String = "webCompat"
@@ -81,9 +90,16 @@ class WebCompatMessagingPluginTest {
 
                     override fun process(
                         jsMessage: JsMessage,
-                        jsMessageCallback: JsMessageCallback,
+                        jsMessageCallback: WebViewCompatMessageCallback,
+                        onResponse: (JSONObject) -> Unit,
                     ) {
-                        jsMessageCallback.process(jsMessage.featureName, jsMessage.method, jsMessage.id, jsMessage.params)
+                        jsMessageCallback.process(
+                            jsMessage.featureName,
+                            jsMessage.method,
+                            jsMessage.id,
+                            jsMessage.params,
+                            onResponse,
+                        )
                     }
 
                     override val method: String = "addDebugFlag"
@@ -111,7 +127,7 @@ class WebCompatMessagingPluginTest {
             {"context":"contentScopeScripts","featureName":"webCompat","id":"myId","method":"webShare","params":{}}
         """.trimIndent()
 
-        testee.process(message, callback)
+        testee.process(message, callback, mockReplyProxy)
 
         assertEquals(1, callback.counter)
     }
@@ -120,7 +136,7 @@ class WebCompatMessagingPluginTest {
     fun `when processing unknown message do nothing`() = runTest {
         givenInterfaceIsRegistered()
 
-        testee.process("", callback)
+        testee.process("", callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -133,7 +149,7 @@ class WebCompatMessagingPluginTest {
             {"context":"contentScopeScripts","featureName":"test","id":"myId","method":"webShare","params":{}}
         """.trimIndent()
 
-        testee.process(message, callback)
+        testee.process(message, callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -146,7 +162,7 @@ class WebCompatMessagingPluginTest {
             {"context":"contentScopeScripts","webCompat":"test","method":"webShare","params":{}}
         """.trimIndent()
 
-        testee.process(message, callback)
+        testee.process(message, callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -159,7 +175,7 @@ class WebCompatMessagingPluginTest {
             {"context":"contentScopeScripts","featureName":"debugFeature","id":"debugId","method":"addDebugFlag","params":{}}
         """.trimIndent()
 
-        testee.process(message, callback)
+        testee.process(message, callback, mockReplyProxy)
 
         assertEquals(1, callback.counter)
     }
@@ -231,9 +247,15 @@ class WebCompatMessagingPluginTest {
         assertEquals("contentScopeAdsjs", capturedObjectName)
     }
 
-    private val callback = object : JsMessageCallback() {
+    private val callback = object : WebViewCompatMessageCallback() {
         var counter = 0
-        override fun process(featureName: String, method: String, id: String?, data: JSONObject?) {
+        override fun process(
+            featureName: String,
+            method: String,
+            id: String?,
+            data: JSONObject?,
+            onResponse: (params: JSONObject) -> Unit,
+        ) {
             counter++
         }
     }