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

EQL: Improve testing spec (#59615) 

Case sensitivity is incorporated as a test dimension - instead of
running the same test twice, two different tests are created.
Clean-up the test invocation by removing unused parameters.

Fix #59294

(cherry picked from commit 72c8a3582d8e8a4a663d82814a17a1a3d2757292)
This commit is contained in:
Costin Leau 2020-07-15 17:55:26 +03:00 committed by Costin Leau
parent b5ab447b3e
commit 6b75525efb
3 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/CommonEqlActionTestCase.java
View File

@ -18,6 +18,7 @@ import org.elasticsearch.client.eql.EqlSearchResponse;
import org.elasticsearch.client.eql.EqlSearchResponse.Hits;
import org.elasticsearch.client.eql.EqlSearchResponse.Sequence;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.logging.LoggerMessageFormat;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.junit.After;
@ -30,7 +31,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.stream.Collectors.toList;
import static org.elasticsearch.test.eql.DataLoader.testIndexName;
@ -91,44 +91,42 @@ public abstract class CommonEqlActionTestCase extends ESRestTestCase {
}
private static List<Object[]> asArray(List<EqlSpec> specs) {
AtomicInteger counter = new AtomicInteger();
return specs.stream().map(spec -> {
int counter = 0;
List<Object[]> results = new ArrayList<>();
for (EqlSpec spec : specs) {
String name = spec.name();
if (Strings.isNullOrEmpty(name)) {
name = spec.note();
}
if (Strings.isNullOrEmpty(name)) {
name = "" + (counter.get() + 1);
name = "" + (counter);
}
return new Object[] { counter.incrementAndGet(), name, spec };
}).collect(toList());
boolean[] values = spec.caseSensitive() == null ? new boolean[] { true, false } : new boolean[] { spec.caseSensitive() };
for (boolean bool : values) {
results.add(new Object[] { spec.query(), name, spec.expectedEventIds(), bool });
}
}
return results;
}
private final int num;
private final String query;
private final String name;
private final EqlSpec spec;
private final long[] eventIds;
private final boolean caseSensitive;
public CommonEqlActionTestCase(int num, String name, EqlSpec spec) {
this.num = num;
public CommonEqlActionTestCase(String query, String name, long[] eventIds, boolean caseSensitive) {
this.query = query;
this.name = name;
this.spec = spec;
this.eventIds = eventIds;
this.caseSensitive = caseSensitive;
}
public void test() throws Exception {
// run both tests if case sensitivity doesn't matter
if (spec.caseSensitive() == null) {
assertResponse(runQuery(testIndexName, spec.query(), true));
assertResponse(runQuery(testIndexName, spec.query(), false));
}
// run only the case sensitive test
else if (spec.caseSensitive()) {
assertResponse(runQuery(testIndexName, spec.query(), true));
}
// run only the case insensitive test
else {
assertResponse(runQuery(testIndexName, spec.query(), false));
}
assertResponse(runQuery(testIndexName, query, caseSensitive));
}
protected void assertResponse(EqlSearchResponse response) {
@ -145,7 +143,7 @@ public abstract class CommonEqlActionTestCase extends ESRestTestCase {
}
protected EqlSearchResponse runQuery(String index, String query, boolean isCaseSensitive) throws Exception {
EqlSearchRequest request = new EqlSearchRequest(testIndexName, query);
EqlSearchRequest request = new EqlSearchRequest(index, query);
request.isCaseSensitive(isCaseSensitive);
request.tiebreakerField("event.sequence");
// some queries return more than 10 results
@ -160,10 +158,11 @@ public abstract class CommonEqlActionTestCase extends ESRestTestCase {
protected void assertSearchHits(List<SearchHit> events) {
assertNotNull(events);
long[] expected = spec.expectedEventIds();
long[] expected = eventIds;
long[] actual = extractIds(events);
assertArrayEquals("unexpected result for spec: [" + spec.toString() + "]" + Arrays.toString(expected) + " vs " + Arrays.toString(
actual), expected, actual);
assertArrayEquals(LoggerMessageFormat.format(null, "unexpected result for spec[{}] [{}] -> {} vs {}", name, query, Arrays.toString(
expected), Arrays.toString(actual)),
expected, actual);
}
private static long[] extractIds(List<SearchHit> events) {

13
x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/EqlSpec.java
View File

@ -81,6 +81,19 @@ public class EqlSpec {
return this.caseSensitive;
}
public EqlSpec withSensitivity(boolean caseSensitive) {
EqlSpec spec = new EqlSpec();
spec.name = name;
spec.description = description;
spec.note = note;
spec.tags = tags;
spec.query = query;
spec.expectedEventIds = expectedEventIds;
spec.caseSensitive = caseSensitive;
return spec;
}
@Override
public String toString() {
String str = "";

8
x-pack/plugin/eql/qa/rest/src/test/java/org/elasticsearch/xpack/eql/EqlActionIT.java
View File

@ -7,11 +7,11 @@
package org.elasticsearch.xpack.eql;
import org.elasticsearch.test.eql.CommonEqlActionTestCase;
import org.elasticsearch.test.eql.EqlSpec;
public class EqlActionIT extends CommonEqlActionTestCase {
// Constructor for parameterized test
public EqlActionIT(int num, String name, EqlSpec spec) {
super(num, name, spec);
public EqlActionIT(String query, String name, long[] eventIds, boolean caseSensitive) {
super(query, name, eventIds, caseSensitive);
}
}