[Fix] fix maven dependency surefire-junit4

headless/core/src/test/java/com/tencent/supersonic/chat/core/parser/aggregate/CalciteSqlParserTest.java

@@ -315,11 +315,11 @@ public class CalciteSqlParserTest {
                 + "            \"updatedBy\": \"admin\",\n"
                 + "            \"createdAt\": 1711367511146,\n"
                 + "            \"updatedAt\": 1711367511146\n" + "        }\n" + "    }\n" + "}";
-        // QueryStatement queryStatement = JSON.parseObject(json, QueryStatement.class);
-        // OntologyQueryParser calciteSqlParser = new OntologyQueryParser();
-        // calciteSqlParser.parse(queryStatement);
-        // Assert.assertEquals(queryStatement.getSql().trim().replaceAll("\\s+", ""),
-        // "SELECT`imp_date`AS`sys_imp_date`,SUM(1)AS`pv`" + "FROM" + "`s2_pv_uv_statis`"
-        // + "GROUPBY`imp_date`,`imp_date`");
+        QueryStatement queryStatement = JSON.parseObject(json, QueryStatement.class);
+        OntologyQueryParser calciteSqlParser = new OntologyQueryParser();
+        calciteSqlParser.parse(queryStatement);
+        Assert.assertEquals(queryStatement.getSql().trim().replaceAll("\\s+", ""),
+                "SELECT`imp_date`AS`sys_imp_date`,SUM(1)AS`pv`" + "FROM" + "`s2_pv_uv_statis`"
+                        + "GROUPBY`imp_date`,`imp_date`");
     }
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricDrillDownChecker.java

@@ -146,9 +146,6 @@ public class MetricDrillDownChecker {
     }
 
     private List<DrillDownDimension> getDrillDownDimensions(MetricResp metricResp) {
-        if (metricService == null) {
-            return Lists.newArrayList();
-        }
         return metricService.getDrillDownDimension(metricResp.getId());
     }
 }

headless/server/src/test/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownCheckerTest.java

@@ -26,23 +26,23 @@ public class MetricDrillDownCheckerTest {
         metricDrillDownChecker.checkQuery(semanticSchemaResp, sql);
     }
 
-    // @Test
-    // void test_groupBy_not_in_drillDownDimension() {
-    // MetricDrillDownChecker metricDrillDownChecker = new MetricDrillDownChecker();
-    // String sql = "select page, sum(pv) from t_1 group by page";
-    // SemanticSchemaResp semanticSchemaResp = mockModelSchemaResp();
-    // assertThrows(InvalidArgumentException.class,
-    // () -> metricDrillDownChecker.checkQuery(semanticSchemaResp, sql));
-    // }
+    @Test
+    void test_groupBy_not_in_drillDownDimension() {
+        MetricDrillDownChecker metricDrillDownChecker = new MetricDrillDownChecker();
+        String sql = "select page, sum(pv) from t_1 group by page";
+        SemanticSchemaResp semanticSchemaResp = mockModelSchemaResp();
+        assertThrows(InvalidArgumentException.class,
+                () -> metricDrillDownChecker.checkQuery(semanticSchemaResp, sql));
+    }
 
-    // @Test
-    // void test_groupBy_not_in_necessary_dimension() {
-    // MetricDrillDownChecker metricDrillDownChecker = new MetricDrillDownChecker();
-    // String sql = "select user_name, count(distinct uv) from t_1 group by user_name";
-    // SemanticSchemaResp semanticSchemaResp = mockModelSchemaResp();
-    // assertThrows(InvalidArgumentException.class,
-    // () -> metricDrillDownChecker.checkQuery(semanticSchemaResp, sql));
-    // }
+    @Test
+    void test_groupBy_not_in_necessary_dimension() {
+        MetricDrillDownChecker metricDrillDownChecker = new MetricDrillDownChecker();
+        String sql = "select user_name, count(distinct uv) from t_1 group by user_name";
+        SemanticSchemaResp semanticSchemaResp = mockModelSchemaResp();
+        assertThrows(InvalidArgumentException.class,
+                () -> metricDrillDownChecker.checkQuery(semanticSchemaResp, sql));
+    }
 
     @Test
     void test_groupBy_no_necessary_dimension_setting() {

headless/server/src/test/java/com/tencent/supersonic/headless/server/utils/QueryNLReqBuilderTest.java

@@ -34,14 +34,13 @@ class QueryNLReqBuilderTest {
         Aggregator aggregator = new Aggregator();
         aggregator.setFunc(AggOperatorEnum.UNKNOWN);
         aggregator.setColumn("pv");
-        queryStructReq.setAggregators(List.of(aggregator));
+        queryStructReq.setAggregators(Arrays.asList(aggregator));
 
-        queryStructReq.setGroups(List.of("department"));
+        queryStructReq.setGroups(Arrays.asList("department"));
 
         DateConf dateConf = new DateConf();
         dateConf.setDateMode(DateMode.LIST);
-        dateConf.setDateField("sys_imp_date");
-        dateConf.setDateList(List.of("2023-08-01"));
+        dateConf.setDateList(Arrays.asList("2023-08-01"));
         queryStructReq.setDateInfo(dateConf);
 
         List<Order> orders = new ArrayList<>();
@@ -51,17 +50,14 @@ class QueryNLReqBuilderTest {
         queryStructReq.setOrders(orders);
 
         QuerySqlReq querySQLReq = queryStructReq.convert();
-        // queryStructReq.setQueryType(QueryType.AGGREGATE);
-        Assert.assertEquals("SELECT department, SUM(pv) FROM `内容库` "
+        Assert.assertEquals("SELECT department, SUM(pv) AS pv FROM 内容库 "
                 + "WHERE (sys_imp_date IN ('2023-08-01')) GROUP "
-                + "BY department ORDER BY uv LIMIT 500 OFFSET 0", querySQLReq.getSql());
+                + "BY department ORDER BY uv LIMIT 2000", querySQLReq.getSql());
 
-        // queryStructReq.setQueryType(QueryType.DETAIL);
-        // querySQLReq = queryStructReq.convert();
-        // Assert.assertEquals(
-        // "SELECT department, pv FROM `内容库` WHERE (sys_imp_date IN ('2023-08-01')) "
-        // + "ORDER BY uv LIMIT 500 OFFSET 0",
-        // querySQLReq.getSql());
+        queryStructReq.setQueryType(QueryType.DETAIL);
+        querySQLReq = queryStructReq.convert();
+        Assert.assertEquals("SELECT department, pv FROM 内容库 WHERE (sys_imp_date IN ('2023-08-01')) "
+                + "ORDER BY uv LIMIT 2000", querySQLReq.getSql());
     }
 
     private void init() {

launchers/standalone/src/main/resources/data/dictionary/custom/dic_value_2_DIMENSION_3.txt

@@ -1,4 +0,0 @@
-HR _1_1 1
-strategy _1_1 1
-marketing _1_1 2
-sales _1_1 2