Skip to content

[ISSUE #4987] fix test case:PlainAccessValidatorTest#testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig #4988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RongtongJin merged 1 commit into from
Sep 5, 2022
Merged

[ISSUE #4987] fix test case:PlainAccessValidatorTest#testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig #4988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -1049,16 +1049,16 @@ public void testValidateAfterUpdateAccessConfig() throws NoSuchFieldException, I

@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();
Expand Down Expand Up @@ -1090,8 +1090,8 @@ public void testUpdateSpecifiedAclFileGlobalWhiteAddrsConfig() {
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));
}


Expand Down