This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 525d1b9641 optimize: optimize NacosMockTest UT case (#6794)
525d1b9641 is described below
commit 525d1b9641f6016f4c51818280649ebaf32a1068
Author: jimin <sliev...@163.com>
AuthorDate: Fri Aug 30 09:23:02 2024 +0800
optimize: optimize NacosMockTest UT case (#6794)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../apache/seata/config/nacos/NacosMockTest.java | 24 +++++++++++-----------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 87ce714321..11b52612f7 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -70,6 +70,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6787](https://github.com/apache/incubator-seata/pull/6787)] upgrade
elliptic to 6.5.7
- [[#6783](https://github.com/apache/incubator-seata/pull/6783)] rename the
server naming/v1 api to vgroup/v1
- [[#6793](https://github.com/apache/incubator-seata/pull/6793)] fix npmjs
conflicts
+- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize
NacosMockTest UT case
### refactor:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 11ee91bcba..2762ce06f9 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -71,6 +71,7 @@
- [[#6787](https://github.com/apache/incubator-seata/pull/6787)] 升级 elliptic 至
6.5.7 版本
- [[#6783](https://github.com/apache/incubator-seata/pull/6783)]
将server事务分组修改接口改为/vgroup/v1
- [[#6793](https://github.com/apache/incubator-seata/pull/6793)] 修复 npmjs
依赖冲突问题
+- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] 优化
NacosMockTest 单测问题
### refactor:
diff --git
a/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java
b/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java
index 7a30740a89..dbf2995e9f 100644
---
a/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java
+++
b/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java
@@ -75,13 +75,13 @@ public class NacosMockTest {
Configuration configuration = ConfigurationFactory.getInstance();
String configStrValue = configuration.getConfig(SUB_NACOS_DATAID);
Assertions.assertNull(configStrValue);
- configStrValue = configuration.getConfig(SUB_NACOS_DATAID, 5000);
+ configStrValue = configuration.getConfig(SUB_NACOS_DATAID, 1000);
Assertions.assertNull(configStrValue);
- configStrValue = configuration.getConfig(SUB_NACOS_DATAID, "TEST",
5000);
+ configStrValue = configuration.getConfig(SUB_NACOS_DATAID, "TEST",
1000);
Assertions.assertEquals("TEST", configStrValue);
ConfigurationCache.clear();
System.setProperty(SUB_NACOS_DATAID, "SYS-TEST");
- configStrValue = configuration.getConfig(SUB_NACOS_DATAID, "TEST",
5000);
+ configStrValue = configuration.getConfig(SUB_NACOS_DATAID, "TEST",
1000);
Assertions.assertEquals("SYS-TEST", configStrValue);
ConfigurationCache.clear();
System.clearProperty(SUB_NACOS_DATAID);
@@ -91,7 +91,7 @@ public class NacosMockTest {
Assertions.assertEquals(0, configIntValue);
configIntValue = configuration.getInt(SUB_NACOS_DATAID, 100);
Assertions.assertEquals(100, configIntValue);
- configIntValue = configuration.getInt(SUB_NACOS_DATAID, 100, 5000);
+ configIntValue = configuration.getInt(SUB_NACOS_DATAID, 100, 1000);
Assertions.assertEquals(100, configIntValue);
ConfigurationCache.clear();
@@ -99,7 +99,7 @@ public class NacosMockTest {
Assertions.assertEquals(false, configBoolValue);
configBoolValue = configuration.getBoolean(SUB_NACOS_DATAID, true);
Assertions.assertEquals(true, configBoolValue);
- configBoolValue = configuration.getBoolean(SUB_NACOS_DATAID, true,
5000);
+ configBoolValue = configuration.getBoolean(SUB_NACOS_DATAID, true,
1000);
Assertions.assertEquals(true, configBoolValue);
ConfigurationCache.clear();
@@ -107,7 +107,7 @@ public class NacosMockTest {
Assertions.assertEquals(0, configShortValue);
configShortValue = configuration.getShort(SUB_NACOS_DATAID, (short)64);
Assertions.assertEquals(64, configShortValue);
- configShortValue = configuration.getShort(SUB_NACOS_DATAID,
(short)127, 5000);
+ configShortValue = configuration.getShort(SUB_NACOS_DATAID,
(short)127, 1000);
Assertions.assertEquals(127, configShortValue);
ConfigurationCache.clear();
@@ -115,21 +115,21 @@ public class NacosMockTest {
Assertions.assertEquals(0L, configLongValue);
configLongValue = configuration.getLong(SUB_NACOS_DATAID, 12345678L);
Assertions.assertEquals(12345678L, configLongValue);
- configLongValue = configuration.getLong(SUB_NACOS_DATAID, 65535L,
5000);
+ configLongValue = configuration.getLong(SUB_NACOS_DATAID, 65535L,
1000);
Assertions.assertEquals(65535L, configLongValue);
ConfigurationCache.clear();
Duration configDurValue = configuration.getDuration(SUB_NACOS_DATAID);
Assertions.assertEquals(Duration.ZERO, configDurValue);
- Duration defaultDuration = Duration.ofMillis(5000);
+ Duration defaultDuration = Duration.ofMillis(1000);
configDurValue = configuration.getDuration(SUB_NACOS_DATAID,
defaultDuration);
Assertions.assertEquals(defaultDuration, configDurValue);
defaultDuration = Duration.ofMillis(1000);
- configDurValue = configuration.getDuration(SUB_NACOS_DATAID,
defaultDuration, 5000);
+ configDurValue = configuration.getDuration(SUB_NACOS_DATAID,
defaultDuration, 1000);
Assertions.assertEquals(defaultDuration, configDurValue);
ConfigurationCache.clear();
- configStrValue = configuration.getLatestConfig(SUB_NACOS_DATAID,
"DEFAULT", 5000);
+ configStrValue = configuration.getLatestConfig(SUB_NACOS_DATAID,
"DEFAULT", 1000);
Assertions.assertEquals("DEFAULT", configStrValue);
}
@@ -145,7 +145,7 @@ public class NacosMockTest {
@Test
public void removeConfig() {
Configuration configuration = ConfigurationFactory.getInstance();
- boolean removed = configuration.removeConfig(SUB_NACOS_DATAID);
+ boolean removed = configuration.removeConfig(NACOS_DATAID);
Assertions.assertTrue(removed);
}
@@ -175,7 +175,7 @@ public class NacosMockTest {
configuration.addConfigListener(SUB_NACOS_DATAID, listener);
Thread.sleep(1000);
configuration.putConfig(NACOS_DATAID, "KEY=VALUE");
- latch.await(3000, TimeUnit.MILLISECONDS);
+ latch.await(1000, TimeUnit.MILLISECONDS);
Set<ConfigurationChangeListener> listeners =
configuration.getConfigListeners(SUB_NACOS_DATAID);
//configcache listener + user listener
Assertions.assertEquals(2, listeners.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
