Fix checkstyle issues in tests

Signed-off-by: MaxKsyunz <[email protected]>
Bit-Quill · Feb 17, 2023 · c8b406b · c8b406b
1 parent f1108ba
commit c8b406b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java
@@ -117,8 +117,7 @@ public void invalid_to_retrieve_schema_from_remove() {
     IllegalStateException exception =
         assertThrows(IllegalStateException.class, () -> plan.schema());
     assertEquals(
-        "[BUG] schema can been only applied to ProjectOperator, "
-            + "instead of RemoveOperator(input=inputPlan, removeList=[response, referer])",
+        "[BUG] schema can been only applied to ProjectOperator, instead of RemoveOperator",
         exception.getMessage());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/CursorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/CursorTest.java
@@ -11,12 +11,12 @@
 class CursorTest {
 
   @Test
-  void EmptyArrayIsNone() {
+  void emptyArrayIsNone() {
     Assertions.assertEquals(Cursor.None, new Cursor(new byte[]{}));
   }
 
   @Test
-  void ToStringIsArrayValue() {
+  void toStringIsArrayValue() {
     String cursorTxt = "This is a test";
     Assertions.assertEquals(cursorTxt, new Cursor(cursorTxt.getBytes()).toString());
   }

diff --git a/...h/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java b/...h/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java
@@ -36,10 +36,10 @@
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.executor.PaginatedPlanCache;
 import org.opensearch.sql.executor.ExecutionContext;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
+import org.opensearch.sql.executor.PaginatedPlanCache;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;

diff --git a/...rc/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java b/...rc/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java
@@ -27,8 +27,8 @@
 import org.opensearch.script.ScriptEngine;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.opensearch.storage.script.filter.ExpressionFilterScriptFactory;
 import org.opensearch.sql.expression.serialization.ExpressionSerializer;
+import org.opensearch.sql.opensearch.storage.script.filter.ExpressionFilterScriptFactory;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)

diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
@@ -26,6 +26,7 @@
 import org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
 import org.opensearch.sql.executor.PaginatedPlanCache;
 import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.execution.PaginatedQueryService;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
 import org.opensearch.sql.opensearch.executor.Cursor;
 import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
@@ -45,6 +46,9 @@ public class PPLServiceTest {
   @Mock
   private QueryService queryService;
 
+  @Mock
+  private PaginatedQueryService paginatedQueryService;
+
   @Mock
   private ExecutionEngine.Schema schema;
 
@@ -59,7 +63,7 @@ public void setUp() {
     queryManager = DefaultQueryManager.defaultQueryManager();
 
     pplService = new PPLService(new PPLSyntaxParser(), queryManager,
-        new QueryPlanFactory(queryService, paginatedPlanCache));
+        new QueryPlanFactory(queryService, paginatedQueryService, paginatedPlanCache));
   }
 
   @After

diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java
@@ -39,7 +39,8 @@ public void buildQueryStatement() {
         "search source=t a=1",
         new Query(
             project(
-                filter(relation("t"), compare("=", field("a"), intLiteral(1))), AllFields.of()), 0));
+                filter(relation("t"), compare("=", field("a"),
+                    intLiteral(1))), AllFields.of()), 0));
   }
 
   @Test

diff --git a/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java b/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java
@@ -28,6 +28,7 @@
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponseNode;
 import org.opensearch.sql.executor.PaginatedPlanCache;
 import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.execution.PaginatedQueryService;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
 import org.opensearch.sql.opensearch.executor.Cursor;
 import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
@@ -47,6 +48,9 @@ class SQLServiceTest {
   @Mock
   private QueryService queryService;
 
+  @Mock
+  private PaginatedQueryService paginatedQueryService;
+
   @Mock
   private ExecutionEngine.Schema schema;
 
@@ -57,7 +61,7 @@ class SQLServiceTest {
   public void setUp() {
     queryManager = DefaultQueryManager.defaultQueryManager();
     sqlService = new SQLService(new SQLSyntaxParser(), queryManager,
-        new QueryPlanFactory(queryService, paginatedPlanCache));
+        new QueryPlanFactory(queryService, paginatedQueryService, paginatedPlanCache));
   }
 
   @AfterEach