Skip to content

Commit a25423c

Browse files
karlnicholasvelo
karlnicholas
authored and
velo
committed
Added testing only fixes Windows newlines. (OpenFeign#714)
1 parent fb825f2 commit a25423c

3 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎jackson/src/test/java/feign/jackson/JacksonCodecTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
public class JacksonCodecTest {
4747

4848
private String zonesJson = ""//
49-
+ "[\n"//
50-
+ " {\n"//
51-
+ " \"name\": \"denominator.io.\"\n"//
52-
+ " },\n"//
53-
+ " {\n"//
54-
+ " \"name\": \"denominator.io.\",\n"//
55-
+ " \"id\": \"ABCD\"\n"//
56-
+ " }\n"//
57-
+ "]\n";
49+
+ "[" + System.lineSeparator() //
50+
+ " {" + System.lineSeparator() //
51+
+ " \"name\": \"denominator.io.\"" + System.lineSeparator()//
52+
+ " }," + System.lineSeparator()//
53+
+ " {" + System.lineSeparator()//
54+
+ " \"name\": \"denominator.io.\"," + System.lineSeparator()//
55+
+ " \"id\": \"ABCD\"" + System.lineSeparator()//
56+
+ " }" + System.lineSeparator()//
57+
+ "]" + System.lineSeparator();
5858

5959
@Test
6060
public void encodesMapObjectNumericalValuesAsInteger() throws Exception {
@@ -65,8 +65,8 @@ public void encodesMapObjectNumericalValuesAsInteger() throws Exception {
6565
new JacksonEncoder().encode(map, map.getClass(), template);
6666

6767
assertThat(template).hasBody(""//
68-
+ "{\n" //
69-
+ " \"foo\" : 1\n" //
68+
+ "{" + System.lineSeparator() //
69+
+ " \"foo\" : 1" + System.lineSeparator() //
7070
+ "}");
7171
}
7272

@@ -80,9 +80,9 @@ public void encodesFormParams() throws Exception {
8080
new JacksonEncoder().encode(form, new TypeReference<Map<String, ?>>() {}.getType(), template);
8181

8282
assertThat(template).hasBody(""//
83-
+ "{\n" //
84-
+ " \"foo\" : 1,\n" //
85-
+ " \"bar\" : [ 2, 3 ]\n" //
83+
+ "{" + System.lineSeparator() //
84+
+ " \"foo\" : 1," + System.lineSeparator() //
85+
+ " \"bar\" : [ 2, 3 ]" + System.lineSeparator() //
8686
+ "}");
8787
}
8888

@@ -155,11 +155,11 @@ public void customEncoder() throws Exception {
155155
encoder.encode(zones, new TypeReference<List<Zone>>() {}.getType(), template);
156156

157157
assertThat(template).hasBody("" //
158-
+ "[ {\n"
159-
+ " \"name\" : \"DENOMINATOR.IO.\"\n"
160-
+ "}, {\n"
161-
+ " \"name\" : \"DENOMINATOR.IO.\",\n"
162-
+ " \"id\" : \"ABCD\"\n"
158+
+ "[ {" + System.lineSeparator()
159+
+ " \"name\" : \"DENOMINATOR.IO.\"" + System.lineSeparator()
160+
+ "}, {" + System.lineSeparator()
161+
+ " \"name\" : \"DENOMINATOR.IO.\"," + System.lineSeparator()
162+
+ " \"id\" : \"ABCD\"" + System.lineSeparator()
163163
+ "} ]");
164164
}
165165

‎jaxb/src/test/java/feign/jaxb/JAXBCodecTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,16 @@ public void encodesXmlWithCustomJAXBFormattedOutput() {
140140
RequestTemplate template = new RequestTemplate();
141141
encoder.encode(mock, MockObject.class, template);
142142

143-
String NEWLINE = System.getProperty("line.separator");
144-
143+
// RequestTemplate always expects a UNIX style newline.
145144
assertThat(template).hasBody(
146145
new StringBuilder().append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>")
147-
.append(NEWLINE)
146+
.append("\n")
148147
.append("<mockObject>")
149-
.append(NEWLINE)
148+
.append("\n")
150149
.append(" <value>Test</value>")
151-
.append(NEWLINE)
150+
.append("\n")
152151
.append("</mockObject>")
153-
.append(NEWLINE)
152+
.append("\n")
154153
.toString());
155154
}
156155

‎slf4j/src/test/java/feign/slf4j/Slf4jLoggerTest.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class Slf4jLoggerTest {
4343
@Test
4444
public void useFeignLoggerByDefault() throws Exception {
4545
slf4j.logLevel("debug");
46-
slf4j.expectMessages("DEBUG feign.Logger - [someMethod] This is my message\n");
46+
slf4j.expectMessages("DEBUG feign.Logger - [someMethod] This is my message" + System.lineSeparator());
4747

4848
logger = new Slf4jLogger();
4949
logger.log(CONFIG_KEY, "This is my message");
@@ -52,7 +52,7 @@ public void useFeignLoggerByDefault() throws Exception {
5252
@Test
5353
public void useLoggerByNameIfRequested() throws Exception {
5454
slf4j.logLevel("debug");
55-
slf4j.expectMessages("DEBUG named.logger - [someMethod] This is my message\n");
55+
slf4j.expectMessages("DEBUG named.logger - [someMethod] This is my message" + System.lineSeparator());
5656

5757
logger = new Slf4jLogger("named.logger");
5858
logger.log(CONFIG_KEY, "This is my message");
@@ -61,7 +61,7 @@ public void useLoggerByNameIfRequested() throws Exception {
6161
@Test
6262
public void useLoggerByClassIfRequested() throws Exception {
6363
slf4j.logLevel("debug");
64-
slf4j.expectMessages("DEBUG feign.Feign - [someMethod] This is my message\n");
64+
slf4j.expectMessages("DEBUG feign.Feign - [someMethod] This is my message" + System.lineSeparator());
6565

6666
logger = new Slf4jLogger(Feign.class);
6767
logger.log(CONFIG_KEY, "This is my message");
@@ -70,7 +70,7 @@ public void useLoggerByClassIfRequested() throws Exception {
7070
@Test
7171
public void useSpecifiedLoggerIfRequested() throws Exception {
7272
slf4j.logLevel("debug");
73-
slf4j.expectMessages("DEBUG specified.logger - [someMethod] This is my message\n");
73+
slf4j.expectMessages("DEBUG specified.logger - [someMethod] This is my message" + System.lineSeparator());
7474

7575
logger = new Slf4jLogger(LoggerFactory.getLogger("specified.logger"));
7676
logger.log(CONFIG_KEY, "This is my message");
@@ -89,10 +89,12 @@ public void logOnlyIfDebugEnabled() throws Exception {
8989
@Test
9090
public void logRequestsAndResponses() throws Exception {
9191
slf4j.logLevel("debug");
92-
slf4j.expectMessages("DEBUG feign.Logger - [someMethod] A message with 2 formatting tokens.\n" +
93-
"DEBUG feign.Logger - [someMethod] ---> GET http://api.example.com HTTP/1.1\n"
94-
+
95-
"DEBUG feign.Logger - [someMethod] <--- HTTP/1.1 200 OK (273ms)\n");
92+
slf4j.expectMessages("DEBUG feign.Logger - [someMethod] A message with 2 formatting tokens."
93+
+ System.lineSeparator() +
94+
"DEBUG feign.Logger - [someMethod] ---> GET http://api.example.com HTTP/1.1"
95+
+ System.lineSeparator() +
96+
"DEBUG feign.Logger - [someMethod] <--- HTTP/1.1 200 OK (273ms)"
97+
+ System.lineSeparator());
9698

9799
logger = new Slf4jLogger();
98100
logger.log(CONFIG_KEY, "A message with %d formatting %s.", 2, "tokens");

0 commit comments

Comments
 (0)