|
26 | 26 | import java.util.Arrays;
|
27 | 27 | import java.util.List;
|
28 | 28 | import java.util.Map;
|
| 29 | +import java.util.function.Supplier; |
29 | 30 |
|
30 | 31 | import javax.servlet.http.HttpServletRequest;
|
31 | 32 | import javax.servlet.http.HttpServletResponse;
|
@@ -94,15 +95,30 @@ public void testErrorForMachineClient() {
|
94 | 95 | }
|
95 | 96 |
|
96 | 97 | @Test
|
| 98 | + public void testErrorForMachineClientTraceParamTrue() { |
| 99 | + errorForMachineClientOnTraceParam(() -> createUrl("?trace=true"), true); |
| 100 | + } |
| 101 | + |
| 102 | + @Test |
| 103 | + public void testErrorForMachineClientTraceParamFalse() { |
| 104 | + errorForMachineClientOnTraceParam(() -> createUrl("?trace=false"), false); |
| 105 | + } |
| 106 | + |
| 107 | + @Test |
| 108 | + public void testErrorForMachineClientTraceParamAbsent() { |
| 109 | + errorForMachineClientOnTraceParam(() -> createUrl(""), false); |
| 110 | + } |
| 111 | + |
97 | 112 | @SuppressWarnings("rawtypes")
|
98 |
| - public void testErrorForMachineClientTraceParamStacktrace() { |
| 113 | + private void errorForMachineClientOnTraceParam(Supplier<String> url, |
| 114 | + boolean expectedTrace) { |
99 | 115 | load("--server.error.include-exception=true",
|
100 | 116 | "--server.error.include-stacktrace=on-trace-param");
|
101 |
| - ResponseEntity<Map> entity = new TestRestTemplate() |
102 |
| - .getForEntity(createUrl("?trace=true"), Map.class); |
| 117 | + ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(url.get(), |
| 118 | + Map.class); |
103 | 119 | assertErrorAttributes(entity.getBody(), "500", "Internal Server Error",
|
104 | 120 | IllegalStateException.class, "Expected!", "/");
|
105 |
| - assertThat(entity.getBody().containsKey("trace")).isTrue(); |
| 121 | + assertThat(entity.getBody().containsKey("trace")).isEqualTo(expectedTrace); |
106 | 122 | }
|
107 | 123 |
|
108 | 124 | @Test
|
|
0 commit comments