Fix tests

Author: CrisBarreiro

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt

@@ -101,6 +101,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
+import org.json.JSONObject
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -377,6 +378,17 @@ class BrowserWebViewClientTest {
         assertFalse(fakeMessagingPlugins.plugin.registered)
     }
 
+    @Test
+    fun whenPostMessageThenCallPostMessage() = runTest {
+        val data = SubscriptionEventData("feature", "method", JSONObject())
+
+        assertFalse(fakeMessagingPlugins.plugin.messagePosted)
+
+        testee.postMessage(data)
+
+        assertTrue(fakeMessagingPlugins.plugin.messagePosted)
+    }
+
     @UiThreadTest
     @Test
     fun whenOnReceivedHttpAuthRequestThenListenerNotified() {
@@ -1338,6 +1350,9 @@ class BrowserWebViewClientTest {
         var registered = false
             private set
 
+        var messagePosted = false
+            private set
+
         override fun unregister(webView: WebView) {
             registered = false
         }
@@ -1349,9 +1364,8 @@ class BrowserWebViewClientTest {
             registered = true
         }
 
-        // TODO (cbarreiro) Test message posting
         override fun postMessage(subscriptionEventData: SubscriptionEventData) {
-            TODO("Not yet implemented")
+            messagePosted = true
         }
     }
 

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

@@ -217,6 +217,7 @@ class ContentScopeScriptsWebMessagingPlugin @Inject constructor(
             appCoroutineScope.launch {
                 if (!webViewCompatContentScopeScripts.isEnabled()) {
                     contentScopeScriptsJsMessaging.sendSubscriptionEvent(subscriptionEventData)
+                    return@launch
                 }
 
                 val subscriptionEvent = SubscriptionEvent(

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

@@ -27,6 +27,7 @@ import com.duckduckgo.contentscopescripts.impl.WebViewCompatContentScopeScripts
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.ProcessResult
 import com.duckduckgo.js.messaging.api.ProcessResult.SendToConsumer
+import com.duckduckgo.js.messaging.api.SubscriptionEventData
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageHandler
 import junit.framework.TestCase.assertEquals
@@ -36,6 +37,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -218,61 +220,50 @@ class ContentScopeScriptsWebMessagingPluginTest {
         verify(mockWebViewCompatWrapper).removeWebMessageListener(mockWebView, "contentScopeAdsjs")
     }
 
-    // @Test
-    // fun `when posting message and adsjs is disabled then do not post message`() = runTest {
-    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(false)
-    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
-    //     givenInterfaceIsRegistered()
-    //     processInitialPing()
-    //
-    //     val result = testee.postMessage(eventData)
-    //
-    //     verify(mockWebView, never()).safePostMessage(any(), any())
-    //     assertFalse(result)
-    // }
-    //
-    // @Test
-    // fun `when posting message and adsjs is enabled but webView not registered then do not post message`() = runTest {
-    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
-    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
-    //     processInitialPing()
-    //
-    //     val result = testee.postMessage(eventData)
-    //
-    //     verify(mockWebView, never()).safePostMessage(any(), any())
-    //     assertFalse(result)
-    // }
-    //
-    // @Test
-    // fun `when posting message and adsjs is enabled but initialPing not processes then do not post message`() = runTest {
-    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
-    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
-    //
-    //     val result = testee.postMessage(eventData)
-    //
-    //     verify(mockWebView, never()).safePostMessage(any(), any())
-    //     assertFalse(result)
-    // }
-    //
-    // @Test
-    // fun `when posting message after getting initialPing and adsjs is enabled then post message`() = runTest {
-    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
-    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
-    //     givenInterfaceIsRegistered()
-    //     processInitialPing()
-    //     verify(mockWebView, never()).postWebMessage(any(), any())
-    //
-    //     val result = testee.postMessage(eventData)
-    //
-    //     verify(mockWebView).safePostMessage(any(), any())
-    //     assertTrue(result)
-    // }
-
-    private fun processInitialPing() = runTest {
-        val message = """
-            {"context":"contentScopeScripts","featureName":"messaging","id":"debugId","method":"initialPing","params":{}}
+    @Test
+    fun `when posting message and adsjs is disabled then do not post message`() = runTest {
+        whenever(webViewCompatContentScopeScripts.isEnabled()).thenReturn(false)
+        val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+        givenInterfaceIsRegistered()
+
+        testee.postMessage(eventData)
+
+        verify(mockReplyProxy, never()).postMessage(anyString())
+    }
+
+    @Test
+    fun `when posting message and adsjs is enabled but webView not registered then do not post message`() = runTest {
+        whenever(webViewCompatContentScopeScripts.isEnabled()).thenReturn(true)
+        val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+
+        testee.postMessage(eventData)
+
+        verify(mockReplyProxy, never()).postMessage(anyString())
+    }
+
+    @Test
+    fun `when posting message and adsjs is enabled but initialPing not processes then do not post message`() = runTest {
+        whenever(webViewCompatContentScopeScripts.isEnabled()).thenReturn(true)
+        val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+
+        testee.postMessage(eventData)
+
+        verify(mockReplyProxy, never()).postMessage(anyString())
+    }
+
+    @Test
+    fun `when posting message after getting initialPing and adsjs is enabled then post message`() = runTest {
+        whenever(webViewCompatContentScopeScripts.isEnabled()).thenReturn(true)
+        val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+        givenInterfaceIsRegistered()
+        val expectedMessage = """
+            {"context":"contentScopeScripts","featureName":"feature","params":{},"subscriptionName":"subscription"}
         """.trimIndent()
-        testee.process(message, callback, mockReplyProxy)
+
+        verify(mockWebView, never()).postWebMessage(any(), any())
+
+        testee.postMessage(eventData)
+        verify(mockReplyProxy).postMessage(expectedMessage)
     }
 
     private val callback = object : WebViewCompatMessageCallback {
@@ -290,5 +281,10 @@ class ContentScopeScriptsWebMessagingPluginTest {
 
     private fun givenInterfaceIsRegistered() = runTest {
         testee.register(callback, mockWebView)
+        val initialPingMessage =
+            """
+                {"context":"contentScopeScripts","featureName":"messaging","id":"debugId","method":"initialPing","params":{}}
+            """.trimIndent()
+        testee.process(initialPingMessage, callback, mockReplyProxy)
     }
 }