Merge pull request #604 from benjamin-confino/434-openapi-attribute

Update tests to check for openapi version 3.1.x
microprofile · May 10, 2024 · 632268f · 632268f
2 parents ce4b240 + 4b4513b
commit 632268f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+                    in further updates
diff --git 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
+      type: object