|
44 | 44 | import static org.mockito.Mockito.when; |
45 | 45 |
|
46 | 46 | public class RestRequestTests extends ESTestCase { |
47 | | - private static final String PARAMETER_KEY = "PARAMETER_KEY"; |
48 | 47 |
|
49 | 48 | public void testContentConsumesContent() { |
50 | 49 | runConsumesContentTest(RestRequest::content, true); |
@@ -124,32 +123,35 @@ public void testApplyContentParser() throws IOException { |
124 | 123 | public void testParseAsIntWithNoParameters() { |
125 | 124 | RestRequest restRequest = contentRestRequest("", emptyMap()); |
126 | 125 | int defaultValue = -1; |
| 126 | + String parameterKey = randomIdentifier(); |
127 | 127 |
|
128 | | - int value = restRequest.paramAsInt(PARAMETER_KEY, defaultValue); |
| 128 | + int value = restRequest.paramAsInt(parameterKey, defaultValue); |
129 | 129 | assertEquals(defaultValue, value); |
130 | 130 |
|
131 | | - Integer value2 = restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue)); |
| 131 | + Integer value2 = restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue)); |
132 | 132 | assertEquals(defaultValue, value2.intValue()); |
133 | 133 | } |
134 | 134 |
|
135 | 135 | public void testParseAsIntWithIntegerParameter() { |
136 | | - RestRequest restRequest = contentRestRequest("", singletonMap(PARAMETER_KEY, "123")); |
| 136 | + String parameterKey = randomIdentifier(); |
| 137 | + RestRequest restRequest = contentRestRequest("", singletonMap(parameterKey, "123")); |
137 | 138 | int defaultValue = -1; |
138 | 139 |
|
139 | | - int value = restRequest.paramAsInt(PARAMETER_KEY, defaultValue); |
| 140 | + int value = restRequest.paramAsInt(parameterKey, defaultValue); |
140 | 141 | assertEquals(123, value); |
141 | 142 |
|
142 | | - Integer value2 = restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue)); |
| 143 | + Integer value2 = restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue)); |
143 | 144 | assertEquals(123, value2.intValue()); |
144 | 145 | } |
145 | 146 |
|
146 | 147 | public void testParseAsIntWithoutIntegerParameter() { |
147 | | - RestRequest restRequest = contentRestRequest("", singletonMap(PARAMETER_KEY, "123T")); |
| 148 | + String parameterKey = randomIdentifier(); |
| 149 | + RestRequest restRequest = contentRestRequest("", singletonMap(parameterKey, "123T")); |
148 | 150 | int defaultValue = -1; |
149 | 151 |
|
150 | | - assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(PARAMETER_KEY, defaultValue); }); |
| 152 | + assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(parameterKey, defaultValue); }); |
151 | 153 |
|
152 | | - assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue)); }); |
| 154 | + assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue)); }); |
153 | 155 | } |
154 | 156 |
|
155 | 157 | public void testContentOrSourceParam() throws IOException { |
|
0 commit comments