Update EqlSearchRequest unit test for null searchAfterBuilder cases

elastic · Jan 6, 2020 · 1bd4327 · 1bd4327
1 parent 32eeae1
commit 1bd4327
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...ck/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchRequestTests.java b/...ck/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchRequestTests.java
@@ -60,15 +60,19 @@ protected NamedXContentRegistry xContentRegistry() {
     protected EqlSearchRequest createTestInstance() {
         try {
             QueryBuilder query = parseQuery(defaultTestQuery);
-            return new EqlSearchRequest()
+            EqlSearchRequest request = new EqlSearchRequest()
                 .indices(new String[]{defaultTestIndex})
                 .query(query)
                 .timestampField(randomAlphaOfLength(10))
                 .eventTypeField(randomAlphaOfLength(10))
                 .implicitJoinKeyField(randomAlphaOfLength(10))
                 .fetchSize(randomIntBetween(1, 50))
-                .searchAfter(randomJsonSearchFromBuilder().getSortValues())
                 .rule(randomAlphaOfLength(10));
+
+            if (randomBoolean()) {
+                request.searchAfter(randomJsonSearchFromBuilder());
+            }
+            return request;
         } catch (IOException ex) {
             assertNotNull("unexpected IOException " + ex.getCause().getMessage(), ex);
         }
@@ -101,7 +105,7 @@ private Object randomValue() {
         return value.get();
     }
 
-    private SearchAfterBuilder randomJsonSearchFromBuilder() throws IOException {
+    private Object[] randomJsonSearchFromBuilder() throws IOException {
         int numSearchAfter = randomIntBetween(1, 10);
         XContentBuilder jsonBuilder = XContentFactory.jsonBuilder();
         jsonBuilder.startObject();
@@ -115,7 +119,7 @@ private SearchAfterBuilder randomJsonSearchFromBuilder() throws IOException {
             parser.nextToken();
             parser.nextToken();
             parser.nextToken();
-            return SearchAfterBuilder.fromXContent(parser);
+            return SearchAfterBuilder.fromXContent(parser).getSortValues();
         }
     }