Skip to content

Commit

Permalink
Micronaut 4.3.1. Update libs. Enable some kotlin tests (#1396)
Browse files Browse the repository at this point in the history 
Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
  • Loading branch information
@altro3 @sdelamo
altro3 and sdelamo committed Jan 25, 2024
1 parent 6d5fb88 commit 03ea986
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 44 deletions.
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ micronaut-data = "4.5.0"
micronaut-test = "4.2.0"
micronaut-kotlin = "4.2.0"
micronaut-logging = "1.2.2"
micronaut-docs = "2.0.0"

[libraries]
# Core
Expand Down
8 changes: 4 additions & 4 deletions ...t-server-generator/src/main/kotlin/io/micronaut/openapi/test/api/RequestBodyController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ open class RequestBodyController : RequestBodyApi {
return Mono.empty()
}

override fun sendListOfSimpleModels(simpleModel: List<SimpleModel>?): Mono<List<SimpleModel>> {
return Mono.just(simpleModel!!)
override fun sendListOfSimpleModels(simpleModels: List<SimpleModel>?): Mono<List<SimpleModel>> {
return Mono.just(simpleModels!!)
}

override fun sendModelWithRequiredProperties(modelWithRequiredProperties: ModelWithRequiredProperties?): Mono<ModelWithRequiredProperties> {
Expand All @@ -40,8 +40,8 @@ open class RequestBodyController : RequestBodyApi {
return Mono.just(fromValue(body.replace("\"", "")))
}

override fun sendEnumList(colorEnum: List<ColorEnum>): Mono<List<ColorEnum>> {
return Mono.just(colorEnum)
override fun sendEnumList(colorEnums: List<ColorEnum>): Mono<List<ColorEnum>> {
return Mono.just(colorEnums)
}

override fun sendModelWithMapProperty(modelWithMapProperty: ModelWithMapProperty): Mono<ModelWithMapProperty> {
Expand Down
34 changes: 16 additions & 18 deletions ...rver-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import java.util.stream.Stream

@MicronautTest
class RequestBodyControllerTest(
var server: EmbeddedServer,
@Client("/api")
var reactiveClient: HttpClient,
var server: EmbeddedServer,
@Client("/api")
var reactiveClient: HttpClient,
) {

lateinit var client: BlockingHttpClient
Expand Down Expand Up @@ -61,12 +61,10 @@ class RequestBodyControllerTest(
assertEquals(model, response)
}

@Disabled
@MethodSource("models")
@ParameterizedTest
fun testSendValidatedSimpleModel(model: SimpleModel, message: String?) {
val request = HttpRequest.POST("/sendSimpleModel", model)
client.retrieve(request, Argument.of(SimpleModel::class.java), Argument.of(String::class.java))
val e = assertThrows(HttpClientResponseException::class.java) {
client.retrieve(request, Argument.of(String::class.java), Argument.of(String::class.java))
}
Expand Down Expand Up @@ -193,8 +191,8 @@ class RequestBodyControllerTest(
fun testSendModelWithDeepMapModelProperty() {
val model = ModelWithMapProperty(deepObjectMap = mapOf(
"polygons" to mapOf(
"triangle" to SimpleModel(numEdges = 3L),
"smallRectangle" to SimpleModel(numEdges = 4L, area = 1F)
"triangle" to SimpleModel(numEdges = 3L),
"smallRectangle" to SimpleModel(numEdges = 4L, area = 1F)
)
))
val request = HttpRequest.POST("/sendModelWithMapProperty", model)
Expand Down Expand Up @@ -244,26 +242,26 @@ class RequestBodyControllerTest(
@JvmStatic
fun models(): Stream<Arguments> =
Stream.of(
arguments(SimpleModel(color = "1"), "simpleModel.color: size must be between 2 and 2147483647"),
arguments(SimpleModel(numEdges = 0L), "simpleModel.numEdges: must be greater than or equal to 1"),
arguments(SimpleModel(area = 0f), "simpleModel.area: must be greater than or equal to 0"),
arguments(SimpleModel(points = listOf("0,0")), "simpleModel.points: size must be between 3 and 2147483647")
arguments(SimpleModel(color = "1"), "simpleModel.color: size must be between 2 and 2147483647"),
arguments(SimpleModel(numEdges = 0L), "simpleModel.numEdges: must be greater than or equal to 1"),
arguments(SimpleModel(area = 0f), "simpleModel.area: must be greater than or equal to 0"),
arguments(SimpleModel(points = listOf("0,0")), "simpleModel.points: size must be between 3 and 2147483647")
)

@JvmStatic
fun models2(): Stream<Arguments> =
Stream.of(
arguments(ModelWithValidatedListProperty(stringList = listOf("one", "two", "")), "model.stringList[2]: size must be between 3 and 2147483647"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(numEdges = 0L))), "model.objectList[1].numEdges: must be greater than or equal to 1"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(), SimpleModel())), "model.objectList: size must be between 0 and 2")
arguments(ModelWithValidatedListProperty(stringList = listOf("one", "two", "")), "modelWithValidatedListProperty.stringList[2]: size must be between 3 and 2147483647"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(numEdges = 0L))), "modelWithValidatedListProperty.objectList[1].numEdges: must be greater than or equal to 1"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(), SimpleModel())), "modelWithValidatedListProperty.objectList: size must be between 0 and 2")
)

@JvmStatic
fun models3(): Stream<Arguments> =
Stream.of(
arguments(ModelWithMapProperty(deepMap = mapOf("first" to mapOf("second" to "aa", "third" to "a"))), "model.deepMap[first][third]: size must be between 2 and 2147483647"),
arguments(ModelWithMapProperty(deepObjectMap = mapOf("first" to mapOf("second" to SimpleModel(color = "a")))), "model.deepObjectMap[first][second].color: size must be between 2 and 2147483647")
)
Stream.of(
arguments(ModelWithMapProperty(deepMap = mapOf("first" to mapOf("second" to "aa", "third" to "a"))), "model.deepMap[first][third]: size must be between 2 and 2147483647"),
arguments(ModelWithMapProperty(deepObjectMap = mapOf("first" to mapOf("second" to SimpleModel(color = "a")))), "model.deepObjectMap[first][second].color: size must be between 2 and 2147483647")
)

@JvmStatic
fun discriminators(): Stream<Arguments> {
Expand Down
4 changes: 2 additions & 2 deletions ...p-server-generator/src/main/kotlin/io/micronaut/openapi/test/api/RequestBodyController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ open class RequestBodyController : RequestBodyApi {
return Mono.empty()
}

override fun sendListOfSimpleModels(simpleModel: List<SimpleModel>?): Mono<List<SimpleModel>> {
return Mono.just(simpleModel!!)
override fun sendListOfSimpleModels(simpleModels: List<SimpleModel>?): Mono<List<SimpleModel>> {
return Mono.just(simpleModels!!)
}

override fun sendModelWithRequiredProperties(modelWithRequiredProperties: ModelWithRequiredProperties?): Mono<ModelWithRequiredProperties> {
Expand Down
36 changes: 16 additions & 20 deletions ...rver-generator/src/test/kotlin/io/micronaut/openapi/test/api/RequestBodyControllerTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import java.util.stream.Stream

@MicronautTest
class RequestBodyControllerTest(
var server: EmbeddedServer,
@Client("/api")
var reactiveClient: HttpClient,
var server: EmbeddedServer,
@Client("/api")
var reactiveClient: HttpClient,
) {

lateinit var client: BlockingHttpClient
Expand Down Expand Up @@ -61,12 +61,10 @@ class RequestBodyControllerTest(
assertEquals(model, response)
}

@Disabled
@MethodSource("models")
@ParameterizedTest
fun testSendValidatedSimpleModel(model: SimpleModel, message: String?) {
val request = HttpRequest.POST("/sendSimpleModel", model)
client.retrieve(request, Argument.of(SimpleModel::class.java), Argument.of(String::class.java))
val e = assertThrows(HttpClientResponseException::class.java) {
client.retrieve(request, Argument.of(String::class.java), Argument.of(String::class.java))
}
Expand Down Expand Up @@ -160,7 +158,6 @@ class RequestBodyControllerTest(
assertEquals(model, response)
}

@Disabled
@MethodSource("models2")
@ParameterizedTest
fun testSendModelWithValidatedListProperty(model: ModelWithValidatedListProperty, messageContent: String?) {
Expand All @@ -180,7 +177,6 @@ class RequestBodyControllerTest(
assertEquals(model, response)
}

@Disabled
@MethodSource("models3")
@ParameterizedTest
fun testSendModelWithValidatedDeepMapProperty(model: ModelWithMapProperty, messageContent: String) {
Expand All @@ -193,8 +189,8 @@ class RequestBodyControllerTest(
fun testSendModelWithDeepMapModelProperty() {
val model = ModelWithMapProperty(deepObjectMap = mapOf(
"polygons" to mapOf(
"triangle" to SimpleModel(numEdges = 3L),
"smallRectangle" to SimpleModel(numEdges = 4L, area = 1F)
"triangle" to SimpleModel(numEdges = 3L),
"smallRectangle" to SimpleModel(numEdges = 4L, area = 1F)
)
))
val request = HttpRequest.POST("/sendModelWithMapProperty", model)
Expand Down Expand Up @@ -244,26 +240,26 @@ class RequestBodyControllerTest(
@JvmStatic
fun models(): Stream<Arguments> =
Stream.of(
arguments(SimpleModel(color = "1"), "simpleModel.color: size must be between 2 and 2147483647"),
arguments(SimpleModel(numEdges = 0L), "simpleModel.numEdges: must be greater than or equal to 1"),
arguments(SimpleModel(area = 0f), "simpleModel.area: must be greater than or equal to 0"),
arguments(SimpleModel(points = listOf("0,0")), "simpleModel.points: size must be between 3 and 2147483647")
arguments(SimpleModel(color = "1"), "simpleModel.color: size must be between 2 and 2147483647"),
arguments(SimpleModel(numEdges = 0L), "simpleModel.numEdges: must be greater than or equal to 1"),
arguments(SimpleModel(area = 0f), "simpleModel.area: must be greater than or equal to 0"),
arguments(SimpleModel(points = listOf("0,0")), "simpleModel.points: size must be between 3 and 2147483647")
)

@JvmStatic
fun models2(): Stream<Arguments> =
Stream.of(
arguments(ModelWithValidatedListProperty(stringList = listOf("one", "two", "")), "model.stringList[2]: size must be between 3 and 2147483647"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(numEdges = 0L))), "model.objectList[1].numEdges: must be greater than or equal to 1"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(), SimpleModel())), "model.objectList: size must be between 0 and 2")
arguments(ModelWithValidatedListProperty(stringList = listOf("one", "two", "")), "modelWithValidatedListProperty.stringList[2]: size must be between 3 and 2147483647"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(numEdges = 0L))), "modelWithValidatedListProperty.objectList[1].numEdges: must be greater than or equal to 1"),
arguments(ModelWithValidatedListProperty(objectList = listOf(SimpleModel(), SimpleModel(), SimpleModel())), "modelWithValidatedListProperty.objectList: size must be between 0 and 2")
)

@JvmStatic
fun models3(): Stream<Arguments> =
Stream.of(
arguments(ModelWithMapProperty(deepMap = mapOf("first" to mapOf("second" to "aa", "third" to "a"))), "model.deepMap[first][third]: size must be between 2 and 2147483647"),
arguments(ModelWithMapProperty(deepObjectMap = mapOf("first" to mapOf("second" to SimpleModel(color = "a")))), "model.deepObjectMap[first][second].color: size must be between 2 and 2147483647")
)
Stream.of(
arguments(ModelWithMapProperty(deepMap = mapOf("first" to mapOf("second" to "aa", "third" to "a"))), "modelWithMapProperty.deepMap[first][third]: size must be between 2 and 2147483647"),
arguments(ModelWithMapProperty(deepObjectMap = mapOf("first" to mapOf("second" to SimpleModel(color = "a")))), "modelWithMapProperty.deepObjectMap[first][second].color: size must be between 2 and 2147483647")
)

@JvmStatic
fun discriminators(): Stream<Arguments> {
Expand Down

0 comments on commit 03ea986

Please sign in to comment.