funcodingdev
diff --git a/‎sentry-apache-http-client-5/src/test/kotlin/io/sentry/transport/apache/ApacheHttpClientTransportTest.kt‎
Lines changed: 16 additions & 8 deletions b/‎sentry-apache-http-client-5/src/test/kotlin/io/sentry/transport/apache/ApacheHttpClientTransportTest.kt‎
Lines changed: 16 additions & 8 deletions
diff --git a/‎sentry/src/test/java/io/sentry/transport/StdoutTransportTest.kt‎
Lines changed: 1 addition & 1 deletion b/‎sentry/src/test/java/io/sentry/transport/StdoutTransportTest.kt‎
Lines changed: 1 addition & 1 deletion
@@ -18,6 +18,8 @@ import io.sentry.SentryOptions
 import io.sentry.transport.RateLimiter
 import io.sentry.transport.ReusableCountLatch
 import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Executors
+import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse
@@ -34,6 +36,7 @@ class ApacheHttpClientTransportTest {
         val requestDetails = RequestDetails("http://key@localhost/proj", mapOf("header-name" to "header-value"))
         val client = mock<CloseableHttpAsyncClient>()
         val currentlyRunning = spy<ReusableCountLatch>()
+        val executorService = Executors.newFixedThreadPool(2)
 
         init {
             whenever(rateLimiter.filter(any(), anyOrNull())).thenAnswer { it.arguments[0] }
@@ -64,6 +67,11 @@ class ApacheHttpClientTransportTest {
 
     private val fixture = Fixture()
 
+    @AfterTest
+    fun `shutdown executor`() {
+        fixture.executorService.shutdownNow()
+    }
+
     @Test
     fun `updates retry on rate limiter`() {
         val response = SimpleHttpResponse(200)
@@ -113,7 +121,7 @@ class ApacheHttpClientTransportTest {
     fun `flush waits till all requests are finished`() {
         val sut = fixture.getSut()
         whenever(fixture.client.execute(any(), any())).then {
-            CompletableFuture.runAsync {
+            fixture.executorService.submit {
                 Thread.sleep(5)
                 (it.arguments[1] as FutureCallback<SimpleHttpResponse>).completed(SimpleHttpResponse(200))
             }
@@ -131,7 +139,7 @@ class ApacheHttpClientTransportTest {
     fun `keeps sending events after flush`() {
         val sut = fixture.getSut()
         whenever(fixture.client.execute(any(), any())).then {
-            CompletableFuture.runAsync {
+            fixture.executorService.submit {
                 Thread.sleep(5)
                 (it.arguments[1] as FutureCallback<SimpleHttpResponse>).completed(SimpleHttpResponse(200))
             }
@@ -150,22 +158,22 @@ class ApacheHttpClientTransportTest {
     fun `logs warning when flush timeout was lower than time needed to execute all events`() {
         val sut = fixture.getSut()
         whenever(fixture.client.execute(any(), any())).then {
-            CompletableFuture.runAsync {
-                Thread.sleep(100)
+            fixture.executorService.submit {
+                Thread.sleep(1000)
                 (it.arguments[1] as FutureCallback<SimpleHttpResponse>).completed(SimpleHttpResponse(200))
             }
         }.then {
-            CompletableFuture.runAsync {
-                Thread.sleep(5)
+            fixture.executorService.submit {
+                Thread.sleep(20)
                 (it.arguments[1] as FutureCallback<SimpleHttpResponse>).completed(SimpleHttpResponse(200))
             }
         }
         sut.send(SentryEnvelope.from(fixture.options.serializer, SentryEvent(), null))
         sut.send(SentryEnvelope.from(fixture.options.serializer, SentryEvent(), null))
 
-        sut.flush(10)
+        sut.flush(200)
 
+        verify(fixture.logger).log(SentryLevel.WARNING, "Failed to flush all events within %s ms", 200L)
         verify(fixture.currentlyRunning, times(1)).decrement()
-        verify(fixture.logger).log(SentryLevel.WARNING, "Failed to flush all events within %s ms", 10L)
     }
 }
@@ -26,7 +26,7 @@ class StdoutTransportTest {
         val event = SentryEvent()
         val envelope = SentryEnvelope.from(fixture.serializer, event, null)
 
-        val result = transport.send(envelope)
+        transport.send(envelope)
 
         verify(fixture.serializer).serialize(eq(envelope), any())
     }
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class StdoutTransportTest {`
`26`	`26`	`val event = SentryEvent()`
`27`	`27`	`val envelope = SentryEnvelope.from(fixture.serializer, event, null)`
`28`	`28`
`29`		`- val result = transport.send(envelope)`
	`29`	`+ transport.send(envelope)`
`30`	`30`
`31`	`31`	`verify(fixture.serializer).serialize(eq(envelope), any())`
`32`	`32`	`}`