Add client module ut. (alibaba#11739)

* Add client module ut. * Fix naming ut possible failed.
dongzhengyu816 · Feb 6, 2024 · 139f4f2 · 139f4f2
1 parent 3da1240
commit 139f4f2
Show file tree

Hide file tree

Showing 13 changed files with 236 additions and 462 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/LocalConfigInfoProcessor.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/LocalConfigInfoProcessor.java
@@ -17,7 +17,7 @@
 package com.alibaba.nacos.client.config.impl;
 
 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.client.config.utils.ConcurrentDiskUtil;
+import com.alibaba.nacos.client.utils.ConcurrentDiskUtil;
 import com.alibaba.nacos.client.config.utils.JvmUtil;
 import com.alibaba.nacos.client.config.utils.SnapShotSwitch;
 import com.alibaba.nacos.client.env.NacosClientProperties;

diff --git a/...nt/src/main/java/com/alibaba/nacos/client/config/impl/LocalEncryptedDataKeyProcessor.java b/...nt/src/main/java/com/alibaba/nacos/client/config/impl/LocalEncryptedDataKeyProcessor.java
@@ -18,7 +18,7 @@
 
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.utils.StringUtils;
-import com.alibaba.nacos.client.config.utils.ConcurrentDiskUtil;
+import com.alibaba.nacos.client.utils.ConcurrentDiskUtil;
 import com.alibaba.nacos.client.config.utils.JvmUtil;
 import com.alibaba.nacos.client.config.utils.SnapShotSwitch;
 import com.alibaba.nacos.client.utils.LogUtils;

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/utils/ConcurrentDiskUtil.java b/client/src/main/java/com/alibaba/nacos/client/config/utils/ConcurrentDiskUtil.java
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/utils/JvmUtil.java b/client/src/main/java/com/alibaba/nacos/client/config/utils/JvmUtil.java
@@ -47,7 +47,12 @@ public static Boolean isMultiInstance() {
     private static final String DEFAULT_IS_MULTI_INSTANCE = "false";
 
     static {
-        String multiDeploy = NacosClientProperties.PROTOTYPE.getProperty(IS_MULTI_INSTANCE_PROPERTY, DEFAULT_IS_MULTI_INSTANCE);
+        init();
+    }
+
+    private static void init() {
+        String multiDeploy = NacosClientProperties.PROTOTYPE
+                .getProperty(IS_MULTI_INSTANCE_PROPERTY, DEFAULT_IS_MULTI_INSTANCE);
         if (TRUE.equals(multiDeploy)) {
             isMultiInstance = true;
         }

diff --git a/.../main/java/com/alibaba/nacos/client/naming/backups/datasource/DiskFailoverDataSource.java b/.../main/java/com/alibaba/nacos/client/naming/backups/datasource/DiskFailoverDataSource.java
@@ -21,7 +21,7 @@
 import com.alibaba.nacos.client.naming.backups.FailoverDataSource;
 import com.alibaba.nacos.client.naming.backups.FailoverSwitch;
 import com.alibaba.nacos.client.naming.backups.NamingFailoverData;
-import com.alibaba.nacos.client.naming.cache.ConcurrentDiskUtil;
+import com.alibaba.nacos.client.utils.ConcurrentDiskUtil;
 import com.alibaba.nacos.client.naming.cache.DiskCache;
 import com.alibaba.nacos.client.naming.utils.CacheDirUtil;
 import com.alibaba.nacos.client.naming.utils.UtilAndComs;

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/cache/DiskCache.java b/client/src/main/java/com/alibaba/nacos/client/naming/cache/DiskCache.java
@@ -20,6 +20,7 @@
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import com.alibaba.nacos.client.utils.ConcurrentDiskUtil;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 

diff --git a/...ient/naming/cache/ConcurrentDiskUtil.java → ...acos/client/utils/ConcurrentDiskUtil.java b/...ient/naming/cache/ConcurrentDiskUtil.java → ...acos/client/utils/ConcurrentDiskUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Copyright 1999-2023 Alibaba Group Holding Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.naming.cache;
+package com.alibaba.nacos.client.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,15 +30,15 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 
-import static com.alibaba.nacos.client.utils.LogUtils.NAMING_LOGGER;
-
 /**
  * Concurrent Disk util.
  *
  * @author nkorange
  */
 public class ConcurrentDiskUtil {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConcurrentDiskUtil.class);
+
     private static final String READ_ONLY = "r";
 
     private static final String READ_WRITE = "rw";
@@ -139,7 +142,7 @@ private static void sleep(int time) {
         try {
             Thread.sleep(time);
         } catch (InterruptedException e) {
-            NAMING_LOGGER.warn("sleep wrong", e);
+            LOGGER.warn("sleep wrong", e);
             // set the interrupted flag
             Thread.currentThread().interrupt();
         }
@@ -154,11 +157,11 @@ private static FileLock tryLock(File file, FileChannel channel, boolean shared)
             } catch (Exception e) {
                 ++i;
                 if (i > RETRY_COUNT) {
-                    NAMING_LOGGER.error("[NA] read " + file.getName() + " fail;retryed time: " + i, e);
-                    throw new IOException("read " + file.getAbsolutePath() + " conflict");
+                    LOGGER.error("[NA] lock " + file.getName() + " fail;retryed time: " + i, e);
+                    throw new IOException("lock " + file.getAbsolutePath() + " conflict");
                 }
                 sleep(SLEEP_BASETIME * i);
-                NAMING_LOGGER.warn("read " + file.getName() + " conflict;retry time: " + i);
+                LOGGER.warn("lock " + file.getName() + " conflict;retry time: " + i);
             }
         } while (null == result);
         return result;

diff --git a/client/src/test/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponseTest.java b/client/src/test/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponseTest.java
@@ -29,17 +29,19 @@ public void testGetterAndSetter() {
         String group = "group";
         String tenant = "n";
         String content = "abc";
+        String type = "yaml";
 
         configResponse.setContent(content);
         configResponse.setDataId(dataId);
         configResponse.setGroup(group);
         configResponse.setTenant(tenant);
+        configResponse.setConfigType(type);
 
         Assert.assertEquals(dataId, configResponse.getDataId());
         Assert.assertEquals(group, configResponse.getGroup());
         Assert.assertEquals(tenant, configResponse.getTenant());
         Assert.assertEquals(content, configResponse.getContent());
-
+        Assert.assertEquals(type, configResponse.getConfigType());
     }
 
     @Test
@@ -49,16 +51,19 @@ public void getParameter() {
         String group = "group";
         String tenant = "n";
         String content = "abc";
+        String custom = "custom";
 
         configResponse.setContent(content);
         configResponse.setDataId(dataId);
         configResponse.setGroup(group);
         configResponse.setTenant(tenant);
+        configResponse.putParameter(custom, custom);
 
         Assert.assertEquals(dataId, configResponse.getParameter("dataId"));
         Assert.assertEquals(group, configResponse.getParameter("group"));
         Assert.assertEquals(tenant, configResponse.getParameter("tenant"));
         Assert.assertEquals(content, configResponse.getParameter("content"));
+        Assert.assertEquals(custom, configResponse.getParameter("custom"));
     }
 
     @Test