honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] make headers case-insensitive when running yaml tests

This commit is contained in:
javanna 2017-02-22 18:06:23 +01:00 committed by Luca Cavanna
parent 4f487ab1b9
commit 756e26cb33
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java
View File

@ -61,10 +61,6 @@ public class ApiCallSection {
this.headers.putAll(otherHeaders);
}
public void addHeader(String key, String value) {
this.headers.put(key, value);
}
public Map<String, String> getHeaders() {
return unmodifiableMap(headers);
}

7
test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
View File

@ -38,6 +38,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import static java.util.Collections.emptyList;
import static java.util.Collections.unmodifiableList;
@ -77,7 +78,7 @@ public class DoSection implements ExecutableSection {
DoSection doSection = new DoSection(parser.getTokenLocation());
ApiCallSection apiCallSection = null;
Map<String, String> headers = new HashMap<>();
Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
List<String> expectedWarnings = new ArrayList<>();
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
@ -138,9 +139,7 @@ public class DoSection implements ExecutableSection {
if (apiCallSection == null) {
throw new IllegalArgumentException("client call section is mandatory within a do section");
}
if (headers.isEmpty() == false) {
apiCallSection.addHeaders(headers);
}
apiCallSection.addHeaders(headers);
doSection.setApiCallSection(apiCallSection);
doSection.setExpectedWarningHeaders(unmodifiableList(expectedWarnings));
} finally {