Improve integration test reliability

Order of tests can vary so it’s not safe to assume mychannel already exists

Signed-off-by: James Taylor <[email protected]>

Author: jt-nti

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/Docker.java

@@ -22,6 +22,7 @@ static public class DockerBuilder implements Cloneable {
         boolean exec;
         String container;
         String script;
+        String channel;
 
         public DockerBuilder duplicate() {
             try {
@@ -36,6 +37,11 @@ public DockerBuilder script(String script){
             this.script = script;
             return this;
         }
+        
+        public DockerBuilder channel(String channel){
+            this.channel = channel;
+            return this;
+        }
 
         public DockerBuilder container(String container){
             this.container = container;
@@ -45,7 +51,8 @@ public DockerBuilder container(String container){
         public DockerBuilder exec(){
             this.exec = true;
             return this;
-        }        
+        }
+
         public Docker build(){
 
             ArrayList<String> list = new ArrayList<>();
@@ -64,6 +71,11 @@ public Docker build(){
                 throw new RuntimeException("script should be set");
             }
             list.add(script);
+            
+            if (channel == null || channel.isEmpty()){
+                throw new RuntimeException("channel should be set");
+            }
+            list.add(channel);
 
 
             return new Docker(list);

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/SACCIntegrationTest.java

@@ -37,7 +37,7 @@ public static void setUp() throws Exception {
         // the cli container contains a script that does the channel create, joing
         // and chaincode install/instantiate
         DockerBuilder dockerBuilder = new Docker.DockerBuilder();
-        Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script.sh").build();
+        Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script.sh").channel("sachannel").build();
         docker.run();
     }
 
@@ -46,7 +46,7 @@ public void TestSACCChaincodeInstallInstantiateInvokeQuery() {
 
         // Need to send a number of 'peer chaincode invoke' commands
         // Setup the core buider command and then duplicate per test
-        PeerBuilder coreBuilder = Peer.newBuilder().ccname("javacc").channel("mychannel");
+        PeerBuilder coreBuilder = Peer.newBuilder().ccname("javacc").channel("sachannel");
         Result r;
         String text;
 

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/SBECCIntegrationTest.java

@@ -32,7 +32,7 @@ public static void setUp() throws Exception {
 
         // Call the inbuilt script to install/instantiate
         DockerBuilder dockerBuilder = new Docker.DockerBuilder();
-        Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script-sbe.sh").build();
+        Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script.sh").channel("sbechannel").build();
         docker.run();
     }
 
@@ -50,7 +50,7 @@ public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecE
         String mode = "pub";
         // Need to send a number of 'peer chaincode invoke' commands
         // Setup the core buider command and then duplicate per test
-        PeerBuilder coreBuilder = Peer.newBuilder().ccname("sbecc").channel("mychannel");
+        PeerBuilder coreBuilder = Peer.newBuilder().ccname("sbecc").channel("sbechannel");
         Result r;
 
         String text;
@@ -113,7 +113,7 @@ public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecExcepti
 
         // Need to send a number of 'peer chaincode invoke' commands
         // Setup the core buider command and then duplicate per test
-        PeerBuilder coreBuilder = Peer.newBuilder().ccname("sbecc").channel("mychannel");
+        PeerBuilder coreBuilder = Peer.newBuilder().ccname("sbecc").channel("sbechannel");
         Result r;
         String text;