root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #23 from chanwit/master 

# By Chanwit Kaewkasi
* pull23:
  Fix a line ending issue for building on Windows
This commit is contained in:
Phillip Webb 2013-08-12 09:26:02 -07:00
parent e7689fd7c9 1b38cddeae
commit 8e347cddff
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot/src/test/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverterTests.java
View File

@ -17,10 +17,10 @@
package org.springframework.boot.logging.logback; package org.springframework.boot.logging.logback;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter;
import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent;
import ch.qos.logback.classic.spi.ThrowableProxy; import ch.qos.logback.classic.spi.ThrowableProxy;
import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.Matchers.startsWith;
@ -30,9 +30,12 @@ import static org.junit.Assert.assertThat;
* Tests for {@link WhitespaceThrowableProxyConverter}. * Tests for {@link WhitespaceThrowableProxyConverter}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Chanwit Kaewkasi
*/ */
public class WhitespaceThrowableProxyConverterTests { public class WhitespaceThrowableProxyConverterTests {
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
private WhitespaceThrowableProxyConverter converter = new WhitespaceThrowableProxyConverter(); private WhitespaceThrowableProxyConverter converter = new WhitespaceThrowableProxyConverter();
private LoggingEvent event = new LoggingEvent(); private LoggingEvent event = new LoggingEvent();
@ -47,8 +50,8 @@ public class WhitespaceThrowableProxyConverterTests {
public void withStackTrace() throws Exception { public void withStackTrace() throws Exception {
this.event.setThrowableProxy(new ThrowableProxy(new RuntimeException())); this.event.setThrowableProxy(new ThrowableProxy(new RuntimeException()));
String s = this.converter.convert(this.event); String s = this.converter.convert(this.event);
assertThat(s, startsWith("\n")); assertThat(s, startsWith(LINE_SEPARATOR));
assertThat(s, endsWith("\n")); assertThat(s, endsWith(LINE_SEPARATOR));
} }
} }