This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 7508423 Enable test for REST body validation
7508423 is described below
commit 7508423dc306dd001693402efcce61015fc732ce
Author: James Netherton <[email protected]>
AuthorDate: Thu Jun 3 15:41:48 2021 +0100
Enable test for REST body validation
---
.../quarkus/component/rest/it/RestRoutes.java | 5 ++---
.../camel/quarkus/component/rest/it/RestTest.java | 26 ++++++++++++----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
index 22c4c25..77d125d 100644
---
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
+++
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
@@ -47,12 +47,11 @@ public class RestRoutes extends RouteBuilder {
.post("/validation")
.clientRequestValidation(true)
.param().name("messageStart").type(RestParamType.query).required(true).endParam()
- // https://issues.apache.org/jira/browse/CAMEL-16560
- //
.param().name("messageEnd").type(RestParamType.body).required(true).endParam()
+
.param().name("messageMiddle").type(RestParamType.body).required(true).endParam()
.param().name("messageEnd").type(RestParamType.header).required(true).endParam()
.param().name("unused").type(RestParamType.formData).required(false).endParam()
.route()
- .setBody(simple("${header.messageStart} ${header.messageEnd}"))
+ .setBody(simple("${header.messageStart} ${body}
${header.messageEnd}"))
.endRest()
.get("/template/{messageStart}/{messageEnd}")
diff --git
a/integration-tests/rest/src/test/java/org/apache/camel/quarkus/component/rest/it/RestTest.java
b/integration-tests/rest/src/test/java/org/apache/camel/quarkus/component/rest/it/RestTest.java
index 21be9cc..5a575f1 100644
---
a/integration-tests/rest/src/test/java/org/apache/camel/quarkus/component/rest/it/RestTest.java
+++
b/integration-tests/rest/src/test/java/org/apache/camel/quarkus/component/rest/it/RestTest.java
@@ -69,25 +69,26 @@ class RestTest {
public void requestValidation() {
RestAssured.given()
.contentType(ContentType.TEXT)
- .header("messageEnd", "World")
+ .body("Camel Quarkus")
+ .header("messageEnd", "REST")
.post("/rest/validation")
.then()
.statusCode(400)
.body(equalTo("Some of the required query parameters are
missing."));
- // TODO: Enable this -
https://issues.apache.org/jira/browse/CAMEL-16560
- // RestAssured.given()
- // .contentType(ContentType.TEXT)
- // .queryParam("messageStart", "Hello")
- // .post("/rest/validation")
- // .then()
- // .statusCode(400)
- // .body(equalTo("The request body is missing."));
- //
+ RestAssured.given()
+ .contentType(ContentType.TEXT)
+ .queryParam("messageStart", "Hello")
+ .header("messageEnd", "REST")
+ .post("/rest/validation")
+ .then()
+ .statusCode(400)
+ .body(equalTo("The request body is missing."));
RestAssured.given()
.contentType(ContentType.TEXT)
.queryParam("messageStart", "Hello")
+ .body("Camel Quarkus")
.post("/rest/validation")
.then()
.statusCode(400)
@@ -96,11 +97,12 @@ class RestTest {
RestAssured.given()
.contentType(ContentType.TEXT)
.queryParam("messageStart", "Hello")
- .header("messageEnd", "World")
+ .body("Camel Quarkus")
+ .header("messageEnd", "REST")
.post("/rest/validation")
.then()
.statusCode(200)
- .body(equalTo("Hello World"));
+ .body(equalTo("Hello Camel Quarkus REST"));
}
@Test
