From e5a4fbdd09323ccf779fc3b9b1a21c1c0d79c14e Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Thu, 18 Jun 2020 17:05:47 +0800 Subject: [PATCH] modify gateway's test unit2 --- .../jd/blockchain/intgr/GatewayTestRunner.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java b/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java index d152cd02..364caa72 100644 --- a/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java +++ b/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java @@ -13,17 +13,17 @@ import org.springframework.util.CollectionUtils; import java.util.Map; public class GatewayTestRunner { - + private NetworkAddress serviceAddress; - + private GatewayServerBooter gatewayServer; - public GatewayTestRunner(String host, int port, KeyPairConfig gatewayDefaultKey, NetworkAddress masterPeerAddres) { - this(host, port, gatewayDefaultKey, masterPeerAddres, null,null); + public GatewayTestRunner(String host, int port, KeyPairConfig gatewayDefaultKey, NetworkAddress... masterPeerAddresses) { + this(host, port, gatewayDefaultKey, null,null, masterPeerAddresses); } - public GatewayTestRunner(String host, int port, KeyPairConfig gatewayDefaultKey, NetworkAddress masterPeerAddres, String[] providers, - Map otherMap) { + public GatewayTestRunner(String host, int port, KeyPairConfig gatewayDefaultKey, String[] providers, + Map otherMap, NetworkAddress... masterPeerAddresses) { this.serviceAddress = new NetworkAddress(host, port); GatewayConfigProperties config = new GatewayConfigProperties(); @@ -36,7 +36,9 @@ public class GatewayTestRunner { } } - config.setMasterPeerAddress(masterPeerAddres); + for (NetworkAddress address : masterPeerAddresses) { + config.addMasterPeerAddress(address); + } config.keys().getDefault().setPubKeyValue(gatewayDefaultKey.getPubKeyValue()); config.keys().getDefault().setPrivKeyValue(gatewayDefaultKey.getPrivKeyValue()); @@ -62,7 +64,7 @@ public class GatewayTestRunner { return null; } }; - + return invoker.start(); }