From 04a2c0db8d656344e93cdafb9ef8c6e71f46c569 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Thu, 26 Jul 2018 09:33:55 -0400 Subject: [PATCH] Fix for issue 347 Signed-off-by: Eric Wittmann --- .../api/rest/impl/DesignsResourceTest.java | 31 ++++++++++++++++++- .../hub/core/beans/OpenApi3Document.java | 2 +- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/back-end/hub-api/src/test/java/io/apicurio/hub/api/rest/impl/DesignsResourceTest.java b/back-end/hub-api/src/test/java/io/apicurio/hub/api/rest/impl/DesignsResourceTest.java index bc25c7af5..7bec51a73 100644 --- a/back-end/hub-api/src/test/java/io/apicurio/hub/api/rest/impl/DesignsResourceTest.java +++ b/back-end/hub-api/src/test/java/io/apicurio/hub/api/rest/impl/DesignsResourceTest.java @@ -220,7 +220,7 @@ public void testImportDesign_Data() throws ServerError, AlreadyExistsException, } @Test - public void testCreateDesign() throws ServerError, AlreadyExistsException { + public void testCreateDesign() throws Exception { NewApiDesign info = new NewApiDesign(); info.setSpecVersion("2.0"); info.setName("My API"); @@ -238,6 +238,35 @@ public void testCreateDesign() throws ServerError, AlreadyExistsException { "---\n" + "---", ghLog); + + Response response = resource.getContent(design.getId(), "json"); + String content = response.getEntity().toString(); + JsonNode jsonData = new ObjectMapper().reader().readTree(content); + String version = jsonData.get("info").get("version").asText(); + Assert.assertEquals("1.0.0", version); + String oaiVersion = jsonData.get("swagger").asText(); + Assert.assertEquals("2.0", oaiVersion); + + + // 3.0 document + info = new NewApiDesign(); + info.setSpecVersion("3.0.1"); + info.setName("My 3.0 API"); + info.setDescription("Description of my 3.0 API."); + design = resource.createDesign(info); + Assert.assertNotNull(design); + Assert.assertEquals(info.getName(), design.getName()); + Assert.assertEquals(info.getDescription(), design.getDescription()); + Assert.assertEquals("2", design.getId()); + Assert.assertEquals("user", design.getCreatedBy()); + + response = resource.getContent(design.getId(), "json"); + content = response.getEntity().toString(); + jsonData = new ObjectMapper().reader().readTree(content); + version = jsonData.get("info").get("version").asText(); + Assert.assertEquals("1.0.0", version); + oaiVersion = jsonData.get("openapi").asText(); + Assert.assertEquals("3.0.1", oaiVersion); } @Test diff --git a/back-end/hub-core/src/main/java/io/apicurio/hub/core/beans/OpenApi3Document.java b/back-end/hub-core/src/main/java/io/apicurio/hub/core/beans/OpenApi3Document.java index 2bbe2638c..b72a4a46c 100644 --- a/back-end/hub-core/src/main/java/io/apicurio/hub/core/beans/OpenApi3Document.java +++ b/back-end/hub-core/src/main/java/io/apicurio/hub/core/beans/OpenApi3Document.java @@ -21,7 +21,7 @@ */ public class OpenApi3Document extends OpenApiDocument { - private String openapi = "3.0.0"; + private String openapi = "3.0.1"; /** * Constructor.