From 1d2765dcb6dd7d23a7a0501864c9a5819494642f Mon Sep 17 00:00:00 2001 From: Michael Edgar Date: Fri, 25 Oct 2024 19:48:48 -0400 Subject: [PATCH] Fix health schema type tests Signed-off-by: Michael Edgar --- .../smallrye/health/test/DeprecatedHealthOpenAPITest.java | 4 +--- .../io/quarkus/smallrye/health/test/HealthOpenAPITest.java | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DeprecatedHealthOpenAPITest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DeprecatedHealthOpenAPITest.java index e9e26dc46e743..6c96b912c21d0 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DeprecatedHealthOpenAPITest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DeprecatedHealthOpenAPITest.java @@ -42,9 +42,7 @@ void testOpenApiPathAccessResource() { .body("components.schemas.HealthCheck.type", Matchers.equalTo("object")) .body("components.schemas.HealthCheck.properties.status.type", Matchers.equalTo("string")) .body("components.schemas.HealthCheck.properties.name.type", Matchers.equalTo("string")) - .body("components.schemas.HealthCheck.properties.data.type", Matchers.equalTo("object")) - .body("components.schemas.HealthCheck.properties.data.nullable", Matchers.is(true)); - + .body("components.schemas.HealthCheck.properties.data.type", Matchers.contains("object", "null")); } } diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java index e2072c1535db4..d99fb26c43221 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java @@ -28,6 +28,7 @@ void testOpenApiPathAccessResource() { .when().get(OPEN_API_PATH) .then() .header("Content-Type", "application/json;charset=UTF-8") + .body("paths", Matchers.hasKey("/q/health/ready")) .body("paths", Matchers.hasKey("/q/health/live")) .body("paths", Matchers.hasKey("/q/health/started")) @@ -40,7 +41,7 @@ void testOpenApiPathAccessResource() { .body("components.schemas.HealthCheck.type", Matchers.equalTo("object")) .body("components.schemas.HealthCheck.properties.status.type", Matchers.equalTo("string")) .body("components.schemas.HealthCheck.properties.name.type", Matchers.equalTo("string")) - .body("components.schemas.HealthCheck.properties.data.type", Matchers.arrayContaining("object", "null")); + .body("components.schemas.HealthCheck.properties.data.type", Matchers.contains("object", "null")); } }