Skip to content

Commit c8b406b

Browse files
author
MaxKsyunz
committed
Fix checkstyle issues in tests
Signed-off-by: MaxKsyunz <[email protected]>
1 parent f1108ba commit c8b406b

File tree

7 files changed

+17
-9
lines changed

7 files changed

+17
-9
lines changed

core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public void invalid_to_retrieve_schema_from_remove() {
117117
IllegalStateException exception =
118118
assertThrows(IllegalStateException.class, () -> plan.schema());
119119
assertEquals(
120-
"[BUG] schema can been only applied to ProjectOperator, "
121-
+ "instead of RemoveOperator(input=inputPlan, removeList=[response, referer])",
120+
"[BUG] schema can been only applied to ProjectOperator, instead of RemoveOperator",
122121
exception.getMessage());
123122
}
124123
}

opensearch/src/test/java/org/opensearch/sql/opensearch/executor/CursorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
class CursorTest {
1212

1313
@Test
14-
void EmptyArrayIsNone() {
14+
void emptyArrayIsNone() {
1515
Assertions.assertEquals(Cursor.None, new Cursor(new byte[]{}));
1616
}
1717

1818
@Test
19-
void ToStringIsArrayValue() {
19+
void toStringIsArrayValue() {
2020
String cursorTxt = "This is a test";
2121
Assertions.assertEquals(cursorTxt, new Cursor(cursorTxt.getBytes()).toString());
2222
}

opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import org.opensearch.sql.common.response.ResponseListener;
3737
import org.opensearch.sql.common.setting.Settings;
3838
import org.opensearch.sql.data.model.ExprValue;
39-
import org.opensearch.sql.executor.PaginatedPlanCache;
4039
import org.opensearch.sql.executor.ExecutionContext;
4140
import org.opensearch.sql.executor.ExecutionEngine;
4241
import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
42+
import org.opensearch.sql.executor.PaginatedPlanCache;
4343
import org.opensearch.sql.opensearch.client.OpenSearchClient;
4444
import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
4545
import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;

opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.opensearch.script.ScriptEngine;
2828
import org.opensearch.sql.expression.DSL;
2929
import org.opensearch.sql.expression.Expression;
30-
import org.opensearch.sql.opensearch.storage.script.filter.ExpressionFilterScriptFactory;
3130
import org.opensearch.sql.expression.serialization.ExpressionSerializer;
31+
import org.opensearch.sql.opensearch.storage.script.filter.ExpressionFilterScriptFactory;
3232

3333
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
3434
@ExtendWith(MockitoExtension.class)

ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
2727
import org.opensearch.sql.executor.PaginatedPlanCache;
2828
import org.opensearch.sql.executor.QueryService;
29+
import org.opensearch.sql.executor.execution.PaginatedQueryService;
2930
import org.opensearch.sql.executor.execution.QueryPlanFactory;
3031
import org.opensearch.sql.opensearch.executor.Cursor;
3132
import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
@@ -45,6 +46,9 @@ public class PPLServiceTest {
4546
@Mock
4647
private QueryService queryService;
4748

49+
@Mock
50+
private PaginatedQueryService paginatedQueryService;
51+
4852
@Mock
4953
private ExecutionEngine.Schema schema;
5054

@@ -59,7 +63,7 @@ public void setUp() {
5963
queryManager = DefaultQueryManager.defaultQueryManager();
6064

6165
pplService = new PPLService(new PPLSyntaxParser(), queryManager,
62-
new QueryPlanFactory(queryService, paginatedPlanCache));
66+
new QueryPlanFactory(queryService, paginatedQueryService, paginatedPlanCache));
6367
}
6468

6569
@After

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public void buildQueryStatement() {
3939
"search source=t a=1",
4040
new Query(
4141
project(
42-
filter(relation("t"), compare("=", field("a"), intLiteral(1))), AllFields.of()), 0));
42+
filter(relation("t"), compare("=", field("a"),
43+
intLiteral(1))), AllFields.of()), 0));
4344
}
4445

4546
@Test

sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.opensearch.sql.executor.ExecutionEngine.ExplainResponseNode;
2929
import org.opensearch.sql.executor.PaginatedPlanCache;
3030
import org.opensearch.sql.executor.QueryService;
31+
import org.opensearch.sql.executor.execution.PaginatedQueryService;
3132
import org.opensearch.sql.executor.execution.QueryPlanFactory;
3233
import org.opensearch.sql.opensearch.executor.Cursor;
3334
import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
@@ -47,6 +48,9 @@ class SQLServiceTest {
4748
@Mock
4849
private QueryService queryService;
4950

51+
@Mock
52+
private PaginatedQueryService paginatedQueryService;
53+
5054
@Mock
5155
private ExecutionEngine.Schema schema;
5256

@@ -57,7 +61,7 @@ class SQLServiceTest {
5761
public void setUp() {
5862
queryManager = DefaultQueryManager.defaultQueryManager();
5963
sqlService = new SQLService(new SQLSyntaxParser(), queryManager,
60-
new QueryPlanFactory(queryService, paginatedPlanCache));
64+
new QueryPlanFactory(queryService, paginatedQueryService, paginatedPlanCache));
6165
}
6266

6367
@AfterEach

0 commit comments

Comments
 (0)