Merge pull request #665 from hexagonkt/develop

Refactor tests
hexagontk · Sep 25, 2023 · 4b0dcd0 · 4b0dcd0
2 parents 984d8af + 135cf08
commit 4b0dcd0
Show file tree

Hide file tree

Showing 127 changed files with 144 additions and 727 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -67,6 +67,8 @@ jobs:
           ref: develop
       - uses: graalvm/setup-graalvm@v1
         with:
+          java-version: 21
+          distribution: graalvm-community
           cache: gradle
       - run: ./gradlew --stacktrace nativeTest
 

diff --git a/core/src/test/kotlin/com/hexagonkt/core/AnsiTest.kt b/core/src/test/kotlin/com/hexagonkt/core/AnsiTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core
 
 import com.hexagonkt.core.logging.Logger
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 
 internal class AnsiTest {
 

diff --git a/core/src/test/kotlin/com/hexagonkt/core/CasesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/CasesTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core
 
 import com.hexagonkt.core.CasesTest.Size.X_L
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class CasesTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import java.time.LocalDate
 import kotlin.test.assertEquals

diff --git a/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt
@@ -3,7 +3,7 @@ package com.hexagonkt.core
 import com.hexagonkt.core.logging.LoggingLevel
 import com.hexagonkt.core.logging.LoggingManager
 import org.junit.jupiter.api.BeforeAll
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import java.net.MalformedURLException

diff --git a/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt b/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 
 internal class CodedExceptionTest {
 

diff --git a/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt b/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt
@@ -1,5 +1,6 @@
 package com.hexagonkt.core
 
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class DataTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.time.*
 import java.time.Month.*
 import java.util.Calendar

diff --git a/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class ExceptionsTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/GlobTest.kt b/core/src/test/kotlin/com/hexagonkt/core/GlobTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import java.util.regex.PatternSyntaxException
 import kotlin.test.assertEquals

diff --git a/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt b/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.core
 
 import org.junit.jupiter.api.condition.DisabledOnOs
 import org.junit.jupiter.api.condition.OS.WINDOWS
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class HelpersTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/HexagonCoreSamplesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/HexagonCoreSamplesTest.kt
@@ -4,7 +4,7 @@ import com.hexagonkt.core.logging.logger
 import com.hexagonkt.core.logging.Logger
 import com.hexagonkt.core.logging.LoggingLevel.*
 import com.hexagonkt.core.logging.LoggingManager
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertContains
 
 internal class HexagonCoreSamplesTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt b/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.util.Currency.getAvailableCurrencies
 import java.util.Locale.getISOCountries
 import java.util.Locale.getISOLanguages

diff --git a/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt b/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import java.net.Inet4Address
 import java.net.URI

diff --git a/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt b/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core
 
 import org.junit.jupiter.api.condition.DisabledInNativeImage
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class MapResourceBundleTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt b/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 

diff --git a/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt b/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core
 
 import java.net.ServerSocket
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.net.InetAddress
 import java.util.*
 import kotlin.test.*

diff --git a/core/src/test/kotlin/com/hexagonkt/core/StringsSamplesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/StringsSamplesTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 
 internal class StringsSamplesTest {
 

diff --git a/core/src/test/kotlin/com/hexagonkt/core/StringsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/StringsTest.kt
@@ -11,7 +11,7 @@ import java.net.URL
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 import kotlin.text.prependIndent
 import com.hexagonkt.core.StringsTest.Size.S

diff --git a/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.util.UUID
 
 internal class UuidsTest {

diff --git a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt
@@ -4,6 +4,7 @@ import com.hexagonkt.core.logging.LoggingLevel.*
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.jupiter.api.condition.DisabledInNativeImage
+import org.junit.jupiter.api.Test
 import kotlin.IllegalStateException
 import kotlin.reflect.KClass
 import kotlin.test.*

diff --git a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingManagerTest.kt b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingManagerTest.kt
@@ -6,7 +6,7 @@ import io.mockk.mockk
 import org.junit.jupiter.api.condition.DisabledInNativeImage
 import kotlin.IllegalStateException
 import kotlin.reflect.KClass
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse

diff --git a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core.logging
 
 import com.hexagonkt.core.logging.LoggingLevel.*
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.time.LocalDate
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse

diff --git a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core.media
 
 import com.hexagonkt.core.media.MediaTypeGroup.*
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith

diff --git a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.core.media
 
 import com.hexagonkt.core.media.MediaTypeGroup.*
 import com.hexagonkt.core.urlOf
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.io.File
 import java.net.URI
 import kotlin.IllegalArgumentException

diff --git a/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt b/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.core.security
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

diff --git a/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt b/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.core.security
 
 import com.hexagonkt.core.urlOf
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.DisabledOnOs
 import org.junit.jupiter.api.condition.OS.WINDOWS
 import java.io.File

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.warning.mode=all
 org.gradle.console=plain
 
 # Gradle
-version=3.2.0
+version=3.2.1
 group=com.hexagonkt
 description=The atoms of your platform
 
@@ -33,11 +33,11 @@ iconsDirectory=content
 # VERSIONS
 kotlinVersion=1.9.10
 dokkaVersion=1.9.0
-mockkVersion=1.13.7
+mockkVersion=1.13.8
 junitVersion=5.10.0
 gatlingVersion=3.9.5
 jmhVersion=1.37
-mkdocsMaterialVersion=9.3.2
+mkdocsMaterialVersion=9.4.2
 mermaidDokkaVersion=0.4.4
 nativeToolsVersion=0.9.27
 

diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.handlers
 
 import kotlin.IllegalStateException
 import kotlin.system.measureNanoTime
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertTrue

diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.handlers
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertTrue

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt
@@ -5,7 +5,7 @@ import com.hexagonkt.http.model.Header
 import com.hexagonkt.http.model.QueryParameters
 import com.hexagonkt.http.model.Headers
 import com.hexagonkt.http.model.QueryParameter
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import java.math.BigInteger
 import java.time.*
 import kotlin.test.assertContentEquals

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.http
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNull

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.http.model
 
 import com.hexagonkt.core.media.TEXT_PLAIN
 import com.hexagonkt.http.parseContentType
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalStateException
 import java.nio.charset.Charset
 import java.nio.charset.UnsupportedCharsetException

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import org.junit.jupiter.api.Assertions.assertFalse
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import com.hexagonkt.core.require
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class FormParametersTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import com.hexagonkt.core.require
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class HeadersTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt
@@ -4,7 +4,7 @@ import com.hexagonkt.core.media.TEXT_HTML
 import com.hexagonkt.core.media.TEXT_PLAIN
 import com.hexagonkt.http.model.HttpMethod.*
 import com.hexagonkt.http.model.HttpProtocol.HTTPS
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.http.model
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class HttpFieldTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.http.model
 
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class HttpMethodTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt
@@ -3,7 +3,7 @@ package com.hexagonkt.http.model
 import com.hexagonkt.core.media.MediaTypeGroup.TEXT
 import com.hexagonkt.core.media.MediaType
 import com.hexagonkt.core.media.TEXT_HTML
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import com.hexagonkt.http.model.HttpProtocol.*
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class HttpProtocolTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt
@@ -11,6 +11,7 @@ import com.hexagonkt.http.model.HttpMethod.POST
 import com.hexagonkt.http.model.HttpMethod.PUT
 import com.hexagonkt.http.model.HttpProtocol.*
 import java.security.cert.X509Certificate
+import org.junit.jupiter.api.Test
 import kotlin.test.*
 
 internal class HttpRequestTest {

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.http.model
 
 import com.hexagonkt.core.media.TEXT_HTML
 import com.hexagonkt.core.media.TEXT_RICHTEXT
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import com.hexagonkt.http.model.HttpStatusType.*
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.IllegalArgumentException
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith

diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt
@@ -1,7 +1,7 @@
 package com.hexagonkt.http.model
 
 import com.hexagonkt.http.model.HttpStatusType.*
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class HttpStatusesTest {