Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EQL: Expand verification tests (#52664) #52725

Merged
merged 2 commits into from
Feb 25, 2020
Merged

EQL: Expand verification tests (#52664) #52725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05bf987
EQL: Expand verification tests (#52664)
aleksmaus Feb 24, 2020
c1a4c0b
Adjust for 7.x compatibility
aleksmaus Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ public void exitFunctionExpression(EqlBaseParser.FunctionExpressionContext conte
case "arrayCount":
case "arraySearch":
throw new ParsingException(
"unsupported function " + functionName,
"Unsupported function [" + functionName + "]",
null,
token.getLine(),
token.getCharPositionInLine());

default:
throw new ParsingException(
"unknown function " + functionName,
"Unknown function [" + functionName + "]",
null,
token.getLine(),
token.getCharPositionInLine());
Expand All @@ -182,7 +182,7 @@ public void exitFunctionExpression(EqlBaseParser.FunctionExpressionContext conte
public void exitJoin(EqlBaseParser.JoinContext context) {
Token token = context.JOIN().getSymbol();
throw new ParsingException(
"join is not supported",
"Join is not supported",
null,
token.getLine(),
token.getCharPositionInLine());
Expand All @@ -192,7 +192,7 @@ public void exitJoin(EqlBaseParser.JoinContext context) {
public void exitPipe(EqlBaseParser.PipeContext context) {
Token token = context.PIPE().getSymbol();
throw new ParsingException(
"pipes are not supported",
"Pipes are not supported",
null,
token.getLine(),
token.getCharPositionInLine());
Expand All @@ -202,7 +202,7 @@ public void exitPipe(EqlBaseParser.PipeContext context) {
public void exitProcessCheck(EqlBaseParser.ProcessCheckContext context) {
Token token = context.relationship;
throw new ParsingException(
"process relationships are not supported",
"Process relationships are not supported",
null,
token.getLine(),
token.getCharPositionInLine());
Expand All @@ -212,7 +212,7 @@ public void exitProcessCheck(EqlBaseParser.ProcessCheckContext context) {
public void exitSequence(EqlBaseParser.SequenceContext context) {
Token token = context.SEQUENCE().getSymbol();
throw new ParsingException(
"sequence is not supported",
"Sequence is not supported",
null,
token.getLine(),
token.getCharPositionInLine());
Expand All @@ -223,7 +223,7 @@ public void exitQualifiedName(EqlBaseParser.QualifiedNameContext context) {
if (context.INTEGER_VALUE().size() > 0) {
Token firstIndex = context.INTEGER_VALUE(0).getSymbol();
throw new ParsingException(
"array indexes are not supported",
"Array indexes are not supported",
null,
firstIndex.getLine(),
firstIndex.getCharPositionInLine());
Expand Down
7 changes: 6 additions & 1 deletion ...plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/AbstractEqlIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;

@ESIntegTestCase.ClusterScope(scope = SUITE, numDataNodes = 0, numClientNodes = 0, maxNumDataNodes = 0)
@ESIntegTestCase.ClusterScope(scope = SUITE, numDataNodes = 0, numClientNodes = 0, maxNumDataNodes = 0, transportClientRatio = 0)
public abstract class AbstractEqlIntegTestCase extends ESIntegTestCase {

@Override
Expand All @@ -37,5 +37,10 @@ protected Settings nodeSettings(int nodeOrdinal) {
protected Collection<Class<? extends Plugin>> nodePlugins() {
return Collections.singletonList(LocalStateEqlXPackPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return nodePlugins();
}
}

Loading