Skip to content

S
spring-boot
Commit b5246af1 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge pull request #4330 from izeye/patch-46 

* pr/4330:
  Remove unnecessary String concatenation
parents 831fa1d3 f7632226
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
View file @ b5246af1
......@@ -91,7 +91,7 @@ public class BasicErrorControllerIntegrationTests {
load();
ResponseEntity<Map> entity = new TestRestTemplate()
.getForEntity(createUrl("?trace=true"), Map.class);
assertErrorAttributes(entity.getBody(), "500", "" + "Internal Server Error",
assertErrorAttributes(entity.getBody(), "500", "Internal Server Error",
IllegalStateException.class, "Expected!", "/");
assertFalse("trace parameter should not be set",
entity.getBody().containsKey("trace"));
......@@ -103,7 +103,7 @@ public class BasicErrorControllerIntegrationTests {
load("--server.error.include-stacktrace=on-trace-param");
ResponseEntity<Map> entity = new TestRestTemplate()
.getForEntity(createUrl("?trace=true"), Map.class);
assertErrorAttributes(entity.getBody(), "500", "" + "Internal Server Error",
assertErrorAttributes(entity.getBody(), "500", "Internal Server Error",
IllegalStateException.class, "Expected!", "/");
assertTrue("trace parameter should be set",
entity.getBody().containsKey("trace"));
......@@ -115,7 +115,7 @@ public class BasicErrorControllerIntegrationTests {
load("--server.error.include-stacktrace=never");
ResponseEntity<Map> entity = new TestRestTemplate()
.getForEntity(createUrl("?trace=true"), Map.class);
assertErrorAttributes(entity.getBody(), "500", "" + "Internal Server Error",
assertErrorAttributes(entity.getBody(), "500", "Internal Server Error",
IllegalStateException.class, "Expected!", "/");
assertFalse("trace parameter should not be set",
entity.getBody().containsKey("trace"));
......@@ -127,7 +127,7 @@ public class BasicErrorControllerIntegrationTests {
load("--server.error.include-stacktrace=always");
ResponseEntity<Map> entity = new TestRestTemplate()
.getForEntity(createUrl("?trace=false"), Map.class);
assertErrorAttributes(entity.getBody(), "500", "" + "Internal Server Error",
assertErrorAttributes(entity.getBody(), "500", "Internal Server Error",
IllegalStateException.class, "Expected!", "/");
assertTrue("trace parameter should be set",
entity.getBody().containsKey("trace"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment