From 9bccbae3bc8988b104b9871a502b58a78ec1e706 Mon Sep 17 00:00:00 2001
From: jerryjzhang <jerryjzhang@tencent.com>
Date: Tue, 26 Nov 2024 22:22:14 +0800
Subject: [PATCH] [improvement][launcher]Set system property `s2.test` in junit
 tests in order to facilitate conditional breakpoints.

---
 launchers/standalone/pom.xml                                | 6 ++++++
 .../test/java/com/tencent/supersonic/chat/MetricTest.java   | 3 ++-
 .../com/tencent/supersonic/headless/QueryByMetricTest.java  | 2 --
 .../com/tencent/supersonic/headless/QueryByStructTest.java  | 2 --
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/launchers/standalone/pom.xml b/launchers/standalone/pom.xml
index 20a3a8b0a..885bbe67d 100644
--- a/launchers/standalone/pom.xml
+++ b/launchers/standalone/pom.xml
@@ -83,6 +83,12 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <version>1.6.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java
index 2d809bb70..c78959c89 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java
@@ -14,6 +14,7 @@ import com.tencent.supersonic.headless.chat.query.rule.metric.MetricTopNQuery;
 import com.tencent.supersonic.util.DataUtils;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetSystemProperty;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.text.DateFormat;
@@ -72,8 +73,8 @@ public class MetricTest extends BaseTest {
     }
 
     @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
     public void testMetricGroupBy() throws Exception {
-        System.setProperty("s2.test", "true");
         QueryResult actualResult = submitNewChat("近7天超音数各部门的访问次数", DataUtils.productAgentId);
 
         QueryResult expectedResult = new QueryResult();
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java
index c63732666..b4e3dd653 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java
@@ -20,7 +20,6 @@ public class QueryByMetricTest extends BaseTest {
 
     @Test
     public void testWithMetricAndDimensionBizNames() throws Exception {
-        System.setProperty("s2.test", "true");
         QueryMetricReq queryMetricReq = new QueryMetricReq();
         queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv"));
         queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department"));
@@ -58,7 +57,6 @@ public class QueryByMetricTest extends BaseTest {
 
     @Test
     public void testWithMetricAndDimensionIds() throws Exception {
-        System.setProperty("s2.test", "true");
         QueryMetricReq queryMetricReq = new QueryMetricReq();
         queryMetricReq.setDomainId(1L);
         queryMetricReq.setMetricIds(Arrays.asList(1L, 3L));
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java
index 43a50e590..7e1b3a37d 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java
@@ -46,7 +46,6 @@ public class QueryByStructTest extends BaseTest {
 
     @Test
     public void testDetailQuery() throws Exception {
-        System.setProperty("s2.test", "true");
         QueryStructReq queryStructReq =
                 buildQueryStructReq(Arrays.asList("user_name", "department"), QueryType.DETAIL);
         SemanticQueryResp semanticQueryResp =
@@ -87,7 +86,6 @@ public class QueryByStructTest extends BaseTest {
 
     @Test
     public void testFilterQuery() throws Exception {
-        System.setProperty("s2.test", "true");
         QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("department"));
         List<Filter> dimensionFilters = new ArrayList<>();
         Filter filter = new Filter();