From c8ecab6d7828a32919c8e016df51425573db29af Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Mon, 7 Mar 2016 11:20:18 +0100 Subject: [PATCH] Fixed broken GeneralConverterTest --- .../swagger2markup/AsciidocConverterTest.java | 27 +++++++++++++++++++ .../swagger2markup/GeneralConverterTest.java | 4 --- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java index 13436c21..214d515c 100644 --- a/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java @@ -21,6 +21,7 @@ import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; import io.github.robwin.swagger2markup.extension.Swagger2MarkupExtensionRegistry; import io.github.robwin.swagger2markup.extension.repository.DynamicDefinitionsContentExtension; import io.github.robwin.swagger2markup.extension.repository.DynamicOperationsContentExtension; +import io.github.robwin.swagger2markup.extension.repository.SchemaExtension; import io.github.robwin.swagger2markup.extension.repository.SpringRestDocsExtension; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -430,4 +431,30 @@ public class AsciidocConverterTest { "Pet extension"); } + + @Test + public void testSwagger2AsciiDocSchemaExtension() throws IOException, URISyntaxException { + //Given + Path file = Paths.get(AsciidocConverterTest.class.getResource("/yaml/swagger_petstore.yaml").toURI()); + Path outputDirectory = Paths.get("build/docs/asciidoc/generated"); + FileUtils.deleteQuietly(outputDirectory.toFile()); + + //When + Swagger2MarkupConfig config = Swagger2MarkupConfig.ofDefaults() + .build(); + Swagger2MarkupExtensionRegistry registry = Swagger2MarkupExtensionRegistry.ofEmpty() + .withExtension(new SchemaExtension(Paths.get("src/docs/asciidoc/extensions").toUri())) + .build(); + Swagger2MarkupConverter.from(file) + .withConfig(config) + .withExtensionRegistry(registry) + .build() + .intoFolder(outputDirectory); + + //Then + assertThat(new String(Files.readAllBytes(outputDirectory.resolve("definitions.adoc")))).contains( + "=== Pet"); + assertThat(new String(Files.readAllBytes(outputDirectory.resolve("definitions.adoc")))).contains( + "==== XML Schema"); + } } diff --git a/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java index 19673f0d..c173425c 100644 --- a/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java @@ -38,7 +38,6 @@ public class GeneralConverterTest { Swagger2MarkupConfig config = Swagger2MarkupConfig.ofDefaults() .withDefinitionDescriptions() .withOperationDescriptions() - .withSchemas() .build(); Swagger2MarkupConverter converterBuilder = Swagger2MarkupConverter.from(file) @@ -49,7 +48,6 @@ public class GeneralConverterTest { URI baseUri = io.github.robwin.swagger2markup.utils.IOUtils.uriParent(converterBuilder.globalContext.swaggerLocation); assertThat(converterBuilder.globalContext.config.getDefinitionDescriptionsUri()).isEqualTo(baseUri); assertThat(converterBuilder.globalContext.config.getOperationDescriptionsUri()).isEqualTo(baseUri); - assertThat(converterBuilder.globalContext.config.getSchemasUri()).isEqualTo(baseUri); } @Test @@ -60,7 +58,6 @@ public class GeneralConverterTest { Swagger2MarkupConfig config = Swagger2MarkupConfig.ofDefaults() .withDefinitionDescriptions() .withOperationDescriptions() - .withSchemas() .build(); Swagger2MarkupConverter converterBuilder = Swagger2MarkupConverter.from(URI.create("http://petstore.swagger.io/v2/swagger.json").toURL()) @@ -70,7 +67,6 @@ public class GeneralConverterTest { //Then assertThat(converterBuilder.globalContext.config.getDefinitionDescriptionsUri()).isNull(); assertThat(converterBuilder.globalContext.config.getOperationDescriptionsUri()).isNull(); - assertThat(converterBuilder.globalContext.config.getSchemasUri()).isNull(); } @Test