oas 3.1 - adding tests for unevaluatedItems deprecated

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -3786,7 +3786,6 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
 		}
 
 		if (node.get("default") != null) {
-			//TODO rename method
 			if(result.isDefaultSchemaTypeObject()) {
 				schema.setDefault(getAnyType("default", node, location, result));
 			}
@@ -3993,6 +3992,15 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
 			}
 		}
 
+		ObjectNode unevaluatedItems = getObject("unevaluatedItems", node, false, location, result);
+		if (unevaluatedItems != null) {
+			Schema unevaluatedItemsSchema = getJsonSchema(unevaluatedItems, location, result);
+			if (unevaluatedItemsSchema != null) {
+				schema.setUnevaluatedItems(unevaluatedItemsSchema);
+			}
+		}
+
+
 		Map<String, List<String>> dependentRequiredList = new LinkedHashMap<>();
 		ObjectNode dependentRequiredObj = getObject("dependentRequired", node, false, location, result);
 		List<String> dependentRequired = new ArrayList<>();

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OAI31DeserializationTest.java

@@ -366,7 +366,7 @@ public void testSiblingsReferenceJSONSchema2() {
         assertTrue(profile.getPatternProperties().containsKey("^S_"));
     }
 
-    @Test(description = "Test siblings with $ref for patternProperties, pattern, additionalProperties,exclusiveMaximum,exclusiveMinimum")
+    @Test(description = "Test siblings with $ref for patternProperties, pattern, additionalProperties,exclusiveMaximum,exclusiveMinimum, $schema")
     public void testSiblingsReferenceJSONSchema3() {
         ParseOptions options = new ParseOptions();
         String refSibling = "openapi: 3.1.0\n" +
@@ -394,6 +394,7 @@ public void testSiblingsReferenceJSONSchema3() {
         assertNotNull(openAPI);
         Schema profile = openAPI.getComponents().getSchemas().get("profile");
         assertNotNull(profile.get$ref());
+        assertEquals(profile.get$schema(), "https://json-schema.org/draft/2020-12/schema");
         assertEquals(profile.get$anchor(),"foo");
         assertEquals(profile.get$id(),"profile-id");
         assertTrue(profile.getExclusiveMaximumValue().intValue()==12);
@@ -434,7 +435,7 @@ public void testSiblingsReferenceJSONSchema4() {
         assertTrue(profile.getContentSchema().getTypes().contains("string"));
     }
 
-    @Test(description = "Test siblings with $ref for contains, maxContains, minContains, prefixItems, uniqueItems, propertyNames, unevaluatedProperties")
+    @Test(description = "Test siblings with $ref for contains, maxContains, minContains, prefixItems, uniqueItems, propertyNames, unevaluatedProperties, unevaluatedItems")
     public void testSiblingsReferenceJSONSchema5() {
         ParseOptions options = new ParseOptions();
         String refSibling = "openapi: 3.1.0\n" +
@@ -459,6 +460,8 @@ public void testSiblingsReferenceJSONSchema5() {
                 "      $ref: ./ex.json#user-profile\n" +
                 "      unevaluatedProperties:\n" +
                 "         type: object\n"+
+                "      unevaluatedItems:\n" +
+                "          type: object\n" +
                 "    Person:\n" +
                 "      type: array\n" +
                 "      prefixItems:\n" +
@@ -510,6 +513,9 @@ public void testSiblingsReferenceJSONSchema5() {
         assertNotNull(patientPersonSchema.getUnevaluatedProperties());
         assertTrue(patientPersonSchema.getUnevaluatedProperties() instanceof Boolean);
         assertFalse(((Boolean)patientPersonSchema.getUnevaluatedProperties()).booleanValue());
+
+        //unevaluatedItems
+        assertNotNull(profile.getUnevaluatedItems());
     }
 
     @Test(description = "Test siblings with $ref for if - then - else, dependentRequired, dependentSchemas")
@@ -672,6 +678,7 @@ public void testArbitraryKeywordsJSONSchema() {
                 "components:\n" +
                 "  schemas:\n" +
                 "    Fruit:\n" +
+                "      deprecated: true\n"+
                 "      type: string\n" +
                 "      example: kiwi\n" +
                 "      examples:\n" +
@@ -684,6 +691,7 @@ public void testArbitraryKeywordsJSONSchema() {
         assertNotNull(openAPI);
         assertNotNull(openAPI.getComponents().getSchemas().get("Fruit").getExtensions().get("arbitraryKeyword"));
         assertNotNull(openAPI.getComponents().getSchemas().get("Fruit").getExtensions().get("x-normalExtension"));
+        assertTrue(openAPI.getComponents().getSchemas().get("Fruit").getDeprecated());
     }
 
     @Test(description = "Test for Tuple parsing")