From 9b5b281fe80b8fab3076c4740ab597bdbefe872b Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Tue, 2 Dec 2014 10:11:04 +0100 Subject: [PATCH] [TEST] Ensure we have a mapping for all types on open/close --- .../search/basic/SearchWithRandomExceptionsTests.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java index 526ba610662..cd70da751d6 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -19,6 +19,7 @@ package org.elasticsearch.search.basic; +import com.carrotsearch.randomizedtesting.annotations.Repeat; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.util.English; @@ -50,6 +51,7 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTest { @@ -86,7 +88,7 @@ public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTes exceptionRate = 0d; exceptionOnOpenRate = 0d; } - boolean createIndexWithoutErrors = randomBoolean(); + final boolean createIndexWithoutErrors = randomBoolean(); long numInitialDocs = 0; if (createIndexWithoutErrors) { @@ -100,7 +102,7 @@ public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTes numInitialDocs = between(10, 100); ensureGreen(); for (int i = 0; i < numInitialDocs ; i++) { - client().prepareIndex("test", "initial", "" + i).setSource("test", "init").get(); + client().prepareIndex("test", "type", "init" + i).setSource("test", "init").get(); } client().admin().indices().prepareRefresh("test").execute().get(); client().admin().indices().prepareFlush("test").setWaitIfOngoing(true).execute().get(); @@ -171,7 +173,7 @@ public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTes searchResponse = client().prepareSearch().setTypes("type").setQuery(QueryBuilders.matchAllQuery()).get(); logger.info("Match all Successful shards: [{}] numShards: [{}]", searchResponse.getSuccessfulShards(), numShards.numPrimaries); if (searchResponse.getSuccessfulShards() == numShards.numPrimaries && !refreshFailed) { - assertThat(searchResponse.getHits().getTotalHits(), Matchers.equalTo(numCreated)); + assertThat(searchResponse.getHits().getTotalHits(), Matchers.equalTo(numCreated + numInitialDocs)); } } catch (SearchPhaseExecutionException ex) { logger.info("SearchPhaseException: [{}]", ex.getMessage()); @@ -190,7 +192,8 @@ public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTes .put(MockDirectoryHelper.RANDOM_IO_EXCEPTION_RATE_ON_OPEN, 0)); client().admin().indices().prepareOpen("test").execute().get(); ensureGreen(); - SearchResponse searchResponse = client().prepareSearch().setTypes("initial").setQuery(QueryBuilders.matchQuery("test", "init")).get(); + SearchResponse searchResponse = client().prepareSearch().setTypes("type").setQuery(QueryBuilders.matchQuery("test", "init")).get(); + assertNoFailures(searchResponse); assertHitCount(searchResponse, numInitialDocs); } }