Fix CI issues

Author: CrisBarreiro

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

@@ -79,8 +79,7 @@ class AdsjsContentScopeMessaging @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/AdsjsContentScopeScriptsJsMessagingTest.kt

@@ -17,16 +17,17 @@
 package com.duckduckgo.contentscopescripts.impl.messaging
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webkit.JavaScriptReplyProxy
 import com.duckduckgo.app.browser.api.DuckDuckGoWebView
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.AdsjsContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.api.GlobalContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.api.GlobalJsMessageHandler
 import com.duckduckgo.contentscopescripts.impl.AdsJsContentScopeScripts
+import com.duckduckgo.js.messaging.api.AdsjsJsMessageCallback
 import com.duckduckgo.js.messaging.api.AdsjsMessageHandler
 import com.duckduckgo.js.messaging.api.JsMessage
-import com.duckduckgo.js.messaging.api.JsMessageCallback
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
@@ -46,6 +47,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
 
     private val mockWebView: DuckDuckGoWebView = mock()
     private val adsJsContentScopeScripts: AdsJsContentScopeScripts = mock()
+    private val mockReplyProxy: JavaScriptReplyProxy = mock()
     private val handlers: PluginPoint<AdsjsContentScopeJsMessageHandlersPlugin> = FakePluginPoint()
     private val globalHandlers: PluginPoint<GlobalContentScopeJsMessageHandlersPlugin> = FakeGlobalHandlersPluginPoint()
     private lateinit var contentScopeScriptsJsMessaging: AdsjsContentScopeMessaging
@@ -58,11 +60,19 @@ class AdsjsContentScopeScriptsJsMessagingTest {
         inner class FakePlugin : AdsjsContentScopeJsMessageHandlersPlugin {
             override fun getJsMessageHandler(): AdsjsMessageHandler {
                 return object : AdsjsMessageHandler {
+
                     override fun process(
                         jsMessage: JsMessage,
-                        jsMessageCallback: JsMessageCallback?,
+                        jsMessageCallback: AdsjsJsMessageCallback?,
+                        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"
@@ -84,9 +94,16 @@ class AdsjsContentScopeScriptsJsMessagingTest {
 
                     override fun process(
                         jsMessage: JsMessage,
-                        jsMessageCallback: JsMessageCallback,
+                        jsMessageCallback: AdsjsJsMessageCallback,
+                        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"
@@ -103,6 +120,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
             globalHandlers = globalHandlers,
             adsJsContentScopeScripts = adsJsContentScopeScripts,
             coroutineRule.testDispatcherProvider,
+            coroutineRule.testScope,
         )
     }
 
@@ -114,7 +132,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
             {"context":"contentScopeScripts","featureName":"webCompat","id":"myId","method":"webShare","params":{}}
         """.trimIndent()
 
-        contentScopeScriptsJsMessaging.process(message, callback)
+        contentScopeScriptsJsMessaging.process(message, callback, mockReplyProxy)
 
         assertEquals(1, callback.counter)
     }
@@ -123,7 +141,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
     fun `when processing unknown message do nothing`() = runTest {
         givenInterfaceIsRegistered()
 
-        contentScopeScriptsJsMessaging.process("", callback)
+        contentScopeScriptsJsMessaging.process("", callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -136,7 +154,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
             {"context":"contentScopeScripts","featureName":"test","id":"myId","method":"webShare","params":{}}
         """.trimIndent()
 
-        contentScopeScriptsJsMessaging.process(message, callback)
+        contentScopeScriptsJsMessaging.process(message, callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -149,7 +167,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
             {"context":"contentScopeScripts","webCompat":"test","method":"webShare","params":{}}
         """.trimIndent()
 
-        contentScopeScriptsJsMessaging.process(message, callback)
+        contentScopeScriptsJsMessaging.process(message, callback, mockReplyProxy)
 
         assertEquals(0, callback.counter)
     }
@@ -162,7 +180,7 @@ class AdsjsContentScopeScriptsJsMessagingTest {
             {"context":"contentScopeScripts","featureName":"debugFeature","id":"debugId","method":"addDebugFlag","params":{}}
         """.trimIndent()
 
-        contentScopeScriptsJsMessaging.process(message, callback)
+        contentScopeScriptsJsMessaging.process(message, callback, mockReplyProxy)
 
         assertEquals(1, callback.counter)
     }
@@ -203,9 +221,15 @@ class AdsjsContentScopeScriptsJsMessagingTest {
         verify(mockWebView).safeRemoveWebMessageListener(any())
     }
 
-    private val callback = object : JsMessageCallback() {
+    private val callback = object : AdsjsJsMessageCallback() {
         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++
         }
     }