honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix failed compilation under jdk 6

This commit is contained in:
Shay Banon 2013-11-14 22:46:34 +01:00
parent 499cff3b1e
commit 3b30192c8f
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java
View File

@ -1906,24 +1906,24 @@ public class SimpleQueryTests extends ElasticsearchIntegrationTest {
.setQuery(indicesQuery(matchQuery("text", "value1"), "index1")
.noMatchQuery(matchQuery("text", "value2"))).get();
assertHitCount(response, 2l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2")));
//default no match query is match_all
response = client().prepareSearch("index1", "index2", "index3")
.setQuery(indicesQuery(matchQuery("text", "value1"), "index1")).get();
assertHitCount(response, 3l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
response = client().prepareSearch("index1", "index2", "index3")
.setQuery(indicesQuery(matchQuery("text", "value1"), "index1")
.noMatchQuery("all")).get();
assertHitCount(response, 3l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
response = client().prepareSearch("index1", "index2", "index3")
.setQuery(indicesQuery(matchQuery("text", "value1"), "index1")
@ -1946,24 +1946,24 @@ public class SimpleQueryTests extends ElasticsearchIntegrationTest {
.setFilter(indicesFilter(termFilter("text", "value1"), "index1")
.noMatchFilter(termFilter("text", "value2"))).get();
assertHitCount(response, 2l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2")));
//default no match filter is "all"
response = client().prepareSearch("index1", "index2", "index3")
.setFilter(indicesFilter(termFilter("text", "value1"), "index1")).get();
assertHitCount(response, 3l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
response = client().prepareSearch("index1", "index2", "index3")
.setFilter(indicesFilter(termFilter("text", "value1"), "index1")
.noMatchFilter("all")).get();
assertHitCount(response, 3l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), either(equalTo("1")).or(equalTo("2")).or(equalTo("3")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
assertThat(response.getHits().getAt(2).getId(), anyOf(equalTo("1"), equalTo("2"), equalTo("3")));
response = client().prepareSearch("index1", "index2", "index3")
.setFilter(indicesFilter(termFilter("text", "value1"), "index1")
@ -2003,8 +2003,8 @@ public class SimpleQueryTests extends ElasticsearchIntegrationTest {
.setQuery(indicesQuery(hasChildQuery("child", matchQuery("text", "value2")), "related")
.noMatchQuery(matchQuery("text", "value1"))).get();
assertHitCount(response, 2l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2")));
}
@Test // https://github.com/elasticsearch/elasticsearch/issues/2416
@ -2037,7 +2037,7 @@ public class SimpleQueryTests extends ElasticsearchIntegrationTest {
.setFilter(indicesFilter(hasChildFilter("child", termFilter("text", "value2")), "related")
.noMatchFilter(termFilter("text", "value1"))).get();
assertHitCount(response, 2l);
assertThat(response.getHits().getAt(0).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), either(equalTo("1")).or(equalTo("2")));
assertThat(response.getHits().getAt(0).getId(), anyOf(equalTo("1"), equalTo("2")));
assertThat(response.getHits().getAt(1).getId(), anyOf(equalTo("1"), equalTo("2")));
}
}