From 4b4513bf849778611d9353513fa168a763cee289 Mon Sep 17 00:00:00 2001 From: Benjamin Confino Date: Sun, 28 Apr 2024 14:21:15 +0100 Subject: [PATCH] expect openapi version 3.1.x --- .../org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java | 2 +- .../eclipse/microprofile/openapi/tck/ModelReaderAppTest.java | 2 +- .../microprofile/openapi/tck/OASConfigScanClassBase.java | 2 +- .../microprofile/openapi/tck/OASConfigScanDisableTest.java | 2 +- .../org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java | 2 +- .../eclipse/microprofile/openapi/tck/StaticDocumentTest.java | 2 +- tck/src/main/resources/openapi.yaml | 4 ++-- tck/src/main/resources/simpleapi.yaml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java index 29ebb5fa..83abd069 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java @@ -61,7 +61,7 @@ public static WebArchive createDeployment() { @Test(dataProvider = "formatProvider") public void testVersion(String type) { ValidatableResponse vr = callEndpoint(type); - vr.body("openapi", startsWith("3.0.")); + vr.body("openapi", startsWith("3.1.")); } @Test(dataProvider = "formatProvider") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java index 1dc34a99..49d5ecc7 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java @@ -55,7 +55,7 @@ public static WebArchive createDeployment() { @Test(dataProvider = "formatProvider") public void testVersion(String type) { ValidatableResponse vr = callEndpoint(type); - vr.body("openapi", startsWith("3.0.")); + vr.body("openapi", startsWith("3.1.")); } @Test(dataProvider = "formatProvider") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanClassBase.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanClassBase.java index ed55e11d..dea0af4a 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanClassBase.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanClassBase.java @@ -33,7 +33,7 @@ public abstract class OASConfigScanClassBase extends AppTestBase { @Test(dataProvider = "formatProvider") public void testScanClass(String type) throws InterruptedException { vr = callEndpoint(type); - vr.body("openapi", startsWith("3.0.")); + vr.body("openapi", startsWith("3.1.")); vr.body("paths", aMapWithSize(5)); vr.body("paths", hasKey("/reviews")); vr.body("paths", hasKey("/reviews/{id}")); diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanDisableTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanDisableTest.java index ba35e4ed..4a4c83c1 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanDisableTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanDisableTest.java @@ -40,7 +40,7 @@ public static WebArchive createDeployment() { @Test(dataProvider = "formatProvider") public void testScanDisable(String type) throws InterruptedException { vr = callEndpoint(type); - vr.body("openapi", startsWith("3.0.")); + vr.body("openapi", startsWith("3.1.")); vr.body("info", notNullValue()); vr.body("info.title", notNullValue()); vr.body("info.version", notNullValue()); diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java index 024856f1..2bcfd711 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java @@ -194,7 +194,7 @@ public void testDefaultResponseType() { .assertThat() .statusCode(200) .and() - .body("openapi", startsWith("3.0.")); + .body("openapi", startsWith("3.1.")); } @Test(dataProvider = "formatProvider") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/StaticDocumentTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/StaticDocumentTest.java index b99ec31c..fd13c201 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/StaticDocumentTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/StaticDocumentTest.java @@ -47,7 +47,7 @@ public static WebArchive createDeployment() { public void testStaticDocument(String type) { ValidatableResponse vr = callEndpoint(type); - vr.body("openapi", startsWith("3.0.")); + vr.body("openapi", startsWith("3.1.")); vr.body("servers", hasSize(1)); vr.body("servers.find{ it.description == 'MySimpleAPI' }.url", diff --git a/tck/src/main/resources/openapi.yaml b/tck/src/main/resources/openapi.yaml index 94016fcf..6f0a7657 100644 --- a/tck/src/main/resources/openapi.yaml +++ b/tck/src/main/resources/openapi.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -openapi: 3.0.2 +openapi: 3.1.0 info: title: Callback Example version: 1.0.0 @@ -73,4 +73,4 @@ paths: '204': description: | Your server should return this HTTP status code if no longer interested - in further updates \ No newline at end of file + in further updates diff --git a/tck/src/main/resources/simpleapi.yaml b/tck/src/main/resources/simpleapi.yaml index 7e414995..bea1eb26 100644 --- a/tck/src/main/resources/simpleapi.yaml +++ b/tck/src/main/resources/simpleapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.2 +openapi: 3.1.0 servers: - description: MySimpleAPI url: https:///MySimpleAPI/1.0.0 @@ -163,4 +163,4 @@ components: type: string examples: - 408-867-5309 - type: object \ No newline at end of file + type: object