From 81e79e2ca6dcf3c3ee48c80a3f366bfb3d765218 Mon Sep 17 00:00:00 2001 From: Mandar Autade Date: Sun, 17 Apr 2022 22:25:03 +0530 Subject: [PATCH] Revert "Updated the test files as per PR changes" This reverts commit f83f3250d13a5dd8f64551305e0798bafb80eb2d. --- .../java/io/swagger/v3/parser/test/FileReferenceTest.java | 7 +++---- .../io/swagger/v3/parser/test/OpenAPIResolverTest.java | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) 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 2bbb22b11b..b07f3986ff 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,7 +8,6 @@ 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; @@ -236,9 +235,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().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); + 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")); 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 12678ba0fa..ead7e79d4a 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,9 +346,7 @@ public void componentsResolver() throws Exception { // internal callback reference assertEquals(callbacks.get("referenced").get$ref(),"#/components/callbacks/failed"); //callback pathItem -> operation ->requestBody - 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"); + assertEquals(callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().get$ref(),"#/components/requestBodies/requestBody3"); //remote callback ref assertEquals(callbacks.get("remoteCallback").get$ref(),"#/components/callbacks/callback");