Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test failures on Windows caused by different new line characters

Browse Source
This commit is contained in:
Andy Wilkinson
2016-03-09 17:51:48 +00:00
parent 7a3fe6b72c
commit 6ea6dcf996
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-restdocs-core/src/test/java/org/springframework/restdocs/cli/HttpieRequestSnippetTests.java
View File

@@ -236,8 +236,9 @@ public class HttpieRequestSnippetTests extends AbstractSnippetTests {
@Test @Test
public void multipartPostWithNoSubmittedFileName() throws IOException { public void multipartPostWithNoSubmittedFileName() throws IOException {
String expectedContent = "$ http --form POST 'http://localhost/upload' \\\n" String expectedContent = String
+ " 'metadata'@<(echo '{\"description\": \"foo\"}')"; .format("$ http --form POST 'http://localhost/upload' \\%n"
+ " 'metadata'@<(echo '{\"description\": \"foo\"}')");
this.snippet.expectHttpieRequest("multipart-post-no-original-filename") this.snippet.expectHttpieRequest("multipart-post-no-original-filename")
.withContents(codeBlock("bash").content(expectedContent)); .withContents(codeBlock("bash").content(expectedContent));
new HttpieRequestSnippet() new HttpieRequestSnippet()
@@ -252,8 +253,9 @@ public class HttpieRequestSnippetTests extends AbstractSnippetTests {
@Test @Test
public void multipartPostWithContentType() throws IOException { public void multipartPostWithContentType() throws IOException {
// httpie does not yet support manually set content type by part // httpie does not yet support manually set content type by part
String expectedContent = "$ http --form POST 'http://localhost/upload' \\\n" String expectedContent = String
+ " 'image'@'documents/images/example.png'"; .format("$ http --form POST 'http://localhost/upload' \\%n"
+ " 'image'@'documents/images/example.png'");
this.snippet.expectHttpieRequest("multipart-post-with-content-type") this.snippet.expectHttpieRequest("multipart-post-with-content-type")
.withContents(codeBlock("bash").content(expectedContent)); .withContents(codeBlock("bash").content(expectedContent));
new HttpieRequestSnippet() new HttpieRequestSnippet()
@@ -268,8 +270,9 @@ public class HttpieRequestSnippetTests extends AbstractSnippetTests {
@Test @Test
public void multipartPost() throws IOException { public void multipartPost() throws IOException {
String expectedContent = "$ http --form POST 'http://localhost/upload' \\\n" String expectedContent = String
+ " 'image'@'documents/images/example.png'"; .format("$ http --form POST 'http://localhost/upload' \\%n"
+ " 'image'@'documents/images/example.png'");
this.snippet.expectHttpieRequest("multipart-post") this.snippet.expectHttpieRequest("multipart-post")
.withContents(codeBlock("bash").content(expectedContent)); .withContents(codeBlock("bash").content(expectedContent));
new HttpieRequestSnippet() new HttpieRequestSnippet()
@@ -283,8 +286,10 @@ public class HttpieRequestSnippetTests extends AbstractSnippetTests {
@Test @Test
public void multipartPostWithParameters() throws IOException { public void multipartPostWithParameters() throws IOException {
String expectedContent = "$ http --form POST 'http://localhost/upload' \\\n" String expectedContent = String
+ " 'image'@'documents/images/example.png' 'a=apple' 'a=avocado' 'b=banana'"; .format("$ http --form POST 'http://localhost/upload' \\%n"
+ " 'image'@'documents/images/example.png' 'a=apple' 'a=avocado'"
+ " 'b=banana'");
this.snippet.expectHttpieRequest("multipart-post-with-parameters") this.snippet.expectHttpieRequest("multipart-post-with-parameters")
.withContents(codeBlock("bash").content(expectedContent)); .withContents(codeBlock("bash").content(expectedContent));
new HttpieRequestSnippet() new HttpieRequestSnippet()