[kotlin] Add integration test for query params

bin/utils/test_file_list.yaml

@@ -62,3 +62,7 @@
   sha256: b2093528aac971193f2863a70f46eea45cf8bda79120b133a614599e80d8b46d
 - filename: "samples/server/petstore/rust-axum/output/openapi-v3/tests/oneof_untagged.rs"
   sha256: 1d3fb01f65e98290b1d3eece28014c7d3e3f2fdf18e7110249d3c591cc4642ab
+- filename: "samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt"
+  sha256: 82a6be39c1ed3dada96dfa1833a6709834cb3f9f9d50a19cbd9d49699e46df4f
+- filename: "samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt"
+  sha256: bc64fb94857a3598e1332f1278307c3078ea9ec4b4aa75690e6eda86e9729a8d

modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

@@ -108,14 +108,16 @@ kotlin {
     explicitApi()
 }
 {{/explicitApi}}
-{{#jvm-spring-webclient}}{{#useSpringBoot3}}
+{{#jvm-spring-webclient}}
+{{#useSpringBoot3}}
 
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
-{{/useSpringBoot3}}{{/jvm-spring-webclient}}
+{{/useSpringBoot3}}
+{{/jvm-spring-webclient}}
 {{#jvm-spring-restclient}}
 
 kotlin {
@@ -219,7 +221,6 @@ dependencies {
     {{/jackson}}
     implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
     {{/jvm-retrofit2}}
-    testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
     {{#jvm-vertx}}
     implementation "io.vertx:vertx-web-client:$vertx_version"
     implementation "io.vertx:vertx-core:$vertx_version"
@@ -229,6 +230,10 @@ dependencies {
     implementation "io.vertx:vertx-lang-kotlin-coroutines:$vertx_version"
     {{/useCoroutines}}
     {{/jvm-vertx}}
+    testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
+    {{#jvm-spring}}
+    testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version"
+    {{/jvm-spring}}
 }
 {{#kotlinx_serialization}}
 

samples/client/echo_api/kotlin-jvm-okhttp/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/echo_api/kotlin-jvm-spring-3-restclient/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -67,6 +66,7 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0"
     implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version"
     testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
+    testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version"
 }
 
 java {

samples/client/echo_api/kotlin-jvm-spring-3-webclient/build.gradle

@@ -53,14 +53,12 @@ test {
     useJUnitPlatform()
 }
 
-
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
@@ -69,6 +67,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
     implementation "io.projectreactor:reactor-core:3.7.11"
     testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
+    testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version"
 }
 
 java {

samples/client/echo_api/kotlin-model-prefix-type-mappings/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"

samples/client/others/kotlin-integer-enum/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/others/kotlin-jvm-okhttp-parameter-tests/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/others/kotlin-jvm-okhttp-path-comments/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/build.gradle

@@ -55,7 +55,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"

samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle

@@ -54,7 +54,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"

samples/client/petstore/kotlin-allOf-discriminator/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-array-integer-enum/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-enum-default-value/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-explicit/build.gradle

@@ -56,7 +56,6 @@ kotlin {
     explicitApi()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-gson/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "com.google.code.gson:gson:2.13.2"

samples/client/petstore/kotlin-jackson/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-json-request-string/build.gradle

@@ -55,7 +55,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"

samples/client/petstore/kotlin-jvm-jackson/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "com.google.code.gson:gson:2.13.2"

samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle

@@ -55,7 +55,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"

samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

@@ -52,7 +52,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"

samples/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"

samples/client/petstore/kotlin-jvm-spring-2-webclient/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
@@ -62,6 +61,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
     implementation "io.projectreactor:reactor-core:3.7.11"
     testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
+    testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version"
 }
 
 java {

samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle

@@ -53,7 +53,6 @@ test {
     useJUnitPlatform()
 }
 
-
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -67,6 +66,7 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0"
     implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version"
     testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
+    testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version"
 }
 
 java {

samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt

@@ -0,0 +1,35 @@
+package org.openapitools.integration
+
+import io.kotlintest.matchers.collections.shouldHaveSize
+import io.kotlintest.specs.ShouldSpec
+import org.openapitools.client.apis.PetApi
+import org.springframework.boot.test.web.client.MockServerRestClientCustomizer
+import org.springframework.http.HttpMethod
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.test.web.client.match.MockRestRequestMatchers.method
+import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
+import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess
+import org.springframework.web.client.RestClient
+
+class PetApiTest : ShouldSpec() {
+    init {
+        should("find by status passing a query parameter with a list of values") {
+            val restClientBuilder: RestClient.Builder = RestClient.builder()
+            val mockServer = MockServerRestClientCustomizer().let {
+                it.customize(restClientBuilder)
+                it.getServer(restClientBuilder)
+            }
+            val petApi = PetApi(restClientBuilder.build())
+
+            mockServer.expect(requestTo("/pet/findByStatus?status=pending,available"))
+                .andExpect(method(HttpMethod.GET))
+                .andRespond(withSuccess("[]", APPLICATION_JSON))
+
+            val response = petApi.findPetsByStatus(listOf(PetApi.StatusFindPetsByStatus.pending, PetApi.StatusFindPetsByStatus.available))
+
+            mockServer.verify()
+
+            response shouldHaveSize 0
+        }
+    }
+}

samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt

@@ -0,0 +1,35 @@
+package org.openapitools.integration
+
+import io.kotlintest.shouldBe
+import io.kotlintest.specs.ShouldSpec
+import org.openapitools.client.apis.UserApi
+import org.springframework.boot.test.web.client.MockServerRestClientCustomizer
+import org.springframework.http.HttpMethod
+import org.springframework.http.MediaType.TEXT_PLAIN
+import org.springframework.test.web.client.match.MockRestRequestMatchers.method
+import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
+import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess
+import org.springframework.web.client.RestClient
+
+class UserApiTest : ShouldSpec() {
+    init {
+        should("call login user passing a query parameter with a single value") {
+            val restClientBuilder: RestClient.Builder = RestClient.builder()
+            val mockServer = MockServerRestClientCustomizer().let {
+                it.customize(restClientBuilder)
+                it.getServer(restClientBuilder)
+            }
+            val userApi = UserApi(restClientBuilder.build())
+
+            mockServer.expect(requestTo("/user/login?username=myUsername&password=myPassword"))
+                .andExpect(method(HttpMethod.GET))
+                .andRespond(withSuccess("login response", TEXT_PLAIN))
+
+            val response = userApi.loginUser("myUsername", "myPassword")
+
+            mockServer.verify()
+
+            response shouldBe "login response"
+        }
+    }
+}