diff --git a/aws-crt-kotlin/build.gradle.kts b/aws-crt-kotlin/build.gradle.kts index 0fe1f52a..d6118488 100644 --- a/aws-crt-kotlin/build.gradle.kts +++ b/aws-crt-kotlin/build.gradle.kts @@ -198,8 +198,6 @@ if (testJavaVersion != null) { } tasks.withType { - if (this is Test) useJUnitPlatform() - testLogging { events("passed", "skipped", "failed") showStandardStreams = true diff --git a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt index f237cb81..db2af135 100644 --- a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt +++ b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt @@ -8,9 +8,6 @@ package aws.sdk.kotlin.crt.http import aws.sdk.kotlin.crt.util.Digest import aws.sdk.kotlin.crt.util.encodeToHex import kotlinx.coroutines.runBlocking -import org.junit.jupiter.api.AfterAll -import org.junit.jupiter.api.BeforeAll -import org.junit.jupiter.api.TestInstance import org.mockserver.client.MockServerClient import org.mockserver.integration.ClientAndServer import org.mockserver.model.HttpRequest.request @@ -20,19 +17,17 @@ import kotlin.test.* private val TEST_DOC_LINE = "This is a sample to prove that http downloads and uploads work." private val TEST_DOC_SHA256 = "c7fdb5314b9742467b16bd5ea2f8012190b5e2c44a005f7984f89aab58219534" -@TestInstance(TestInstance.Lifecycle.PER_CLASS) class HttpRequestResponseTest : HttpClientTest() { - lateinit var mockServer: MockServerClient lateinit var url: String - @BeforeAll + @BeforeTest fun setup() { mockServer = ClientAndServer.startClientAndServer(0) url = "http://localhost:${mockServer.port}" } - @AfterAll + @AfterTest fun tearDown() { mockServer.close() } diff --git a/build-support/build.gradle.kts b/build-support/build.gradle.kts index ca25bd95..0af73331 100644 --- a/build-support/build.gradle.kts +++ b/build-support/build.gradle.kts @@ -16,10 +16,6 @@ repositories { dependencies { compileOnly(kotlin("gradle-plugin")) compileOnly(kotlin("gradle-plugin-api")) - - testImplementation(libs.junit.jupiter) - testImplementation(libs.junit.jupiter.params) - testImplementation(libs.kotlin.test.junit5) } gradlePlugin { @@ -32,7 +28,6 @@ gradlePlugin { } tasks.test { - useJUnitPlatform() testLogging { events("passed", "skipped", "failed") showStandardStreams = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81f0362a..c71e6f67 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,6 @@ coroutines-version = "1.10.2" binary-compatibility-validator-version = "0.18.0" # testing -junit-version = "5.13.2" -kotest-version = "5.9.1" mock-server-version = "5.15.0" [libraries] @@ -18,16 +16,12 @@ aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-supp crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-java-version" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"} -kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" } kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "coroutines-version" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" } kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" } -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" } -junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" } - mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" } [plugins]