Add more tests

dmitrysulman · dmitrysulman · commit 7e8cc41ed844 · 2025-05-09T17:38:22.000+03:00
Signed-off-by: Dmitry Sulman &lt;dmitry.sulman@gmail.com&gt;
diff --git a/logback-access-reactor-netty/build.gradle.kts b/logback-access-reactor-netty/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
 
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.kotest.assertions.core.jvm)
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
     testImplementation(libs.logback.classic)
     testImplementation(libs.logback.core)
     testImplementation(libs.mockk)
diff --git a/logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEvent.kt b/logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEvent.kt
@@ -114,13 +114,24 @@ class AccessEvent(
         argProvider
             .requestHeaderIterator()
             ?.asSequence()
-            ?.associate { it.key.toString() to it.value.toString() }
+            ?.mapNotNull { (name, value) ->
+                if (name.isNullOrEmpty()) return@mapNotNull null
+                if (value == null) return@mapNotNull null
+                name.toString() to value.toString()
+            }?.toMap()
             ?: emptyMap()
     }
 
     @Transient
     private val _serverAdapter = ReactorNettyServerAdapter(argProvider)
 
+    private fun String.decodeCatching() =
+        try {
+            URLDecoder.decode(this, StandardCharsets.UTF_8)
+        } catch (_: Exception) {
+            this
+        }
+
     override fun prepareForDeferredProcessing() {
         requestURI
         requestURL
@@ -211,7 +222,7 @@ class AccessEvent(
 
     override fun getResponseHeader(key: String) = _responseHeaderMap[key] ?: NA
 
-    override fun getResponseHeaderMap(): Map<String, String> = _responseHeaderMap
+    override fun getResponseHeaderMap() = _responseHeaderMap
 
     override fun getResponseHeaderNameList() = _responseHeaderMap.keys.toList()
 
@@ -222,11 +233,4 @@ class AccessEvent(
 
         private val NA_ARRAY = arrayOf(NA)
     }
-
-    private fun String.decodeCatching(): String =
-        try {
-            URLDecoder.decode(this, StandardCharsets.UTF_8)
-        } catch (_: Exception) {
-            this
-        }
 }
diff --git a/logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapter.kt b/logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapter.kt
@@ -16,6 +16,10 @@ class ReactorNettyServerAdapter(
         argProvider
             .responseHeaderIterator()
             ?.asSequence()
-            ?.associate { it.key.toString() to it.value.toString() }
+            ?.mapNotNull { (name, value) ->
+                if (name.isNullOrEmpty()) return@mapNotNull null
+                if (value == null) return@mapNotNull null
+                name.toString() to value.toString()
+            }?.toMap()
             ?: emptyMap()
 }
diff --git a/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEventTests.kt b/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEventTests.kt
@@ -20,7 +20,6 @@ import java.net.SocketAddress
 import java.util.Collections
 import io.netty.handler.codec.http.cookie.Cookie as NettyCookie
 
-// TODO request/response headers
 class AccessEventTests {
     @Test
     fun `test basic properties`() {
@@ -316,6 +315,10 @@ class AccessEventTests {
         accessEvent.remoteUser shouldBe NA
         accessEvent.getRequestHeader(HEADER) shouldBe NA
         accessEvent.getResponseHeader(HEADER) shouldBe NA
+        accessEvent.requestHeaderMap.isEmpty() shouldBe true
+        accessEvent.requestHeaderNames.hasMoreElements() shouldBe false
+        accessEvent.responseHeaderMap.isEmpty() shouldBe true
+        accessEvent.responseHeaderNameList.isEmpty() shouldBe true
         accessEvent.getCookie(COOKIE) shouldBe NA
     }
 
@@ -378,6 +381,45 @@ class AccessEventTests {
         accessEvent.getCookie("   ") shouldBe NA
     }
 
+    @Test
+    fun `test request headers`() {
+        val mockContext = mockk<AccessContext>(relaxed = true)
+        val mockArgProvider = mockk<AccessLogArgProvider>(relaxed = true)
+        every { mockArgProvider.requestHeaderIterator() } returns headerListIterator()
+
+        val accessEvent = AccessEvent(mockArgProvider, mockContext)
+
+        accessEvent.requestHeaderMap shouldBe
+            mapOf(
+                "name1" to "value1",
+                "name2" to "value2",
+                "empty_value" to "",
+            )
+        accessEvent.requestHeaderNames
+            .asIterator()
+            .asSequence()
+            .toList() shouldBe
+            listOf("name1", "name2", "empty_value")
+    }
+
+    @Test
+    fun `test response headers`() {
+        val mockContext = mockk<AccessContext>(relaxed = true)
+        val mockArgProvider = mockk<AccessLogArgProvider>(relaxed = true)
+        every { mockArgProvider.responseHeaderIterator() } returns headerListIterator()
+
+        val accessEvent = AccessEvent(mockArgProvider, mockContext)
+
+        accessEvent.responseHeaderMap shouldBe
+            mapOf(
+                "name1" to "value1",
+                "name2" to "value2",
+                "empty_value" to "",
+            )
+        accessEvent.responseHeaderNameList shouldBe
+            listOf("name1", "name2", "empty_value")
+    }
+
     @Test
     fun `test serialization`() {
         val mockContext = mockk<AccessContext>(relaxed = true)
@@ -422,6 +464,7 @@ class AccessEventTests {
         accessEvent.getRequestHeader(HEADER) shouldBe NA
         accessEvent.getResponseHeader(HEADER) shouldBe NA
         accessEvent.requestHeaderMap.isEmpty() shouldBe true
+        accessEvent.requestHeaderNames.hasMoreElements() shouldBe false
         accessEvent.responseHeaderMap.isEmpty() shouldBe true
         accessEvent.responseHeaderNameList.isEmpty() shouldBe true
         accessEvent.cookies.isEmpty() shouldBe true
diff --git a/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapterTests.kt b/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapterTests.kt
@@ -16,20 +16,19 @@ class ReactorNettyServerAdapterTests {
         every { mockArgProvider.accessDateTime() } returns ZonedDateTime.ofInstant(Instant.ofEpochMilli(1746734856000), ZoneId.of("UTC"))
         every { mockArgProvider.contentLength() } returns 100
         every { mockArgProvider.status() } returns "200"
-        every { mockArgProvider.responseHeaderIterator() } returns
-            listOf(
-                object : Map.Entry<CharSequence, CharSequence> {
-                    override val key = "key"
-                    override val value = "value"
-                },
-            ).iterator()
+        every { mockArgProvider.responseHeaderIterator() } returns headerListIterator()
 
         val reactorNettyServerAdapter = ReactorNettyServerAdapter(mockArgProvider)
 
         reactorNettyServerAdapter.requestTimestamp shouldBe 1746734856000
         reactorNettyServerAdapter.contentLength shouldBe 100
         reactorNettyServerAdapter.statusCode shouldBe 200
-        reactorNettyServerAdapter.buildResponseHeaderMap() shouldBe mapOf("key" to "value")
+        reactorNettyServerAdapter.buildResponseHeaderMap() shouldBe
+            mapOf(
+                "name1" to "value1",
+                "name2" to "value2",
+                "empty_value" to "",
+            )
     }
 
     @Test
diff --git a/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/TestsHelper.kt b/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/TestsHelper.kt
@@ -0,0 +1,31 @@
+package io.github.dmitrysulman.logback.access.reactor.netty
+
+val headerList =
+    listOf(
+        object : Map.Entry<CharSequence, CharSequence> {
+            override val key = "name1"
+            override val value = "value1"
+        },
+        object : Map.Entry<CharSequence, CharSequence> {
+            override val key = "name2"
+            override val value = "value2"
+        },
+        object : Map.Entry<CharSequence, CharSequence> {
+            override val key = ""
+            override val value = "empty_name"
+        },
+        object : Map.Entry<CharSequence?, CharSequence> {
+            override val key = null
+            override val value = "null_name"
+        },
+        object : Map.Entry<CharSequence, CharSequence> {
+            override val key = "empty_value"
+            override val value = ""
+        },
+        object : Map.Entry<CharSequence, CharSequence?> {
+            override val key = "null_value"
+            override val value = null
+        },
+    )
+
+fun headerListIterator() = headerList.iterator()
diff --git a/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/integration/IntegrationTests.kt b/logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/integration/IntegrationTests.kt
@@ -3,11 +3,20 @@ package io.github.dmitrysulman.logback.access.reactor.netty.integration
 import ch.qos.logback.access.common.joran.JoranConfigurator
 import ch.qos.logback.access.common.spi.IAccessEvent
 import io.github.dmitrysulman.logback.access.reactor.netty.ReactorNettyAccessLogFactory
+import io.kotest.assertions.nondeterministic.eventually
+import io.kotest.matchers.collections.shouldBeSorted
+import io.kotest.matchers.collections.shouldBeUnique
 import io.kotest.matchers.comparables.shouldBeGreaterThan
+import io.kotest.matchers.longs.shouldBeGreaterThanOrEqual
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH
 import io.netty.handler.codec.http.cookie.DefaultCookie
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -20,13 +29,11 @@ import java.net.InetSocketAddress
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toJavaDuration
 
-// TODO sequence number
 // TODO filters
-// TODO Performance test
 class IntegrationTests {
     private lateinit var server: DisposableServer
     private lateinit var eventCaptureAppender: EventCaptureAppender
-    private var now: Long = 0
+    private var now = 0L
 
     @BeforeEach
     fun setUp() {
@@ -40,22 +47,71 @@ class IntegrationTests {
     }
 
     @Test
-    fun `test basic request`() {
-        val accessLogFactory =
-            ReactorNettyAccessLogFactory("logback-access-stdout.xml", JoranConfigurator(), true)
-                .apply {
-                    accessContext.addAppender(eventCaptureAppender)
-                }
+    fun `test basic request`(): Unit =
+        runBlocking {
+            val accessLogFactory =
+                ReactorNettyAccessLogFactory("logback-access-stdout.xml", JoranConfigurator(), true)
+                    .apply {
+                        accessContext.addAppender(eventCaptureAppender)
+                    }
 
-        server = createServer(accessLogFactory, "mock response")
-        val response = performGetRequest("/test?name=value")
-        response.shouldNotBeNull()
+            server = createServer(accessLogFactory, "mock response")
+            val response = performGetRequest("/test?name=value")
+            response.shouldNotBeNull()
 
-        Thread.sleep(100)
-        eventCaptureAppender.list.size shouldBe 1
-        val accessEvent = eventCaptureAppender.list[0]
-        assertAccessEvent(accessEvent, response)
-    }
+            eventually(1.seconds) {
+                eventCaptureAppender.list.size shouldBe 1
+                val accessEvent = eventCaptureAppender.list[0]
+                accessEvent.sequenceNumber shouldBe 0
+                assertAccessEvent(accessEvent, response)
+            }
+        }
+
+    @Test
+    fun `test sequence number generator`(): Unit =
+        runBlocking {
+            val accessLogFactory =
+                ReactorNettyAccessLogFactory("logback-access-sequence-number-generator.xml", JoranConfigurator(), true)
+                    .apply {
+                        accessContext.addAppender(eventCaptureAppender)
+                    }
+
+            server = createServer(accessLogFactory, "")
+
+            repeat(500) {
+                performGetRequest("/test")
+            }
+
+            eventually(1.seconds) {
+                eventCaptureAppender.list.size shouldBe 500
+                eventCaptureAppender.list
+                    .sortedBy { it.timeStamp }
+                    .map { it.sequenceNumber }
+                    .shouldBeUnique()
+                    .shouldBeSorted()
+            }
+        }
+
+    @Test
+    fun `performance test`(): Unit =
+        runBlocking {
+            val accessLogFactory =
+                ReactorNettyAccessLogFactory("logback-access-sequence-number-generator.xml", JoranConfigurator(), true)
+                    .apply {
+                        accessContext.addAppender(eventCaptureAppender)
+                    }
+
+            server = createServer(accessLogFactory, "test")
+
+            val jobs =
+                (1..4000).map {
+                    CoroutineScope(Dispatchers.Default).launch {
+                        performGetRequest("/test")
+                    }
+                }
+            jobs.joinAll()
+            eventually(5.seconds) { eventCaptureAppender.list.size shouldBe jobs.size }
+        }
 
     private fun assertAccessEvent(
         accessEvent: IAccessEvent,
@@ -71,9 +127,8 @@ class IntegrationTests {
         accessEvent.protocol shouldBe response.version().text()
         accessEvent.method shouldBe response.method().name()
         accessEvent.statusCode shouldBe response.status().code()
-        accessEvent.elapsedTime shouldBeGreaterThan 0
+        accessEvent.elapsedTime shouldBeGreaterThanOrEqual 0
         accessEvent.timeStamp shouldBeGreaterThan now
-        accessEvent.sequenceNumber shouldBe 0
         accessEvent.remoteUser shouldBe "-"
         accessEvent.getRequestHeader(TEST_REQUEST_HEADER_NAME) shouldBe TEST_REQUEST_HEADER_VALUE
         accessEvent.getResponseHeader(TEST_RESPONSE_HEADER_NAME) shouldBe TEST_RESPONSE_HEADER_VALUE
diff --git a/logback-access-reactor-netty/src/test/resources/logback-access-sequence-number-generator.xml b/logback-access-reactor-netty/src/test/resources/logback-access-sequence-number-generator.xml
@@ -0,0 +1,3 @@
+<configuration>
+    <sequenceNumberGenerator class="ch.qos.logback.core.spi.BasicSequenceNumberGenerator"/>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<configuration>`
	`2`	`+ <sequenceNumberGenerator class="ch.qos.logback.core.spi.BasicSequenceNumberGenerator"/>`
	`3`	`+</configuration>`