From dba3bad9283c0967bf681f782f416cc3592ca8c3 Mon Sep 17 00:00:00 2001 From: hujie Date: Sat, 13 Oct 2018 21:56:03 +0800 Subject: [PATCH] CI no environment 7 --- .../plug/engine/PlainAclPlugEngineTest.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java b/acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java index c7e5979c..1b1707d1 100644 --- a/acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java +++ b/acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java @@ -70,10 +70,25 @@ public class PlainAclPlugEngineTest { } } String filePath = home + "/conf/transport.yml"; - fis = new FileInputStream(new File(filePath)); - - transport = ymal.loadAs(fis, BorkerAccessControlTransport.class); + try { + fis = new FileInputStream(new File(filePath)); + transport = ymal.loadAs(fis, BorkerAccessControlTransport.class); + } catch (Exception e) { + AccessControl accessControl = new BorkerAccessControl(); + accessControl.setAccount("onlyNetAddress"); + accessControl.setPassword("aliyun11"); + accessControl.setNetaddress("127.0.0.1"); + accessControl.setRecognition("127.0.0.1:1"); + + AccessControl accessControlTwo = new BorkerAccessControl(); + accessControlTwo.setAccount("listtransport"); + accessControlTwo.setPassword("aliyun1"); + accessControlTwo.setNetaddress("127.0.0.1"); + accessControlTwo.setRecognition("127.0.0.1:2"); + transport = new BorkerAccessControlTransport(); + transport.setOnlyNetAddress((BorkerAccessControl) accessControl); + } ControllerParameters controllerParametersEntity = new ControllerParameters(); controllerParametersEntity.setFileHome(null); try { @@ -82,17 +97,6 @@ public class PlainAclPlugEngineTest { } catch (Exception e) { } - accessControl = new BorkerAccessControl(); - accessControl.setAccount("rokcetmq"); - accessControl.setPassword("aliyun11"); - accessControl.setNetaddress("127.0.0.1"); - accessControl.setRecognition("127.0.0.1:1"); - - accessControlTwo = new BorkerAccessControl(); - accessControlTwo.setAccount("rokcet1"); - accessControlTwo.setPassword("aliyun1"); - accessControlTwo.setNetaddress("127.0.0.1"); - accessControlTwo.setRecognition("127.0.0.1:2"); loginInfoMap = new ConcurrentHashMap<>(); FieldSetter.setField(plainAclPlugEngine, plainAclPlugEngine.getClass().getSuperclass().getDeclaredField("loginInfoMap"), loginInfoMap); -- GitLab