diff options
Diffstat (limited to 'qa/smoke-test-http/src/test/java')
-rw-r--r-- | qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java | 3 | ||||
-rw-r--r-- | qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsEnabledIT.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java index 2cf681e9e5..51dbad22de 100644 --- a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java +++ b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java @@ -24,7 +24,6 @@ import org.elasticsearch.client.Response; import org.elasticsearch.client.ResponseException; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.Scope; @@ -54,7 +53,7 @@ public class DetailedErrorsDisabledIT extends HttpSmokeTestCase { fail("request should have failed"); } catch(ResponseException e) { Response response = e.getResponse(); - assertThat(response.getHeader("Content-Type"), is("application/json")); + assertThat(response.getHeader("Content-Type"), is("application/json; charset=UTF-8")); assertThat(EntityUtils.toString(e.getResponse().getEntity()), is("{\"error\":\"error traces in responses are disabled.\"}")); assertThat(response.getStatusLine().getStatusCode(), is(400)); } diff --git a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsEnabledIT.java b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsEnabledIT.java index cd3cf1a38d..d0b80595a2 100644 --- a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsEnabledIT.java +++ b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsEnabledIT.java @@ -22,7 +22,6 @@ package org.elasticsearch.http; import org.apache.http.util.EntityUtils; import org.elasticsearch.client.Response; import org.elasticsearch.client.ResponseException; -import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; import java.util.Collections; @@ -52,7 +51,7 @@ public class DetailedErrorsEnabledIT extends HttpSmokeTestCase { fail("request should have failed"); } catch(ResponseException e) { Response response = e.getResponse(); - assertThat(response.getHeader("Content-Type"), containsString("application/json")); + assertThat(response.getHeader("Content-Type"), containsString("application/json; charset=UTF-8")); assertThat(EntityUtils.toString(response.getEntity()), not(containsString("\"stack_trace\":\"[Validation Failed: 1: index / indices is missing;]; " + "nested: ActionRequestValidationException[Validation Failed: 1:"))); |