From e7d921c21647dd8d8cb84021ebf8a382f33f6e99 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 8 Nov 2018 12:31:21 +0000
Subject: [PATCH] Align test expectations with styling of stack trace div

Closes gh-15075
---
 .../DefaultErrorWebExceptionHandlerIntegrationTests.java      | 4 ++--
 .../web/servlet/error/ErrorMvcAutoConfigurationTests.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
index c5b98b1c89..67b91eb4b7 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
@@ -195,8 +195,8 @@ public class DefaultErrorWebExceptionHandlerIntegrationTests {
 							.contentType(MediaType.TEXT_HTML).expectBody(String.class)
 							.returnResult().getResponseBody();
 					assertThat(body).contains("Whitelabel Error Page")
-							.contains("<div>Expected!</div>")
-							.contains("<div>java.lang.IllegalStateException");
+							.contains("<div>Expected!</div>").contains(
+									"<div style='white-space:pre-wrap;'>java.lang.IllegalStateException");
 				});
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java
index 60efbc76bf..ffbdbb7014 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java
@@ -60,8 +60,8 @@ public class ErrorMvcAutoConfigurationTests {
 					.getContentAsString();
 			assertThat(responseString).contains(
 					"<p>This application has no explicit mapping for /error, so you are seeing this as a fallback.</p>")
-					.contains("<div>Exception message</div>")
-					.contains("<div>java.lang.IllegalStateException");
+					.contains("<div>Exception message</div>").contains(
+							"<div style='white-space:pre-wrap;'>java.lang.IllegalStateException");
 		});
 	}