Modified test to use customLogger instead of httpLoggingInterceptor

Author: marcin-cebo

pubnub-kotlin/pubnub-kotlin-impl/src/integrationTest/kotlin/com/pubnub/api/integration/SubscribeIntegrationTests.kt

@@ -5,6 +5,10 @@ import com.google.gson.JsonObject
 import com.pubnub.api.PubNub
 import com.pubnub.api.callbacks.SubscribeCallback
 import com.pubnub.api.enums.PNStatusCategory
+import com.pubnub.api.logging.CustomLogger
+import com.pubnub.api.logging.LogMessage
+import com.pubnub.api.logging.LogMessageContent
+import com.pubnub.api.logging.LogMessageType
 import com.pubnub.api.models.consumer.PNStatus
 import com.pubnub.api.models.consumer.channel_group.PNChannelGroupsAddChannelResult
 import com.pubnub.api.models.consumer.pubsub.PNMessageResult
@@ -1254,30 +1258,34 @@ class SubscribeIntegrationTests : BaseIntegrationTest() {
     }
 
     @Test
-    fun `shouldDeduplicateChannelSubscriptionsWhenSubscribingToSameChannelMultipleTimes`() {
+    fun shouldDeduplicateChannelSubscriptionsWhenSubscribingToSameChannelMultipleTimes() {
         // given
         val numberOfSubscribe = 4
         // punbub.subscribe does subscribe to already subscribed channel so only two subscribe calls should occur. Handshake and actual subscribe.
         val countDownLatch = CountDownLatch(2)
         var interceptedUrl: HttpUrl? = null
         val testChannel = randomChannel()
 
-        clientConfig = {
-            httpLoggingInterceptor =
-                HttpLoggingInterceptor { message ->
-                    // Intercept subscribe GET request
-                    if (message.startsWith("--> GET https://") && message.contains("/v2/subscribe/")) {
-                        val url = message.substringAfter("--> GET ").substringBefore(" HTTP")
-                        interceptedUrl = url.toHttpUrlOrNull()
+        val customLogger = object : CustomLogger {
+            override fun debug(logMessage: LogMessage) {
+                if(logMessage.type == LogMessageType.NETWORK_REQUEST){
+                    val networkRequestDetails = logMessage.message as LogMessageContent.NetworkRequest
+                    if (networkRequestDetails.path.contains("/v2/subscribe/")) {
+                        interceptedUrl = (networkRequestDetails.origin + networkRequestDetails.path).toHttpUrlOrNull()
                         countDownLatch.countDown()
                     }
-                }.apply { level = HttpLoggingInterceptor.Level.BASIC }
+                }
+            }
+        }
+
+        clientConfig = {
+            customLoggers = listOf(customLogger)
         }
 
         try {
             repeat(numberOfSubscribe) { iteration ->
                 pubnub.subscribe(channels = listOf(testChannel))
-                Thread.sleep(2000)
+                Thread.sleep(150)
                 println("Subscribe call ${iteration + 1}/$numberOfSubscribe completed")
             }
 
@@ -1293,9 +1301,10 @@ class SubscribeIntegrationTests : BaseIntegrationTest() {
             // then: verify the actual HTTP request only includes the channel once
             assertNotNull("Expected to intercept subscribe URL", interceptedUrl)
 
-            val channelsParam =
-                interceptedUrl!!.queryParameter("channel") ?: interceptedUrl!!.encodedPath.substringAfter("/subscribe/")
-                    .substringAfter("/").substringBefore("/")
+            val channelsParam = interceptedUrl!!.encodedPath
+                .substringAfter("/subscribe/")
+                .substringAfter("/")
+                .substringBefore("/")
 
             val channelList = channelsParam.split(",").filter { it.isNotEmpty() }
 
@@ -1306,24 +1315,28 @@ class SubscribeIntegrationTests : BaseIntegrationTest() {
     }
 
     @Test
-    fun `heartbeatShouldDeduplicateChannelNameInUrlWhenSubscribingToSameChannelMultipleTimes`() {
+    fun heartbeatShouldDeduplicateChannelNameInUrlWhenSubscribingToSameChannelMultipleTimes() {
         // given
         val numberOfSubscribe = 4
         val countDownLatch = CountDownLatch(2) // we want to verify second heartbeat URL
         var interceptedUrl: HttpUrl? = null
         val testChannel = randomChannel()
 
-        clientConfig = {
-            heartbeatInterval = 5
-            httpLoggingInterceptor =
-                HttpLoggingInterceptor { message ->
-                    // Intercept subscribe GET request
-                    if (message.startsWith("--> GET https://") && message.contains("/v2/presence/") && message.contains("/heartbeat")) {
-                        val url = message.substringAfter("--> GET ").substringBefore(" HTTP")
-                        interceptedUrl = url.toHttpUrlOrNull()
+        val customLogger = object : CustomLogger {
+            override fun debug(logMessage: LogMessage) {
+                if(logMessage.type == LogMessageType.NETWORK_REQUEST){
+                    val networkRequestDetails = logMessage.message as LogMessageContent.NetworkRequest
+                    if (networkRequestDetails.path.contains("/v2/presence/") && networkRequestDetails.path.contains("/heartbeat")) {
+                        interceptedUrl = (networkRequestDetails.origin + networkRequestDetails.path).toHttpUrlOrNull()
                         countDownLatch.countDown()
                     }
-                }.apply { level = HttpLoggingInterceptor.Level.BASIC }
+                }
+            }
+        }
+
+        clientConfig = {
+            customLoggers = listOf(customLogger)
+            heartbeatInterval = 5
         }
 
         try {
@@ -1354,27 +1367,30 @@ class SubscribeIntegrationTests : BaseIntegrationTest() {
     }
 
     @Test
-    fun `shouldDeduplicateChannelSubscriptionsWhenSubscribingToListOfTheSameChannels`() {
+    fun shouldDeduplicateChannelSubscriptionsWhenSubscribingToListOfTheSameChannels() {
         // given
         val countDownLatch = CountDownLatch(2) // Only two subscribe calls should occur. Handshake and actual subscribe.
         var interceptedUrl: HttpUrl? = null
         val testChannel = randomChannel()
 
+         val customLogger = object : CustomLogger {
+             override fun debug(logMessage: LogMessage) {
+                 if(logMessage.type == LogMessageType.NETWORK_REQUEST){
+                     val networkRequestDetails = logMessage.message as LogMessageContent.NetworkRequest
+                        if (networkRequestDetails.path.contains("/v2/subscribe/")) {
+                            interceptedUrl = (networkRequestDetails.origin + networkRequestDetails.path).toHttpUrlOrNull()
+                            countDownLatch.countDown()
+                        }
+                 }
+             }
+         }
+
         clientConfig = {
-            httpLoggingInterceptor =
-                HttpLoggingInterceptor { message ->
-                    // Intercept subscribe GET request
-                    if (message.startsWith("--> GET https://") && message.contains("/v2/subscribe/")) {
-                        val url = message.substringAfter("--> GET ").substringBefore(" HTTP")
-                        interceptedUrl = url.toHttpUrlOrNull()
-                        countDownLatch.countDown()
-                    }
-                }.apply { level = HttpLoggingInterceptor.Level.BASIC }
+            customLoggers = listOf(customLogger)
         }
 
         try {
             pubnub.subscribe(channels = listOf(testChannel, testChannel, testChannel))
-            Thread.sleep(2000)
 
             // Wait for the subscribe request to be made
             assertTrue(countDownLatch.await(12000, TimeUnit.MILLISECONDS))
@@ -1388,9 +1404,10 @@ class SubscribeIntegrationTests : BaseIntegrationTest() {
             // then: verify the actual HTTP request only includes the channel once
             assertNotNull("Expected to intercept subscribe URL", interceptedUrl)
 
-            val channelsParam =
-                interceptedUrl!!.queryParameter("channel") ?: interceptedUrl!!.encodedPath.substringAfter("/subscribe/")
-                    .substringAfter("/").substringBefore("/")
+            val channelsParam = interceptedUrl!!.encodedPath
+                .substringAfter("/subscribe/")
+                .substringAfter("/")
+                .substringBefore("/")
 
             val channelList = channelsParam.split(",").filter { it.isNotEmpty() }