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

Attempt to fix Windows build failures 

See gh-43864
This commit is contained in:
Phillip Webb 2025-02-10 23:29:55 -08:00
parent 7433b93769
commit 491a335ec7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/StandardStackTracePrinterTests.java
View File

@ -311,7 +311,7 @@ class StandardStackTracePrinterTests {
StandardStackTracePrinter printer = StandardStackTracePrinter.rootLast() StandardStackTracePrinter printer = StandardStackTracePrinter.rootLast()
.withFrameFormatter( .withFrameFormatter(
(element) -> ClassUtils.getShortName(element.getClassName()) + "." + element.getMethodName()); (element) -> ClassUtils.getShortName(element.getClassName()) + "." + element.getMethodName());
assertThat(printer.printStackTraceToString(exception)).isEqualTo(""" assertThat(printer.printStackTraceToString(exception)).isEqualToNormalizingNewlines("""
java.lang.RuntimeException: exception java.lang.RuntimeException: exception
at TestException.actualCreateException at TestException.actualCreateException
at TestException.createException at TestException.createException
@ -335,7 +335,7 @@ class StandardStackTracePrinterTests {
Throwable exception = TestException.create(); Throwable exception = TestException.create();
StandardStackTracePrinter printer = StandardStackTracePrinter.rootLast() StandardStackTracePrinter printer = StandardStackTracePrinter.rootLast()
.withHashes((frame) -> Objects.hash(frame.getClassName(), frame.getMethodName())); .withHashes((frame) -> Objects.hash(frame.getClassName(), frame.getMethodName()));
assertThat(printer.printStackTraceToString(exception)).isEqualTo(""" assertThat(printer.printStackTraceToString(exception)).isEqualToNormalizingNewlines("""
<#cc3eebec> java.lang.RuntimeException: exception <#cc3eebec> java.lang.RuntimeException: exception
at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:63) at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:63)
at org.springframework.boot.logging.TestException.createException(TestException.java:59) at org.springframework.boot.logging.TestException.createException(TestException.java:59)
@ -384,7 +384,7 @@ class StandardStackTracePrinterTests {
private void assertThatCleanedStackTraceMatches(StandardStackTracePrinter printer, Throwable throwable, private void assertThatCleanedStackTraceMatches(StandardStackTracePrinter printer, Throwable throwable,
String expected) { String expected) {
String actual = printer.printStackTraceToString(throwable); String actual = printer.printStackTraceToString(throwable);
assertThat(TestException.withoutLineNumbers(actual)).isEqualTo(expected); assertThat(TestException.withoutLineNumbers(actual)).isEqualToNormalizingNewlines(expected);
} }
} }

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java
View File

@ -146,7 +146,7 @@ class StructuredLoggingJsonPropertiesTests {
StackTrace properties = new StackTrace(null, Root.FIRST, 300, 2, true, false); StackTrace properties = new StackTrace(null, Root.FIRST, 300, 2, true, false);
StackTracePrinter printer = properties.createPrinter(); StackTracePrinter printer = properties.createPrinter();
String actual = TestException.withoutLineNumbers(printer.printStackTraceToString(exception)); String actual = TestException.withoutLineNumbers(printer.printStackTraceToString(exception));
assertThat(actual).isEqualTo(""" assertThat(actual).isEqualToNormalizingNewlines("""
java.lang.RuntimeException: exception java.lang.RuntimeException: exception
at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:NN) at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createException(TestException.java:NN) at org.springframework.boot.logging.TestException.createException(TestException.java:NN)