Make `:server:check` pass successfully (#471)
* Fix package names in classes of the dummy plugin jars. The `PluginsServiceTests` uses couple of dummy plugin jars from the resources directory. The jars have classes with imports with package name `org.elasticsearch.*`. This commit recreates the jars after renaming those package names. * Fix the failing server tests as a result of renaming metadata prefix. As we changed the metadata prefix in `OpenSearchException` from `es.` to `opensearch.` (commit13f6d23), the order of the keys in the `HashMap` changed. However, the tests are expecting a value which relies on a certain order . Ideally, these tests should not assume the order. This commit doesn't rewrite the test but only changes the order so the tests pass. * Properly rename the data examples to fix test failure. As part of the commit0bdd129, we renamed the data examples in used in the test cases. This caused the test failures in `SimpleNestedIT` as it was sorting the results and the rename changed the order of the search result. In `SearchQueryIT`, we missed to rename the term used in the query. This commit fixes both the issues. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda
GitHub
parent
ffc561d7ef
commit
bc45d715d7
|
|
@ -200,7 +200,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
|
||||
|
||||
searchResponse = client().prepareSearch("test").setQuery(nestedQuery("nested1.nested2",
|
||||
termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)).get();
|
||||
termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)).get();
|
||||
assertNoFailures(searchResponse);
|
||||
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
|
||||
|
||||
|
|
@ -552,16 +552,16 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
+ " {\n"
|
||||
+ " \"name\": \"read\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"matt\", \"id\": 1},\n"
|
||||
+ " {\"username\": \"fred\", \"id\": 2},\n"
|
||||
+ " {\"username\": \"adrien\", \"id\": 3}\n"
|
||||
+ " {\"username\": \"grault\", \"id\": 1},\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 2},\n"
|
||||
+ " {\"username\": \"bar\", \"id\": 3}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"write\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"fred\", \"id\": 2},\n"
|
||||
+ " {\"username\": \"adrien\", \"id\": 3}\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 2},\n"
|
||||
+ " {\"username\": \"bar\", \"id\": 3}\n"
|
||||
+ " ]\n"
|
||||
+ " }\n"
|
||||
+ " ]\n"
|
||||
|
|
@ -572,20 +572,20 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
+ " {\n"
|
||||
+ " \"name\": \"read\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"jim\", \"id\": 4},\n"
|
||||
+ " {\"username\": \"fred\", \"id\": 2}\n"
|
||||
+ " {\"username\": \"baz\", \"id\": 4},\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 2}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"write\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"fred\", \"id\": 2}\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 2}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"execute\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"fred\", \"id\": 2}\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 2}\n"
|
||||
+ " ]\n"
|
||||
+ " }\n"
|
||||
+ " ]\n"
|
||||
|
|
@ -601,14 +601,14 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
+ " {\n"
|
||||
+ " \"name\": \"read\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"matt\", \"id\": 1},\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 5}\n"
|
||||
+ " {\"username\": \"grault\", \"id\": 1},\n"
|
||||
+ " {\"username\": \"foo\", \"id\": 5}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"execute\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"quxx\", \"id\": 5}\n"
|
||||
+ " {\"username\": \"foo\", \"id\": 5}\n"
|
||||
+ " ]\n"
|
||||
+ " }\n"
|
||||
+ " ]\n"
|
||||
|
|
@ -619,19 +619,19 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
+ " {\n"
|
||||
+ " \"name\": \"read\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"matt\", \"id\": 1}\n"
|
||||
+ " {\"username\": \"grault\", \"id\": 1}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"write\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"matt\", \"id\": 1}\n"
|
||||
+ " {\"username\": \"grault\", \"id\": 1}\n"
|
||||
+ " ]\n"
|
||||
+ " },\n"
|
||||
+ " {\n"
|
||||
+ " \"name\": \"execute\",\n"
|
||||
+ " \"user\": [\n"
|
||||
+ " {\"username\": \"matt\", \"id\": 1}\n"
|
||||
+ " {\"username\": \"grault\", \"id\": 1}\n"
|
||||
+ " ]\n"
|
||||
+ " }\n"
|
||||
+ " ]\n"
|
||||
|
|
@ -640,7 +640,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
+ "}", XContentType.JSON).get();
|
||||
refresh();
|
||||
|
||||
// access id = 1, read, max value, asc, should use matt and fred
|
||||
// access id = 1, read, max value, asc, should use grault and quxx
|
||||
SearchResponse searchResponse = client().prepareSearch()
|
||||
.setQuery(matchAllQuery())
|
||||
.addSort(
|
||||
|
|
@ -658,12 +658,12 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
assertHitCount(searchResponse, 2);
|
||||
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("2"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("matt"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("grault"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("1"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("fred"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("quxx"));
|
||||
|
||||
|
||||
// access id = 1, read, min value, asc, should now use adrien and quxx
|
||||
// access id = 1, read, min value, asc, should now use bar and foo
|
||||
searchResponse = client().prepareSearch()
|
||||
.setQuery(matchAllQuery())
|
||||
.addSort(
|
||||
|
|
@ -681,11 +681,11 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
assertHitCount(searchResponse, 2);
|
||||
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("1"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("adrien"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("bar"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("2"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("quxx"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("foo"));
|
||||
|
||||
// execute, by matt or quxx, by user id, sort missing first
|
||||
// execute, by grault or foo, by user id, sort missing first
|
||||
searchResponse = client().prepareSearch()
|
||||
.setQuery(matchAllQuery())
|
||||
.addSort(
|
||||
|
|
@ -694,7 +694,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
.setNestedSort(new NestedSortBuilder("acl.operation")
|
||||
.setFilter(QueryBuilders.termQuery("acl.operation.name", "execute"))
|
||||
.setNestedSort(new NestedSortBuilder("acl.operation.user")
|
||||
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "matt", "quxx")))))
|
||||
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "grault", "foo")))))
|
||||
.missing("_first")
|
||||
.sortMode(SortMode.MIN)
|
||||
.order(SortOrder.DESC)
|
||||
|
|
@ -707,7 +707,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("2"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("1"));
|
||||
|
||||
// execute, by matt or luca, by username, sort missing last (default)
|
||||
// execute, by grault or foo, by username, sort missing last (default)
|
||||
searchResponse = client().prepareSearch()
|
||||
.setQuery(matchAllQuery())
|
||||
.addSort(
|
||||
|
|
@ -716,7 +716,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
.setNestedSort(new NestedSortBuilder("acl.operation")
|
||||
.setFilter(QueryBuilders.termQuery("acl.operation.name", "execute"))
|
||||
.setNestedSort(new NestedSortBuilder("acl.operation.user")
|
||||
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "matt", "quxx")))))
|
||||
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "grault", "foo")))))
|
||||
.sortMode(SortMode.MIN)
|
||||
.order(SortOrder.DESC)
|
||||
)
|
||||
|
|
@ -725,7 +725,7 @@ public class SimpleNestedIT extends OpenSearchIntegTestCase {
|
|||
assertHitCount(searchResponse, 2);
|
||||
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("2"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("quxx"));
|
||||
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("foo"));
|
||||
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("1")); // missing last
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -924,7 +924,7 @@ public class SearchQueryIT extends OpenSearchIntegTestCase {
|
|||
client().prepareIndex("test", "type1", "2").setSource("str", "fred", "date", "2012-02-05", "num", 20).get();
|
||||
refresh();
|
||||
|
||||
SearchResponse searchResponse = client().prepareSearch().setQuery(queryStringQuery("str:kimcy~1")).get();
|
||||
SearchResponse searchResponse = client().prepareSearch().setQuery(queryStringQuery("str:foobaz~1")).get();
|
||||
assertNoFailures(searchResponse);
|
||||
assertHitCount(searchResponse, 1L);
|
||||
assertFirstHit(searchResponse, hasId("1"));
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ public class OpenSearchExceptionTests extends OpenSearchTestCase {
|
|||
"\"phase\":\"search\",\"grouped\":true,\"failed_shards\":[{\"shard\":1,\"index\":\"foo\",\"node\":\"node_1\"," +
|
||||
"\"reason\":{\"type\":\"parsing_exception\",\"reason\":\"foobar\",\"line\":1,\"col\":2}},{\"shard\":1," +
|
||||
"\"index\":\"foo1\",\"node\":\"node_1\",\"reason\":{\"type\":\"query_shard_exception\",\"reason\":\"foobar\"," +
|
||||
"\"index_uuid\":\"_na_\",\"index\":\"foo1\"}}]}";
|
||||
"\"index\":\"foo1\",\"index_uuid\":\"_na_\"}}]}";
|
||||
assertEquals(expected, Strings.toString(builder));
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,9 +82,9 @@ public class SearchPhaseExecutionExceptionTests extends OpenSearchTestCase {
|
|||
+ " \"reason\": {"
|
||||
+ " \"type\": \"index_shard_closed_exception\","
|
||||
+ " \"reason\": \"CurrentState[CLOSED] Closed\","
|
||||
+ " \"index_uuid\": \"_na_\","
|
||||
+ " \"index\": \"foo\","
|
||||
+ " \"shard\": \"1\","
|
||||
+ " \"index\": \"foo\""
|
||||
+ " \"index_uuid\": \"_na_\""
|
||||
+ " }"
|
||||
+ " }"
|
||||
+ " ]"
|
||||
|
|
|
|||
|
|
@ -141,8 +141,8 @@ public class RestActionsTests extends OpenSearchTestCase {
|
|||
" \"reason\" : {\n" +
|
||||
" \"type\" : \"parsing_exception\",\n" +
|
||||
" \"reason\" : \"error\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"index\" : \"index\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"line\" : 0,\n" +
|
||||
" \"col\" : 0,\n" +
|
||||
" \"caused_by\" : {\n" +
|
||||
|
|
@ -158,8 +158,8 @@ public class RestActionsTests extends OpenSearchTestCase {
|
|||
" \"reason\" : {\n" +
|
||||
" \"type\" : \"parsing_exception\",\n" +
|
||||
" \"reason\" : \"error\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"index\" : \"index\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"line\" : 0,\n" +
|
||||
" \"col\" : 0,\n" +
|
||||
" \"caused_by\" : {\n" +
|
||||
|
|
@ -175,8 +175,8 @@ public class RestActionsTests extends OpenSearchTestCase {
|
|||
" \"reason\" : {\n" +
|
||||
" \"type\" : \"parsing_exception\",\n" +
|
||||
" \"reason\" : \"error\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"index\" : \"index\",\n" +
|
||||
" \"index_uuid\" : \"_na_\",\n" +
|
||||
" \"line\" : 0,\n" +
|
||||
" \"col\" : 0,\n" +
|
||||
" \"caused_by\" : {\n" +
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue