Improved test

Removed needless delete lines, added log lines and shared ensureGreen calls

src/test/java/org/elasticsearch/test/integration/indices/wamer/SimpleIndicesWarmerTests.java

@@ -22,7 +22,6 @@ package org.elasticsearch.test.integration.indices.wamer;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.admin.indices.warmer.get.GetWarmersResponse;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.warmer.IndexWarmerMissingException;
@@ -41,13 +40,10 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
     @Test
     public void simpleWarmerTests() {
-        client().admin().indices().prepareDelete().execute().actionGet();
-
         client().admin().indices().prepareCreate("test")
                 .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1))
                 .execute().actionGet();
-
-        client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();
+        ensureGreen();
 
         client().admin().indices().preparePutWarmer("warmer_1")
                 .setSearchRequest(client().prepareSearch("test").setTypes("a1").setQuery(QueryBuilders.termQuery("field", "value1")))
@@ -98,8 +94,6 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
     @Test
     public void templateWarmer() {
-        client().admin().indices().prepareDelete().execute().actionGet();
-
         client().admin().indices().preparePutTemplate("template_1")
                 .setSource("{\n" +
                         "    \"template\" : \"*\",\n" +
@@ -119,8 +113,7 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
         client().admin().indices().prepareCreate("test")
                 .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1))
                 .execute().actionGet();
-
-        client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();
+        ensureGreen();
 
         ClusterState clusterState = client().admin().cluster().prepareState().execute().actionGet().getState();
         IndexWarmersMetaData warmersMetaData = clusterState.metaData().index("test").custom(IndexWarmersMetaData.TYPE);
@@ -133,8 +126,6 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
     @Test
     public void createIndexWarmer() {
-        client().admin().indices().prepareDelete().execute().actionGet();
-
         client().admin().indices().prepareCreate("test")
                 .setSource("{\n" +
                         "    \"settings\" : {\n" +
@@ -164,8 +155,6 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
     @Test
     public void deleteNonExistentIndexWarmerTest() {
-        client().admin().indices().prepareDelete().execute().actionGet();
-
         client().admin().indices().prepareCreate("test").execute().actionGet();
 
         try {
@@ -178,12 +167,10 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
     @Test // issue 3246
     public void ensureThatIndexWarmersCanBeChangedOnRuntime() throws Exception {
-        client().admin().indices().prepareDelete().execute().actionGet();
         client().admin().indices().prepareCreate("test")
                 .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1, "index.number_of_replicas", 0))
                 .execute().actionGet();
-
-        client().admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet();
+        ensureGreen();
 
         client().admin().indices().preparePutWarmer("custom_warmer")
                 .setSearchRequest(client().prepareSearch("test").setTypes("test").setQuery(QueryBuilders.matchAllQuery()))
@@ -191,10 +178,11 @@ public class SimpleIndicesWarmerTests extends AbstractSharedClusterTest {
 
         client().prepareIndex("test", "test", "1").setSource("foo", "bar").setRefresh(true).execute().actionGet();
 
+        logger.info("--> Disabling warmers execution");
         client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder().put("index.warmer.enabled", false)).execute().actionGet();
 
         long warmerRunsAfterDisabling = getWarmerRuns();
-        assertThat(getWarmerRuns(), greaterThanOrEqualTo(1L));
+        assertThat(warmerRunsAfterDisabling, greaterThanOrEqualTo(1L));
 
         client().prepareIndex("test", "test", "2").setSource("foo2", "bar2").setRefresh(true).execute().actionGet();