update ServiceUnitTests.java

opensourceways · Dec 2, 2024 · ca0432e · ca0432e
1 parent 6226600
commit ca0432e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/src/main/java/com/datastat/dao/QueryDao.java b/src/main/java/com/datastat/dao/QueryDao.java
@@ -130,8 +130,8 @@ public class QueryDao {
     public void init() {
         esUrl = String.format("%s://%s:%s/", env.getProperty("es.scheme"), env.getProperty("es.host"), env.getProperty("es.port"));
         esQueryUtils = new EsQueryUtils();
-        robotUsers = Arrays.asList(Objects.requireNonNull(env.getProperty("skip.robot.user")).split(","));
-        domain_ids = Arrays.asList(Objects.requireNonNull(env.getProperty("qa.domain.ids")).split(","));
+        robotUsers = Arrays.asList(Objects.requireNonNull(env.getProperty("skip.robot.user", "robot")).split(","));
+        domain_ids = Arrays.asList(Objects.requireNonNull(env.getProperty("qa.domain.ids", "qa.domain.ids")).split(","));
     }
 
     @SneakyThrows

diff --git a/src/main/java/com/datastat/dao/metric/MetricDao.java b/src/main/java/com/datastat/dao/metric/MetricDao.java
@@ -47,10 +47,10 @@ public abstract class MetricDao {
     @Autowired
     EsAsyncHttpUtil esAsyncHttpUtil;
 
-    @Value("${company.query}")
+    @Value("${company.query:companyQuery}")
     String companyQueryStr;
 
-    @Value("${user.query}")
+    @Value("${user.query:userQuery}")
     String userQueryStr;
 
     protected static String esUrl;

diff --git a/src/main/java/com/datastat/interceptor/oneid/OneidInterceptor.java b/src/main/java/com/datastat/interceptor/oneid/OneidInterceptor.java
@@ -56,16 +56,16 @@ public class OneidInterceptor implements HandlerInterceptor {
     @Autowired
     RedisDao redisDao;
 
-    @Value("${cookie.token.name}")
+    @Value("${cookie.token.name:default}")
     private String cookieTokenName;
 
-    @Value("${cookie.token.domains}")
+    @Value("${cookie.token.domains:default}")
     private String allowDomains;
 
-    @Value("${cookie.token.secures}")
+    @Value("${cookie.token.secures:default}")
     private String cookieSecures;
 
-    @Value("${oneid.token.base.password}")
+    @Value("${oneid.token.base.password:default}")
     private String oneidTokenBasePassword;
 
     private static HashMap<String, Boolean> domain2secure;

diff --git a/src/main/java/com/datastat/service/QueryService.java b/src/main/java/com/datastat/service/QueryService.java
@@ -89,7 +89,7 @@ public class QueryService {
     @PostConstruct
     public void init() {
         redisDefaultExpire = Long.parseLong(env.getProperty("redis.keyExpire", "60"));
-        communityList = Arrays.asList(env.getProperty("communitys").split(","));
+        communityList = Arrays.asList(env.getProperty("communitys", "").split(","));
     }
 
     public Boolean checkCommunity(String community) {

diff --git a/src/main/java/com/datastat/service/VersionService.java b/src/main/java/com/datastat/service/VersionService.java
@@ -63,7 +63,8 @@ public class VersionService {
 
     @PostConstruct
     public void init() {
-        esUrl = String.format("%s://%s:%s/", env.getProperty("es.scheme"), env.getProperty("es.host"), env.getProperty("es.port"));
+        esUrl = String.format("%s://%s:%s/", env.getProperty("es.scheme", "https"),
+                env.getProperty("es.host", "0.0.0.0"), env.getProperty("es.port", "9200"));
     }
 
 

diff --git a/src/main/java/com/datastat/util/EsAsyncHttpUtil.java b/src/main/java/com/datastat/util/EsAsyncHttpUtil.java
@@ -33,10 +33,10 @@
 
 @Service
 public class EsAsyncHttpUtil {
-    @Value("${es.user}")
+    @Value("${es.user:user}")
     String esUser;
 
-    @Value("${es.password}")
+    @Value("${es.password:pwd}")
     String esPassword;
 
     static volatile AsyncHttpClient asyncHttpClient = null;

diff --git a/src/main/java/com/datastat/util/RSAUtil.java b/src/main/java/com/datastat/util/RSAUtil.java
@@ -38,7 +38,7 @@ public class RSAUtil implements Serializable {
     @Value("${rsa.key.algorithm:RSA}")
     public void setKeyAlgorithm(String keyAlgorithm) { RSAUtil.KEY_ALGORITHM = keyAlgorithm; }
 
-    @Value("${rsa.authing.algorithm}")
+    @Value("${rsa.authing.algorithm:RSA}")
     public void setRsaAlgorithm(String rsaAlgorithm) { RSAUtil.RSA_ALGORITHM = rsaAlgorithm; }
 
     /**

diff --git a/src/test/java/com/datastat/ds/unit/ServiceUnitTests.java b/src/test/java/com/datastat/ds/unit/ServiceUnitTests.java
@@ -10,9 +10,13 @@
 import org.mockito.MockitoAnnotations;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
 import com.datastat.config.FoundryConfig;
 import com.datastat.config.context.QueryConfContext;
 import com.datastat.dao.FoundryDao;
+import com.datastat.dao.KafkaDao;
+import com.datastat.dao.ObsDao;
 import com.datastat.dao.RedisDao;
 import com.datastat.dao.context.QueryDaoContext;
 import com.datastat.ds.common.CommonUtil;
@@ -33,6 +37,12 @@ void contextLoads() {
     @Mock
     QueryConfContext queryConfContext;
 
+    @MockBean
+    KafkaDao kafkaDao;
+
+    @MockBean
+    ObsDao obsDao;
+
     @Mock
     private RedisDao redisDao;