added default checks

Author: chernser

jdbc-v2/src/test/java/com/clickhouse/jdbc/SQLTests.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
@@ -16,6 +17,7 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -41,10 +43,19 @@ public void testSQLQueryWithResultSet(Map<String, TestDataset> tables, SQLTestCa
                 checkCount += rsMetadataChecks(resultSet, testCase, tables);
                 checkCount += dataCheck(resultSet, testCase, tables);
                 Assert.assertEquals(checkCount, testCase.checks.size(), "Check count does not match");
+                Assert.assertTrue(checkCount > 0, "Test without checks");
             }
         }
     }
 
+    public static final ArrayList<TestResultCheckModel> DEFAULT_CHECKS = new ArrayList<>();
+    static {
+        DEFAULT_CHECKS.add(new TestResultCheckModel("row_count", "${events.rowCount}"));
+        DEFAULT_CHECKS.add(new TestResultCheckModel("column_count", "${events.columnsCount}"));
+        DEFAULT_CHECKS.add(new TestResultCheckModel("column_names", "${events.columnNames}"));
+        DEFAULT_CHECKS.add(new TestResultCheckModel("column_types", "${events.columnTypes}"));
+    }
+
     @DataProvider(name = "testSQLQueryWithResultSetDP")
     public static Object[][] testSQLQueryWithResultSetDP() throws Exception {
         ClassLoader classLoader = SQLTests.class.getClassLoader();
@@ -61,6 +72,9 @@ public static Object[][] testSQLQueryWithResultSetDP() throws Exception {
             Object[][] testData = new Object[testCases.length][];
             for (int i = 0; i < testCases.length; i++) {
                 SQLTestCase testCase = testCases[i];
+                if (testCase.getChecks() == null || testCase.getChecks().isEmpty()) {
+                    testCase.setChecks(DEFAULT_CHECKS);
+                }
                 Map<String, TestDataset> testDatasetMap = new HashMap<>();
                 for (Map.Entry<String, TestDataset> entry : datasetMap.entrySet()) {
                     String table = testCase.getDatasets().get(entry.getKey());
@@ -203,6 +217,7 @@ public void setTables(Map<String, String> tables) {
 
     @Data
     @NoArgsConstructor
+    @AllArgsConstructor
     public static final class TestResultCheckModel {
         private String name;
         private Object expected;

jdbc-v2/src/test/resources/SQLTests.yaml

@@ -3,15 +3,15 @@
   query: SELECT * FROM events
   tables:
     events: datasets/events
-  checks:
-    - name: row_count
-      expected: ${events.rowCount}
-    - name: column_count
-      expected: ${events.columnsCount}
-    - name: column_names
-      expected: ${events.columnNames}
-    - name: column_types
-      expected: ${events.columnTypes}
+#  checks:
+#    - name: row_count
+#      expected: ${events.rowCount}
+#    - name: column_count
+#      expected: ${events.columnsCount}
+#    - name: column_names
+#      expected: ${events.columnNames}
+#    - name: column_types
+#      expected: ${events.columnTypes}
 - name: cte_select_events_with_date
   query: |
     WITH