Skip to content

Commit 77080cb

Browse files
Update PARAMETER_KEY in RestRequestTests
1 parent d3a29bb commit 77080cb

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

server/src/test/java/org/elasticsearch/rest/RestRequestTests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import static org.mockito.Mockito.when;
4545

4646
public class RestRequestTests extends ESTestCase {
47-
private static final String PARAMETER_KEY = "PARAMETER_KEY";
4847

4948
public void testContentConsumesContent() {
5049
runConsumesContentTest(RestRequest::content, true);
@@ -124,32 +123,35 @@ public void testApplyContentParser() throws IOException {
124123
public void testParseAsIntWithNoParameters() {
125124
RestRequest restRequest = contentRestRequest("", emptyMap());
126125
int defaultValue = -1;
126+
String parameterKey = randomIdentifier();
127127

128-
int value = restRequest.paramAsInt(PARAMETER_KEY, defaultValue);
128+
int value = restRequest.paramAsInt(parameterKey, defaultValue);
129129
assertEquals(defaultValue, value);
130130

131-
Integer value2 = restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue));
131+
Integer value2 = restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue));
132132
assertEquals(defaultValue, value2.intValue());
133133
}
134134

135135
public void testParseAsIntWithIntegerParameter() {
136-
RestRequest restRequest = contentRestRequest("", singletonMap(PARAMETER_KEY, "123"));
136+
String parameterKey = randomIdentifier();
137+
RestRequest restRequest = contentRestRequest("", singletonMap(parameterKey, "123"));
137138
int defaultValue = -1;
138139

139-
int value = restRequest.paramAsInt(PARAMETER_KEY, defaultValue);
140+
int value = restRequest.paramAsInt(parameterKey, defaultValue);
140141
assertEquals(123, value);
141142

142-
Integer value2 = restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue));
143+
Integer value2 = restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue));
143144
assertEquals(123, value2.intValue());
144145
}
145146

146147
public void testParseAsIntWithoutIntegerParameter() {
147-
RestRequest restRequest = contentRestRequest("", singletonMap(PARAMETER_KEY, "123T"));
148+
String parameterKey = randomIdentifier();
149+
RestRequest restRequest = contentRestRequest("", singletonMap(parameterKey, "123T"));
148150
int defaultValue = -1;
149151

150-
assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(PARAMETER_KEY, defaultValue); });
152+
assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(parameterKey, defaultValue); });
151153

152-
assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(PARAMETER_KEY, Integer.valueOf(defaultValue)); });
154+
assertThrows(IllegalArgumentException.class, () -> { restRequest.paramAsInt(parameterKey, Integer.valueOf(defaultValue)); });
153155
}
154156

155157
public void testContentOrSourceParam() throws IOException {

0 commit comments

Comments
 (0)