From 7c4f708ad39d79bde0f89cbe187398cd4d8eec45 Mon Sep 17 00:00:00 2001
From: Francisco Prieto <priettt@gmail.com>
Date: Thu, 18 Apr 2024 21:20:36 -0300
Subject: [PATCH] URL Connection test fixes (#774)

Removed callID logic and some other minor fixes
---
 .../http/EmbraceUrlConnectionDelegate.java    |  4 ++--
 .../http/EmbraceUrlConnectionDelegateTest.kt  | 20 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java
index c83cdd08d1..8cf7563573 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java
@@ -572,7 +572,7 @@ synchronized void internalLogNetworkCall(long startTime, long endTime) {
                 long contentLength = Math.max(0, responseSize.get());
 
                 if (inputStreamAccessException == null && lastConnectionAccessException == null && responseCode.get() != 0) {
-                    embrace.recordNetworkRequest(
+                    embrace.getInternalInterface().recordNetworkRequest(
                         EmbraceNetworkRequest.fromCompletedRequest(
                             url,
                             HttpMethod.fromString(getRequestMethod()),
@@ -602,7 +602,7 @@ synchronized void internalLogNetworkCall(long startTime, long endTime) {
                     String errorType = exceptionClass != null ? exceptionClass : "UnknownState";
                     String errorMessage = exceptionMessage != null ? exceptionMessage : "HTTP response state unknown";
 
-                    embrace.recordNetworkRequest(
+                    embrace.getInternalInterface().recordNetworkRequest(
                         EmbraceNetworkRequest.fromIncompleteRequest(
                             url,
                             HttpMethod.fromString(getRequestMethod()),
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegateTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegateTest.kt
index b7a9504ed8..e183aca8d5 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegateTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegateTest.kt
@@ -33,7 +33,6 @@ internal class EmbraceUrlConnectionDelegateTest {
 
     private lateinit var mockEmbrace: Embrace
     private lateinit var mockInternalInterface: EmbraceInternalInterface
-    private lateinit var capturedCallId: MutableList<String>
     private lateinit var capturedEmbraceNetworkRequest: CapturingSlot<EmbraceNetworkRequest>
     private var fakeTimeMs = REQUEST_TIME
     private var isSDKStarted = false
@@ -52,7 +51,6 @@ internal class EmbraceUrlConnectionDelegateTest {
         shouldCaptureNetworkBody = true
         isNetworkSpanForwardingEnabled = false
         traceIdHeaderName = CONFIG_TRACE_ID_HEADER_DEFAULT_VALUE
-        capturedCallId = mutableListOf()
         capturedEmbraceNetworkRequest = slot()
         mockInternalInterface = mockk(relaxed = true)
         every { mockInternalInterface.shouldCaptureNetworkBody(any(), any()) } answers { shouldCaptureNetworkBody }
@@ -295,12 +293,12 @@ internal class EmbraceUrlConnectionDelegateTest {
     }
 
     @Test
-    fun `completed network call logged twice with same callId with a wrapped output stream`() {
+    fun `completed network call logged once with a wrapped output stream`() {
         executeRequest(
             connection = createMockUncompressedConnection(),
             wrappedIoStream = true
         )
-        verifyTwoCallsRecordedWithSameCallId()
+        verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
     }
 
     @Test
@@ -310,7 +308,6 @@ internal class EmbraceUrlConnectionDelegateTest {
             wrappedIoStream = false
         )
         verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
-        assertTrue(capturedCallId[0].isNotBlank())
     }
 
     @Test
@@ -329,7 +326,6 @@ internal class EmbraceUrlConnectionDelegateTest {
         EmbraceUrlConnectionDelegate(mockConnection, true, mockEmbrace).disconnect()
         verifyIncompleteRequestLogged(mockConnection)
         verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
-        assertEquals(1, capturedCallId.size)
     }
 
     @Test
@@ -339,7 +335,7 @@ internal class EmbraceUrlConnectionDelegateTest {
 
         executeRequest(connection = mockConnection, wrappedIoStream = true)
         verifyIncompleteRequestLogged(mockConnection = mockConnection, errorType = TIMEOUT_ERROR, noResponseAccess = false)
-        verifyTwoCallsRecordedWithSameCallId()
+        verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
     }
 
     @Test
@@ -349,7 +345,7 @@ internal class EmbraceUrlConnectionDelegateTest {
 
         executeRequest(connection = mockConnection, wrappedIoStream = true)
         verifyIncompleteRequestLogged(mockConnection = mockConnection, errorType = TIMEOUT_ERROR, noResponseAccess = false)
-        verifyTwoCallsRecordedWithSameCallId()
+        verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
     }
 
     @Test
@@ -359,7 +355,7 @@ internal class EmbraceUrlConnectionDelegateTest {
 
         executeRequest(connection = mockConnection, wrappedIoStream = true)
         verifyIncompleteRequestLogged(mockConnection = mockConnection, errorType = TIMEOUT_ERROR, noResponseAccess = false)
-        verifyTwoCallsRecordedWithSameCallId()
+        verify(exactly = 1) { mockInternalInterface.recordNetworkRequest(any()) }
     }
 
     @Test
@@ -610,12 +606,6 @@ internal class EmbraceUrlConnectionDelegateTest {
         assertEquals(errorType, capturedEmbraceNetworkRequest.captured.errorType)
     }
 
-    private fun verifyTwoCallsRecordedWithSameCallId() {
-        verify(exactly = 2) { mockInternalInterface.recordNetworkRequest(any()) }
-        assertEquals(2, capturedCallId.size)
-        assertEquals(capturedCallId[0], capturedCallId[1])
-    }
-
     companion object {
         private fun String.toGzipByteArray(): ByteArray {
             val outputStream = ByteArrayOutputStream()