This is an automated email from the ASF dual-hosted git repository.
jimin 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 891ca5dbbe test: fix combine test to avoid failure due to ordering
(#7815)
891ca5dbbe is described below
commit 891ca5dbbe422e97f1fff35b52b2eec4594a00a4
Author: Steven Kusuman <[email protected]>
AuthorDate: Sun Dec 7 08:36:49 2025 -0600
test: fix combine test to avoid failure due to ordering (#7815)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 3 ++-
.../org/apache/seata/config/AbstractConfigurationTest.java | 10 ++++------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 6ba81c7221..f13d4287a7 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -126,6 +126,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7800](https://github.com/apache/incubator-seata/pull/7800)] fix
non-deterministic in StringUtilsTest#testToStringAndCycleDependency
- [[#7802](https://github.com/apache/incubator-seata/pull/7802)] Fix
non-deterministic in `ConnectionContextProxyTest`.
- [[#7808](https://github.com/apache/incubator-seata/pull/7808)] Deflake
multiple Insert Executor tests by fixing order-dependent primary key (PK) value
comparison
+- [[#7815](https://github.com/apache/incubator-seata/pull/7815)] test: fix
combine test to avoid failure due to ordering
- [[#7827](https://github.com/apache/incubator-seata/pull/7827)] Fix
non-deteriministic in TableMetaTest#testGetPrimaryKeyOnlyName
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 564f560a56..37b09f08bb 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -65,7 +65,7 @@
- [[#7577](https://github.com/seata/seata/pull/7577)] 去除zstd解压时4MB的限制
- [[#7591](https://github.com/seata/seata/pull/7591)]
当没有显式配置xssFilter相关的配置时，优化获取默认配置的逻辑
- [[#7608](https://github.com/seata/seata/pull/7608)] 修改refreshToken方法中的参数名称
-- [[#7603](https://github.com/seata/seata/pull/7603)] 将Apache
Tomcat依赖项从9.0.106升级到9.0.108
+- [[#7603](https://github.com/seata/seata/pull/7603)] 将Apache
Tomcat依赖项从9.0.106升级到9.0.108
- [[#7614](https://github.com/seata/seata/pull/7614)] 更新 README.md
- [[#7443](https://github.com/seata/seata/pull/7443)]
将saga注释模式中的@LocalTCC替换为@SagaTransactional
- [[#7645](https://github.com/seata/seata/pull/7645)] 简化相关的 transport.* 配置项类型
@@ -125,6 +125,7 @@
- [[#7800](https://github.com/apache/incubator-seata/pull/7800)] 修复
`StringUtilsTest.testToStringAndCycleDependency` 因反射字段顺序不稳定导致的测试用例间歇性失败问题
- [[#7802](https://github.com/apache/incubator-seata/pull/7802)] 修复
`ConnectionContextProxyTest` 中锁键顺序不稳定导致的测试用例间歇性失败问题。
- [[#7808](https://github.com/apache/incubator-seata/pull/7808)] 修复多个 Insert
Executor 单测中因主键值比较顺序导致的间歇性失败问题
+- [[#7815](https://github.com/apache/incubator-seata/pull/7815)]
通过合并测试来修复，避免因执行顺序导致的失败
- [[#7827](https://github.com/apache/incubator-seata/pull/7827)] 修复
TableMetaTest 中因主键名称列表顺序不稳定导致的单测间歇性失败问题
diff --git
a/config/seata-config-core/src/test/java/org/apache/seata/config/AbstractConfigurationTest.java
b/config/seata-config-core/src/test/java/org/apache/seata/config/AbstractConfigurationTest.java
index 877f80b8ff..dcf90dac14 100644
---
a/config/seata-config-core/src/test/java/org/apache/seata/config/AbstractConfigurationTest.java
+++
b/config/seata-config-core/src/test/java/org/apache/seata/config/AbstractConfigurationTest.java
@@ -145,18 +145,16 @@ class AbstractConfigurationTest {
Assertions.assertEquals(defaultDuration, value);
}
- @Test
- void testGetConfigWithNull() {
- String value = configuration.getConfig("test.nonexistent.key");
- // due to configuration cache, may return default value instead of null
- Assertions.assertNotNull(value);
- }
@Test
void testGetConfigWithDefaultValue() {
String defaultValue = "default-value";
String value = configuration.getConfig("test.nonexistent.key",
defaultValue);
Assertions.assertEquals(defaultValue, value);
+
+ String valueCached = configuration.getConfig("test.nonexistent.key");
+ // due to configuration cache, may return default value instead of null
+ Assertions.assertNotNull(valueCached);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
