diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/FileReferenceTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/FileReferenceTest.java index b07f3986ff..2bbb22b11b 100644 --- a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/FileReferenceTest.java +++ b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/FileReferenceTest.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; +import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.OpenAPIV3Parser; import io.swagger.v3.parser.core.models.ParseOptions; @@ -235,9 +236,9 @@ public void testIssue421() { assertNotNull(swagger.getPaths().get("/pet/{petId}").getPost().getParameters()); assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getParameters().size() == 1); assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody() != null); - assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().get$ref() != null); - assertEquals(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().get$ref(),"#/components/requestBodies/requestBody"); - assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().get$ref().equals("#/components/requestBodies/requestBody")); + assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().getContent() != null); + assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().getContent().get("application/x-www-form-urlencoded") != null); + assertTrue(swagger.getPaths().get("/pet/{petId}").getPost().getRequestBody().getContent().get("application/x-www-form-urlencoded").getSchema() instanceof ObjectSchema); assertNotNull(swagger.getPaths().get("/store/order")); assertNotNull(swagger.getPaths().get("/store/order").getPost()); diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIResolverTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIResolverTest.java index ead7e79d4a..12678ba0fa 100644 --- a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIResolverTest.java +++ b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIResolverTest.java @@ -346,7 +346,9 @@ public void componentsResolver() throws Exception { // internal callback reference assertEquals(callbacks.get("referenced").get$ref(),"#/components/callbacks/failed"); //callback pathItem -> operation ->requestBody - assertEquals(callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().get$ref(),"#/components/requestBodies/requestBody3"); + assertTrue(callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().getContent() != null); + assertTrue(callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().getContent().get("application/json").getSchema() instanceof ArraySchema); + assertEquals(((ArraySchema) callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().getContent().get("application/json").getSchema()).getItems().get$ref(),"#/components/schemas/User"); //remote callback ref assertEquals(callbacks.get("remoteCallback").get$ref(),"#/components/callbacks/callback");