Browse Source

modify gateway's test unit2

tags/1.1.10
shaozhuguang 5 years ago
parent
commit
e5a4fbdd09
1 changed files with 10 additions and 8 deletions
  1. +10
    -8
      source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java

+ 10
- 8
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/GatewayTestRunner.java View File

@@ -13,17 +13,17 @@ import org.springframework.util.CollectionUtils;
import java.util.Map; import java.util.Map;


public class GatewayTestRunner { public class GatewayTestRunner {
private NetworkAddress serviceAddress; private NetworkAddress serviceAddress;
private GatewayServerBooter gatewayServer; 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<String,Object> otherMap) {
public GatewayTestRunner(String host, int port, KeyPairConfig gatewayDefaultKey, String[] providers,
Map<String,Object> otherMap, NetworkAddress... masterPeerAddresses) {
this.serviceAddress = new NetworkAddress(host, port); this.serviceAddress = new NetworkAddress(host, port);
GatewayConfigProperties config = new GatewayConfigProperties(); 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().setPubKeyValue(gatewayDefaultKey.getPubKeyValue());
config.keys().getDefault().setPrivKeyValue(gatewayDefaultKey.getPrivKeyValue()); config.keys().getDefault().setPrivKeyValue(gatewayDefaultKey.getPrivKeyValue());
@@ -62,7 +64,7 @@ public class GatewayTestRunner {
return null; return null;
} }
}; };
return invoker.start(); return invoker.start();
} }




Loading…
Cancel
Save