This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new e0934202835 Fix asserts in swagger tests (#8558)
e0934202835 is described below
commit e0934202835124985bfa2e12011a99573a7716bc
Author: Tomáš Turek <ttu...@redhat.com>
AuthorDate: Mon Oct 17 15:57:22 2022 +0200
Fix asserts in swagger tests (#8558)
---
.../src/test/java/org/apache/camel/swagger/ParameterAssert.java | 5 +++--
.../java/org/apache/camel/swagger/RestSwaggerArrayEnumTest.java | 8 ++++----
.../apache/camel/generator/swagger/RestDslXmlGeneratorTest.java | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/ParameterAssert.java
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/ParameterAssert.java
index ee17ddd5b1a..cb98e482ddf 100644
---
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/ParameterAssert.java
+++
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/ParameterAssert.java
@@ -79,7 +79,7 @@ public final class ParameterAssert extends
ObjectAssert<Parameter> {
Assertions.assertThat(items).isNotNull();
final String actualArrayType = items.getType();
Assertions.assertThat(actualArrayType).as("Parameter array should be
of %s type, but it's of %s", type,
- actualArrayType);
+ actualArrayType).isEqualTo(type);
return this;
}
@@ -89,7 +89,8 @@ public final class ParameterAssert extends
ObjectAssert<Parameter> {
final SerializableParameter serializableParameter =
(SerializableParameter) actual;
final String actualType = serializableParameter.getType();
- Assertions.assertThat(actualType).as("Parameter should be of %s type,
but it's of %s", type, actualType);
+ Assertions.assertThat(actualType).as("Parameter should be of %s type,
but it's of %s", type, actualType)
+ .isEqualTo(type);
return this;
}
diff --git
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerArrayEnumTest.java
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerArrayEnumTest.java
index 094dc2a275a..d6102445656 100644
---
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerArrayEnumTest.java
+++
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerArrayEnumTest.java
@@ -72,20 +72,20 @@ public class RestSwaggerArrayEnumTest extends
CamelTestSupport {
ParameterAssert.assertThat(parameters.get(0)).hasName("pathParam").isGivenIn("path").isOfType("string")
.hasEnumSpecifiedWith("a", "b", "c");
-
ParameterAssert.assertThat(parameters.get(1)).hasName("queryParam").isGivenIn("query").isOfType("string")
+
ParameterAssert.assertThat(parameters.get(1)).hasName("queryParam").isGivenIn("query").isOfType("int")
.hasEnumSpecifiedWith("1", "2", "3");
-
ParameterAssert.assertThat(parameters.get(2)).hasName("headerParam").isGivenIn("header").isOfType("string")
+
ParameterAssert.assertThat(parameters.get(2)).hasName("headerParam").isGivenIn("header").isOfType("float")
.hasEnumSpecifiedWith("1.1", "2.2", "3.3");
ParameterAssert.assertThat(parameters.get(3)).hasName("pathArrayParam").isGivenIn("path").isOfType("array")
.isOfArrayType("string").hasArrayEnumSpecifiedWith("a", "b",
"c");
ParameterAssert.assertThat(parameters.get(4)).hasName("queryArrayParam").isGivenIn("query").isOfType("array")
- .isOfArrayType("int").hasArrayEnumSpecifiedWith(1, 2, 3);
+ .isOfArrayType("integer").hasArrayEnumSpecifiedWith(1, 2, 3);
ParameterAssert.assertThat(parameters.get(5)).hasName("headerArrayParam").isGivenIn("header").isOfType("array")
- .isOfArrayType("float").hasArrayEnumSpecifiedWith(1.1f, 2.2f,
3.3f);
+ .isOfArrayType("number").hasArrayEnumSpecifiedWith(1.1f, 2.2f,
3.3f);
}
}
diff --git
a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java
b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java
index 26511130ed3..05d39b91704 100644
---
a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java
+++
b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java
@@ -47,7 +47,7 @@ public class RestDslXmlGeneratorTest {
final String xml =
RestDslGenerator.toXml(swagger).withBlueprint().generate(context);
assertThat(xml).isNotEmpty();
- assertThat(xml.contains("http://camel.apache.org/schema/blueprint";));
+ assertThat(xml).contains("http://camel.apache.org/schema/blueprint";);
}
@Test
@@ -56,7 +56,7 @@ public class RestDslXmlGeneratorTest {
final String xml = RestDslGenerator.toXml(swagger).generate(context);
assertThat(xml).isNotEmpty();
- assertThat(xml.contains("http://camel.apache.org/schema/spring";));
+ assertThat(xml).contains("http://camel.apache.org/schema/spring";);
}
@Test
