|
24 | 24 | import org.elasticsearch.common.logging.DeprecationLogger;
|
25 | 25 | import org.elasticsearch.test.ESTestCase;
|
26 | 26 |
|
| 27 | +import org.junit.Before; |
27 | 28 | import org.mockito.InOrder;
|
28 | 29 |
|
29 | 30 | import static org.mockito.Mockito.inOrder;
|
30 | 31 | import static org.mockito.Mockito.mock;
|
| 32 | +import static org.mockito.Mockito.when; |
31 | 33 |
|
32 | 34 | /**
|
33 | 35 | * Tests {@link DeprecationRestHandler}.
|
34 | 36 | */
|
35 | 37 | public class DeprecationRestHandlerTests extends ESTestCase {
|
36 | 38 |
|
37 |
| - private final RestHandler handler = mock(RestHandler.class); |
| 39 | + private RestHandler handler; |
38 | 40 | /**
|
39 | 41 | * Note: Headers should only use US ASCII (and this inevitably becomes one!).
|
40 | 42 | */
|
41 | 43 | private final String deprecationMessage = randomAlphaOfLengthBetween(1, 30);
|
42 |
| - private final DeprecationLogger deprecationLogger = mock(DeprecationLogger.class); |
| 44 | + private DeprecationLogger deprecationLogger; |
| 45 | + |
| 46 | + @Before |
| 47 | + public void setup() { |
| 48 | + handler = mock(RestHandler.class); |
| 49 | + deprecationLogger = mock(DeprecationLogger.class); |
| 50 | + } |
43 | 51 |
|
44 | 52 | public void testNullHandler() {
|
45 | 53 | expectThrows(NullPointerException.class, () -> new DeprecationRestHandler(null, deprecationMessage, deprecationLogger));
|
@@ -114,6 +122,16 @@ public void testInvalidHeaderValueEmpty() {
|
114 | 122 | expectThrows(IllegalArgumentException.class, () -> DeprecationRestHandler.requireValidHeader(blank));
|
115 | 123 | }
|
116 | 124 |
|
| 125 | + public void testSupportsContentStreamTrue() { |
| 126 | + when(handler.supportsContentStream()).thenReturn(true); |
| 127 | + assertTrue(new DeprecationRestHandler(handler, deprecationMessage, deprecationLogger).supportsContentStream()); |
| 128 | + } |
| 129 | + |
| 130 | + public void testSupportsContentStreamFalse() { |
| 131 | + when(handler.supportsContentStream()).thenReturn(false); |
| 132 | + assertFalse(new DeprecationRestHandler(handler, deprecationMessage, deprecationLogger).supportsContentStream()); |
| 133 | + } |
| 134 | + |
117 | 135 | /**
|
118 | 136 | * {@code ASCIIHeaderGenerator} only uses characters expected to be valid in headers (simplified US-ASCII).
|
119 | 137 | */
|
|
0 commit comments