Promote common rest test utility methods to ESRestTestCase
We have duplicates in some classes and I was about to create one more.
Original commit: elastic/x-pack-elasticsearch@fb9d0633492beb90c025e5dea97eb9c71c9705e5
@@ -10,14 +10,12 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.util.EntityUtils;
import org.elasticsearch.client.Response;
import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xpack.ml.MachineLearning;
import org.elasticsearch.xpack.ml.utils.DomainSplitFunction;
import org.joda.time.DateTime;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -27,7 +25,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.equalTo;
public class PainlessDomainSplitIT extends ESRestTestCase {
@@ -181,21 +178,6 @@ public class PainlessDomainSplitIT extends ESRestTestCase {
tests.add(new TestConfiguration(null, "shishi.xn--fiqs8s","shishi.xn--fiqs8s"));
}
- private void assertOK(Response response) {
- assertThat(response.getStatusLine().getStatusCode(), anyOf(equalTo(200), equalTo(201)));
- }
-
- private void createIndex(String name, Settings settings) throws IOException {
- assertOK(client().performRequest("PUT", name, Collections.emptyMap(),
- new StringEntity("{ \"settings\": " + Strings.toString(settings) + " }", ContentType.APPLICATION_JSON)));
- }
-
- private void createIndex(String name, Settings settings, String mapping) throws IOException {
- assertOK(client().performRequest("PUT", name, Collections.emptyMap(),
- new StringEntity("{ \"settings\": " + Strings.toString(settings)
- + ", \"mappings\" : {" + mapping + "} }", ContentType.APPLICATION_JSON)));
- }
-
public void testIsolated() throws Exception {
Settings.Builder settings = Settings.builder()
.put(IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1)
