From d3fdd0bef7ec41639c08a7e2e98553d44d16630c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 7 Mar 2017 18:30:00 +0000 Subject: [PATCH] Fix OperationBlockMacroTests on Windows --- .../asciidoctor/OperationBlockMacroTests.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/spring-restdocs-asciidoctor/src/test/java/org/springframework/restdocs/asciidoctor/OperationBlockMacroTests.java b/spring-restdocs-asciidoctor/src/test/java/org/springframework/restdocs/asciidoctor/OperationBlockMacroTests.java index 786a8dd5..8969e877 100644 --- a/spring-restdocs-asciidoctor/src/test/java/org/springframework/restdocs/asciidoctor/OperationBlockMacroTests.java +++ b/spring-restdocs-asciidoctor/src/test/java/org/springframework/restdocs/asciidoctor/OperationBlockMacroTests.java @@ -78,7 +78,8 @@ public class OperationBlockMacroTests { @Test public void includeSnippetInSection() throws Exception { String result = this.asciidoctor.convert( - "== Section\n" + "operation::some-operation[snippets='curl-request']", + "[[bruce]]\n== Section\n" + + "operation::some-operation[snippets='curl-request']", this.options); assertThat(result, equalTo(getExpectedContentFromFile("snippet-in-section"))); } @@ -131,6 +132,15 @@ public class OperationBlockMacroTests { throws URISyntaxException, IOException { Path filePath = Paths.get( this.getClass().getResource("/operations/" + fileName + ".html").toURI()); - return new String(Files.readAllBytes(filePath)); + String content = new String(Files.readAllBytes(filePath)); + if (isWindows()) { + return content.replace("\n", "\r\n"); + } + return content; } + + private boolean isWindows() { + return File.separatorChar == '\\'; + } + }