diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java index 1e16357a24412..8afdbc5906491 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java @@ -779,17 +779,13 @@ public void testTaskStoringSuccessfulResult() throws Exception { assertNoFailures(indicesAdmin().prepareRefresh(TaskResultsService.TASK_INDEX).get()); assertHitCount( + 1L, prepareSearch(TaskResultsService.TASK_INDEX).setSource( SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.action", taskInfo.action())) ), - 1L - ); - - assertHitCount( prepareSearch(TaskResultsService.TASK_INDEX).setSource( SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.node", taskInfo.taskId().getNodeId())) - ), - 1L + ) ); GetTaskResponse getResponse = expectFinishedTask(taskId); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java index ca9fdb27ac389..4e9304a7979d6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java @@ -113,8 +113,11 @@ public void testCreateShrinkIndexToN() { .get(); } flushAndRefresh(); - assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount( + 20, + prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), + prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")) + ); // relocate all shards to one node such that we can merge it. updateIndexSettings( @@ -145,9 +148,12 @@ public void testCreateShrinkIndexToN() { .get(); } flushAndRefresh(); - assertHitCount(prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount( + 20, + prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), + prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), + prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")) + ); assertNoResizeSourceIndexSettings("first_shrink"); assertNoResizeSourceIndexSettings("second_shrink"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java index 9ba6ac4bd9c58..980e94fd5dfce 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java @@ -236,9 +236,12 @@ private void splitToN(int sourceShards, int firstSplitShards, int secondSplitSha GetResponse getResponse = client().prepareGet("second_split", Integer.toString(i)).setRouting(routingValue[i]).get(); assertTrue(getResponse.isExists()); } - assertHitCount(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); - assertHitCount(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); - assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount( + numDocs, + prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), + prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), + prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")) + ); if (useNested) { assertNested("source", numDocs); assertNested("first_split", numDocs); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java index f7bf775bc4f8b..a37fb25052ac5 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java @@ -683,9 +683,12 @@ public void testDynamicRuntimeNoConflicts() { BulkResponse bulkItemResponses = client().bulk(bulkRequest).actionGet(); assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures()); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")), 1); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)), 1); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")), 1); + assertHitCount( + 1, + prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")), + prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)), + prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")) + ); } public void testDynamicRuntimeObjectFields() { @@ -722,10 +725,13 @@ public void testDynamicRuntimeObjectFields() { BulkResponse bulkItemResponses = client().bulk(bulkRequest).actionGet(); assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures()); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)), 1); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")), 1); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")), 1); - assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")), 1); + assertHitCount( + 1, + prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)), + prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")), + prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")), + prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")) + ); Exception exception = expectThrows(DocumentParsingException.class, prepareIndex("test").setSource("obj.runtime", "value")); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java index fea5d256b1993..4a7de4b0ebc23 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java @@ -91,11 +91,11 @@ public void testGeoPointMultiField() throws Exception { GeoPoint point = new GeoPoint(51, 19); prepareIndex("my-index").setId("1").setSource("a", point.toString()).setRefreshPolicy(IMMEDIATE).get(); assertHitCount( + 1L, prepareSearch("my-index").setSize(0) .setQuery(constantScoreQuery(geoDistanceQuery("a").point(51, 19).distance(50, DistanceUnit.KILOMETERS))), - 1L + prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", point.geohash())) ); - assertHitCount(prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", point.geohash())), 1L); } @SuppressWarnings("unchecked") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java index 199c9a9fb4c8c..e14c7c8368917 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java @@ -123,19 +123,25 @@ public void testAliasSearchRouting() throws Exception { logger.info("--> search with wrong routing, should not find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch("alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 0); + assertHitCount( + 0, + prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with correct routing, should find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch().setSize(0).setRouting("0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias0").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 1); + assertHitCount( + 1, + prepareSearch().setRouting("0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> indexing with id [2], and routing [1] using alias"); @@ -143,50 +149,71 @@ public void testAliasSearchRouting() throws Exception { logger.info("--> search with no routing, should fine two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch().setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with 0 routing, should find one"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch().setSize(0).setRouting("0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias0").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 1); + assertHitCount( + 1, + prepareSearch().setRouting("0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with 1 routing, should find one"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 1); + assertHitCount( + 1, + prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with 0,1 indexRoutings , should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("0", "1").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch().setSize(0).setRouting("0", "1").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias01").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias01").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch().setRouting("0", "1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("0", "1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias01").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias01").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with two routing aliases , should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias0", "alias1").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias0", "alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("alias0", "alias1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0", "alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with alias0, alias1 and alias01, should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias0", "alias1", "alias01").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias0", "alias1", "alias01").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("alias0", "alias1", "alias01").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias0", "alias1", "alias01").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with test, alias0 and alias1, should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("test", "alias0", "alias1").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("test", "alias0", "alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("test", "alias0", "alias1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("test", "alias0", "alias1").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } } @@ -236,20 +263,29 @@ public void testAliasSearchRoutingWithTwoIndices() throws Exception { logger.info("--> search with alias-a1,alias-b0, should not find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias-a1", "alias-b0").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch("alias-a1", "alias-b0").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 0); + assertHitCount( + 0, + prepareSearch("alias-a1", "alias-b0").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias-a1", "alias-b0").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with alias-ab, should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias-ab").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias-ab").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("alias-ab").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias-ab").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with alias-a0,alias-b1 should find two"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias-a0", "alias-b1").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias-a0", "alias-b1").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("alias-a0", "alias-b1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias-a0", "alias-b1").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } } @@ -317,8 +353,11 @@ public void testIndexingAliasesOverTime() throws Exception { logger.info("--> verifying get and search with routing, should find"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "0").setRouting("3").get().isExists(), equalTo(true)); - assertHitCount(prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 1); + assertHitCount( + 1, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> creating alias with routing [4]"); @@ -326,8 +365,11 @@ public void testIndexingAliasesOverTime() throws Exception { logger.info("--> verifying search with wrong routing should not find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 0); + assertHitCount( + 0, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> creating alias with search routing [3,4] and index routing 4"); @@ -344,8 +386,11 @@ public void testIndexingAliasesOverTime() throws Exception { for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "0").setRouting("3").get().isExists(), equalTo(true)); assertThat(client().prepareGet("test", "1").setRouting("4").get().isExists(), equalTo(true)); - assertHitCount(prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), 2); - assertHitCount(prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()), 2); + assertHitCount( + 2, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch("alias").setSize(0).setQuery(QueryBuilders.matchAllQuery()) + ); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java index 246138fa5573d..06d850e0d9abc 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java @@ -141,14 +141,20 @@ public void testSimpleSearchRouting() { logger.info("--> search with wrong routing, should not find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 0); - assertHitCount(prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()), 0); + assertHitCount( + 0, + prepareSearch().setRouting("1").setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting("1").setQuery(QueryBuilders.matchAllQuery()) + ); } logger.info("--> search with correct routing, should find"); for (int i = 0; i < 5; i++) { - assertHitCount(prepareSearch().setRouting(routingValue).setQuery(QueryBuilders.matchAllQuery()), 1); - assertHitCount(prepareSearch().setSize(0).setRouting(routingValue).setQuery(QueryBuilders.matchAllQuery()), 1); + assertHitCount( + 1, + prepareSearch().setRouting(routingValue).setQuery(QueryBuilders.matchAllQuery()), + prepareSearch().setSize(0).setRouting(routingValue).setQuery(QueryBuilders.matchAllQuery()) + ); } String secondRoutingValue = "1"; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java index f790cf30e1c0e..6d1f2784a739c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -164,22 +164,19 @@ public void testIssue3177() { forceMerge(); refresh(); assertHitCount( + 3L, prepareSearch().setQuery(matchAllQuery()) .setPostFilter( boolQuery().must(matchAllQuery()) .must(boolQuery().mustNot(boolQuery().must(termQuery("field1", "value1")).must(termQuery("field1", "value2")))) ), - 3L - ); - assertHitCount( prepareSearch().setQuery( boolQuery().must( boolQuery().should(termQuery("field1", "value1")) .should(termQuery("field1", "value2")) .should(termQuery("field1", "value3")) ).filter(boolQuery().mustNot(boolQuery().must(termQuery("field1", "value1")).must(termQuery("field1", "value2")))) - ), - 3L + ) ); assertHitCount(prepareSearch().setQuery(matchAllQuery()).setPostFilter(boolQuery().mustNot(termQuery("field1", "value3"))), 2L); } @@ -309,11 +306,14 @@ public void testQueryStringAnalyzedWildcard() throws Exception { prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); refresh(); - assertHitCount(prepareSearch().setQuery(queryStringQuery("value*")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("*ue*")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("*ue_1")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("val*e_1")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("v?l*e?1")), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(queryStringQuery("value*")), + prepareSearch().setQuery(queryStringQuery("*ue*")), + prepareSearch().setQuery(queryStringQuery("*ue_1")), + prepareSearch().setQuery(queryStringQuery("val*e_1")), + prepareSearch().setQuery(queryStringQuery("v?l*e?1")) + ); } public void testLowercaseExpandedTerms() { @@ -322,10 +322,13 @@ public void testLowercaseExpandedTerms() { prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); refresh(); - assertHitCount(prepareSearch().setQuery(queryStringQuery("VALUE_3~1")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("ValUE_*")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("vAl*E_1")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("[VALUE_1 TO VALUE_3]")), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(queryStringQuery("VALUE_3~1")), + prepareSearch().setQuery(queryStringQuery("ValUE_*")), + prepareSearch().setQuery(queryStringQuery("vAl*E_1")), + prepareSearch().setQuery(queryStringQuery("[VALUE_1 TO VALUE_3]")) + ); } // Issue #3540 @@ -340,8 +343,11 @@ public void testDateRangeInQueryString() { prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); refresh(); - assertHitCount(prepareSearch().setQuery(queryStringQuery("past:[now-2M/d TO now/d]")), 1L); - assertHitCount(prepareSearch().setQuery(queryStringQuery("future:[now/d TO now+2M/d]")), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(queryStringQuery("past:[now-2M/d TO now/d]")), + prepareSearch().setQuery(queryStringQuery("future:[now/d TO now+2M/d]")) + ); SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, @@ -377,21 +383,17 @@ public void testDateRangeInQueryStringWithTimeZone_10477() { refresh(); // Timezone set with dates - assertHitCount(prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00+0200 TO 2015-04-06T23:00:00+0200]")), 2L); - - // Same timezone set with time_zone assertHitCount( - prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00 TO 2015-04-06T23:00:00]").timeZone("+0200")), - 2L + 2L, + prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00+0200 TO 2015-04-06T23:00:00+0200]")), + prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00 TO 2015-04-06T23:00:00]").timeZone("+0200")) ); // We set a timezone which will give no result - assertHitCount(prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00-0200 TO 2015-04-06T23:00:00-0200]")), 0L); - - // Same timezone set with time_zone but another timezone is set directly within dates which has the precedence assertHitCount( - prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00-0200 TO 2015-04-06T23:00:00-0200]").timeZone("+0200")), - 0L + 0L, + prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00-0200 TO 2015-04-06T23:00:00-0200]")), + prepareSearch().setQuery(queryStringQuery("past:[2015-04-06T00:00:00-0200 TO 2015-04-06T23:00:00-0200]").timeZone("+0200")) ); } @@ -502,13 +504,12 @@ public void testPassQueryOrFilterAsJSONString() throws Exception { prepareIndex("test").setId("1").setSource("field1", "value1_1", "field2", "value2_1").setRefreshPolicy(IMMEDIATE).get(); WrapperQueryBuilder wrapper = new WrapperQueryBuilder("{ \"term\" : { \"field1\" : \"value1_1\" } }"); - assertHitCount(prepareSearch().setQuery(wrapper), 1L); - - BoolQueryBuilder bool = boolQuery().must(wrapper).must(new TermQueryBuilder("field2", "value2_1")); - assertHitCount(prepareSearch().setQuery(bool), 1L); - - WrapperQueryBuilder wrapperFilter = wrapperQuery("{ \"term\" : { \"field1\" : \"value1_1\" } }"); - assertHitCount(prepareSearch().setPostFilter(wrapperFilter), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(wrapper), + prepareSearch().setQuery(boolQuery().must(wrapper).must(new TermQueryBuilder("field2", "value2_1"))), + prepareSearch().setPostFilter(wrapperQuery("{ \"term\" : { \"field1\" : \"value1_1\" } }")) + ); } public void testFiltersWithCustomCacheKey() throws Exception { @@ -516,10 +517,13 @@ public void testFiltersWithCustomCacheKey() throws Exception { prepareIndex("test").setId("1").setSource("field1", "value1").get(); refresh(); - assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); + assertHitCount( + 1L, + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))) + ); } public void testMatchQueryNumeric() throws Exception { @@ -994,13 +998,14 @@ public void testTermsLookupFilter() throws Exception { "4" ); - assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("not_exists", new TermsLookup("lookup2", "3", "arr.term"))), 0L); - - // index "lookup" id "missing" document does not exist: ignore the lookup terms - assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "missing", "terms"))), 0L); - - // index "lookup3" has the source disabled: ignore the lookup terms - assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup3", "1", "terms"))), 0L); + assertHitCount( + 0L, + prepareSearch("test").setQuery(termsLookupQuery("not_exists", new TermsLookup("lookup2", "3", "arr.term"))), + // index "lookup" id "missing" document does not exist: ignore the lookup terms + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "missing", "terms"))), + // index "lookup3" has the source disabled: ignore the lookup terms + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup3", "1", "terms"))) + ); } public void testBasicQueryById() throws Exception { @@ -1120,18 +1125,14 @@ public void testNumericRangeFilter_2826() throws Exception { refresh(); assertHitCount( + 4L, prepareSearch("test").setPostFilter( boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4)) ), - 4L - ); - - // This made 2826 fail! (only with bit based filters) - assertHitCount( + // This made 2826 fail! (only with bit based filters) prepareSearch("test").setPostFilter( boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4)) - ), - 4L + ) ); // This made #2979 fail! @@ -1697,11 +1698,11 @@ public void testWildcardQueryNormalizationOnKeywordField() { refresh(); { - WildcardQueryBuilder wildCardQuery = wildcardQuery("field1", "Bb*"); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); - - wildCardQuery = wildcardQuery("field1", "bb*"); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(wildcardQuery("field1", "Bb*")), + prepareSearch().setQuery(wildcardQuery("field1", "bb*")) + ); } } @@ -1725,12 +1726,12 @@ public void testWildcardQueryNormalizationOnTextField() { WildcardQueryBuilder wildCardQuery = wildcardQuery("field1", "Bb*"); assertHitCount(prepareSearch().setQuery(wildCardQuery), 0L); - // the following works not because of normalization but because of the `case_insensitive` parameter - wildCardQuery = wildcardQuery("field1", "Bb*").caseInsensitive(true); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); - - wildCardQuery = wildcardQuery("field1", "bb*"); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); + assertHitCount( + 1L, + // the following works not because of normalization but because of the `case_insensitive` parameter + prepareSearch().setQuery(wildcardQuery("field1", "Bb*").caseInsensitive(true)), + prepareSearch().setQuery(wildcardQuery("field1", "bb*")) + ); } } @@ -1751,11 +1752,11 @@ public void testWildcardQueryNormalizationKeywordSpecialCharacters() { prepareIndex("test").setId("1").setSource("field", "label-1").get(); refresh(); - WildcardQueryBuilder wildCardQuery = wildcardQuery("field", "la*"); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); - - wildCardQuery = wildcardQuery("field", "la*el-?"); - assertHitCount(prepareSearch().setQuery(wildCardQuery), 1L); + assertHitCount( + 1L, + prepareSearch().setQuery(wildcardQuery("field", "la*")), + prepareSearch().setQuery(wildcardQuery("field", "la*el-?")) + ); } public static class MockAnalysisPlugin extends Plugin implements AnalysisPlugin {