You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/09/05 00:38:25 UTC
[rocketmq] branch develop updated: [ISSUE #4987] fix test case:PlainAccessValidatorTest#testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig (#4988)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 4f0636a2d [ISSUE #4987] fix test case:PlainAccessValidatorTest#testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig (#4988)
4f0636a2d is described below
commit 4f0636a2d915085b198d414796f009cbe7eb27fc
Author: mxsm <lj...@gmail.com>
AuthorDate: Mon Sep 5 08:38:17 2022 +0800
[ISSUE #4987] fix test case:PlainAccessValidatorTest#testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig (#4988)
---
.../rocketmq/acl/plain/PlainAccessValidatorTest.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
index 9ea05ac76..640943827 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
@@ -65,7 +65,7 @@ public class PlainAccessValidatorTest {
@Before
public void init() {
- File file = new File("src/test/resources");
+ File file = new File("src/test/resources".replace("/", File.separator));
System.setProperty("rocketmq.home.dir", file.getAbsolutePath());
plainAccessValidator = new PlainAccessValidator();
sessionCredentials = new SessionCredentials();
@@ -1049,16 +1049,16 @@ public class PlainAccessValidatorTest {
@Test
public void testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig() {
- System.setProperty("rocketmq.home.dir", "src/test/resources/update_global_white_addr");
- System.setProperty("rocketmq.acl.plain.file", "/conf/plain_acl.yml");
+ System.setProperty("rocketmq.home.dir", "src/test/resources/update_global_white_addr".replace("/", File.separator));
+ System.setProperty("rocketmq.acl.plain.file", "/conf/plain_acl.yml".replace("/", File.separator));
- String targetFileName = "src/test/resources/update_global_white_addr/conf/plain_acl.yml";
+ String targetFileName = "src/test/resources/update_global_white_addr/conf/plain_acl.yml".replace("/", File.separator);
Map<String, Object> backUpAclConfigMap = AclUtils.getYamlDataObject(targetFileName, Map.class);
- String targetFileName1 = "src/test/resources/update_global_white_addr/conf/acl/plain_acl.yml";
+ String targetFileName1 = "src/test/resources/update_global_white_addr/conf/acl/plain_acl.yml".replace("/", File.separator);
Map<String, Object> backUpAclConfigMap1 = AclUtils.getYamlDataObject(targetFileName1, Map.class);
- String targetFileName2 = "src/test/resources/update_global_white_addr/conf/acl/empty.yml";
+ String targetFileName2 = "src/test/resources/update_global_white_addr/conf/acl/empty.yml".replace("/", File.separator);
Map<String, Object> backUpAclConfigMap2 = AclUtils.getYamlDataObject(targetFileName2, Map.class);
PlainAccessValidator plainAccessValidator = new PlainAccessValidator();
@@ -1090,8 +1090,8 @@ public class PlainAccessValidatorTest {
AclUtils.writeDataObject(targetFileName1, backUpAclConfigMap1);
AclUtils.writeDataObject(targetFileName2, backUpAclConfigMap2);
- System.setProperty("rocketmq.home.dir", "src/test/resources");
- System.setProperty("rocketmq.acl.plain.file", "/conf/plain_acl.yml");
+ System.setProperty("rocketmq.home.dir", "src/test/resources".replace("/", File.separator));
+ System.setProperty("rocketmq.acl.plain.file", "/conf/plain_acl.yml".replace("/", File.separator));
}