From d7dc77bae690f7935936b6891512eaf073cfbb2b Mon Sep 17 00:00:00 2001
From: Sergio del Amo <sergio.delamo@softamo.com>
Date: Thu, 26 Oct 2023 17:28:03 +0200
Subject: [PATCH] tck: Form Submission of optional number type (#10029)

Reproduces: https://github.com/micronaut-projects/micronaut-serialization/issues/619
---
 .../forms/FormsInputNumberOptionalTest.java   | 89 +++++++++++++++++++
 .../forms/FormsSubmissionsWithListsTest.java  |  1 +
 2 files changed, 90 insertions(+)
 create mode 100644 http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsInputNumberOptionalTest.java

diff --git a/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsInputNumberOptionalTest.java b/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsInputNumberOptionalTest.java
new file mode 100644
index 00000000000..ff34368af3a
--- /dev/null
+++ b/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsInputNumberOptionalTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2023 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.http.server.tck.tests.forms;
+
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.Introspected;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Body;
+import io.micronaut.http.annotation.Consumes;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Post;
+import io.micronaut.http.tck.AssertionUtils;
+import io.micronaut.http.tck.HttpResponseAssertion;
+import io.micronaut.http.tck.TestScenario;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings({
+        "java:S5960", // We're allowed assertions, as these are used in tests only
+        "checkstyle:MissingJavadocType",
+        "checkstyle:DesignForExtension"
+})
+public class FormsInputNumberOptionalTest {
+    private static final String SPEC_NAME = "FormsInputNumberOptionalTest";
+
+    @Test
+    public void formSubmissionOptionalInputTypeNumber() throws IOException {
+        String body = "title=Building+Microservices&pages=100";
+        String expectedJson = "{\"title\":\"Building Microservices\",\"pages\":100}";
+        assertWithBody(body, expectedJson);
+
+        body = "title=Building+Microservices&pages=";
+        expectedJson = "{\"title\":\"Building Microservices\"}";
+        assertWithBody(body, expectedJson);
+    }
+
+    private static void assertWithBody(String body, String expectedJson) throws IOException {
+        TestScenario.builder()
+                .specName(SPEC_NAME)
+                .request(HttpRequest.POST("/book/save", body).contentType(MediaType.APPLICATION_FORM_URLENCODED_TYPE))
+                .assertion((server, request) ->
+                        AssertionUtils.assertDoesNotThrow(server, request, HttpResponseAssertion.builder()
+                                .status(HttpStatus.OK)
+                                .assertResponse(httpResponse -> {
+                                    Optional<String> bodyOptional = httpResponse.getBody(String.class);
+                                    assertTrue(bodyOptional.isPresent());
+                                    assertEquals(expectedJson, bodyOptional.get());
+                                })
+                                .build()))
+                .run();
+    }
+
+    @Requires(property = "spec.name", value = SPEC_NAME)
+    @Controller("/book")
+    static class SaveController {
+        @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+        @Post("/save")
+        Book save(@Body Book book) {
+            return book;
+        }
+    }
+
+    @Introspected
+    record Book(@NonNull String title, @Nullable Integer pages) {
+    }
+
+}
diff --git a/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsSubmissionsWithListsTest.java b/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsSubmissionsWithListsTest.java
index c3290499af0..1522ab03a1b 100644
--- a/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsSubmissionsWithListsTest.java
+++ b/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/forms/FormsSubmissionsWithListsTest.java
@@ -43,6 +43,7 @@
 })
 public class FormsSubmissionsWithListsTest {
     private static final String SPEC_NAME = "FormsSubmissionsWithListsTest";
+
     @Test
     public void formWithListOfOneItem() throws IOException {
         String body = "question=en+que+trabajas&usersId=1";