[FAB-15077] Update integration tests

Remove basic-network based tests, all tests now run
on top of first-network.
Updated java sdk version to 1.4.1

Change-Id: Iae6db69342ee9b6f344588a7b9b5b84a072368b3
Signed-off-by: gennady <[email protected]>

Author: gennadylaventman

fabric-chaincode-integration-test/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     compile project(':fabric-chaincode-docker')
     testCompile 'org.testcontainers:testcontainers:1.7.1'
-    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.3.0-SNAPSHOT'
+    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.1'
     compile project(':fabric-chaincode-shim')
 }
 

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

@@ -1,3 +1,8 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package org.hyperleder.fabric.shim.integration;
 
 import org.hamcrest.Matchers;
@@ -13,12 +18,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class SACCIntegrationTest {
     @ClassRule
     public static DockerComposeContainer env = new DockerComposeContainer(
-            new File("src/test/resources/basic-network/docker-compose.yml")
+            new File("src/test/resources/first-network/docker-compose-cli.yaml")
     )
             .withLocalCompose(false)
             .withPull(true);
@@ -38,29 +45,30 @@ public void TestSACCChaincodeInstallInstantiateInvokeQuery() throws Exception {
         final HFClient client = HFClient.createNewInstance();
         client.setCryptoSuite(crypto);
 
-        client.setUserContext(Utils.getAdminUser());
+        client.setUserContext(Utils.getAdminUserOrg1TLS());
 
-        Channel myChannel = Utils.getMyChannelBasicNetwork(client);
+        Channel myChannel = Utils.getMyChannelFirstNetwork(client);
+        List<Peer> peers = myChannel.getPeers().stream().filter(peer -> peer.getName().indexOf("peer0.org1") != -1).collect(Collectors.toList());
 
         InstallProposalRequest installProposalRequest = generateSACCInstallRequest(client);
-        Utils.sendInstallProposals(client, installProposalRequest, myChannel.getPeers());
+        Utils.sendInstallProposals(client, installProposalRequest, peers);
 
         // Instantiating chaincode
         InstantiateProposalRequest instantiateProposalRequest = generateSACCInstantiateRequest(client);
-        Utils.sendInstantiateProposal("javacc", instantiateProposalRequest, myChannel, myChannel.getPeers(), myChannel.getOrderers());
+        Utils.sendInstantiateProposal("javacc", instantiateProposalRequest, myChannel, peers, myChannel.getOrderers());
 
-        client.setUserContext(Utils.getUser1());
+        client.setUserContext(Utils.getUser1Org1TLS());
 
         final TransactionProposalRequest proposalRequest = generateSACCInvokeRequest(client, "b", "200");
-        Utils.sendTransactionProposalInvoke(proposalRequest, myChannel, myChannel.getPeers(), myChannel.getOrderers());
+        Utils.sendTransactionProposalInvoke(proposalRequest, myChannel, peers, myChannel.getOrderers());
 
         // Creating proposal for query
         final TransactionProposalRequest queryAProposalRequest = generateSACCQueryRequest(client, "a");
-        Utils.sendTransactionProposalQuery(queryAProposalRequest, myChannel, myChannel.getPeers(), Matchers.is(200), Matchers.is("100"), null);
+        Utils.sendTransactionProposalQuery(queryAProposalRequest, myChannel, peers, Matchers.is(200), Matchers.is("100"), null);
 
         // Creating proposal for query
         final TransactionProposalRequest queryBProposalRequest = generateSACCQueryRequest(client, "b");
-        Utils.sendTransactionProposalQuery(queryBProposalRequest, myChannel, myChannel.getPeers(), Matchers.is(200), Matchers.is("200"), null);
+        Utils.sendTransactionProposalQuery(queryBProposalRequest, myChannel, peers, Matchers.is(200), Matchers.is("200"), null);
     }
 
     static public InstallProposalRequest generateSACCInstallRequest(HFClient client) throws IOException, InvalidArgumentException {

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

@@ -1,3 +1,8 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package org.hyperleder.fabric.shim.integration;
 
 import com.google.protobuf.ByteString;
@@ -33,38 +38,6 @@ public static void setUp() throws Exception {
         Utils.setUp();
     }
 
-//    @Test
-//    public void testSACCFirstNetwork() throws IllegalAccessException, InvocationTargetException, InvalidArgumentException, InstantiationException, NoSuchMethodException, CryptoException, ClassNotFoundException, NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException, IOException, TransactionException, ProposalException, ChaincodeEndorsementPolicyParseException {
-//        final CryptoSuite crypto = CryptoSuite.Factory.getCryptoSuite();
-//
-//        // Create client and set default crypto suite
-//        System.out.println("Creating client");
-//        final HFClient client = HFClient.createNewInstance();
-//        client.setCryptoSuite(crypto);
-//
-//        client.setUserContext(Utils.getAdminUserOrg1TLS());
-//
-//        Channel myChannel = Utils.getMyChannelFirstNetwork(client);
-//
-//        System.out.println("Installing chaincode fabric-chaincode-example-sbe, packaged as gzip stream");
-//        InstallProposalRequest installProposalRequest = generateSACCInstallRequest(client);
-//        Utils.sendInstallProposals(client, installProposalRequest,  myChannel.getPeers().stream().filter(peer -> peer.getName().indexOf("org1") != -1).collect(Collectors.toList()));
-//
-//        client.setUserContext(Utils.getAdminUserOrg2TLS());
-//        installProposalRequest = generateSACCInstallRequest(client);
-//        Utils.sendInstallProposals(client, installProposalRequest,  myChannel.getPeers().stream().filter(peer -> peer.getName().indexOf("org2") != -1).collect(Collectors.toList()));
-//
-//        InstantiateProposalRequest instantiateProposal = generateSACCInstantiateRequest(client, "a", "100");
-//        Utils.sendInstantiateProposal("javacc", instantiateProposal, myChannel, myChannel.getPeers().stream().filter(peer -> peer.getName().indexOf("peer0.org2") != -1).collect(Collectors.toList()), myChannel.getOrderers());
-//
-//        client.setUserContext(Utils.getUser1Org1TLS());
-//        TransactionProposalRequest proposal = generateSACCTransactionRequest(client, "b", "200");
-//        Utils.sendTransactionProposalInvoke(proposal, myChannel, myChannel.getPeers().stream().filter(peer -> peer.getName().indexOf("peer0.org1") != -1).collect(Collectors.toList()), myChannel.getOrderers());
-//
-////        proposal = generateSBECCTransactionRequest(client, "getval", "pub");
-//
-//    }
-
     @Test
     public void testSBECCFirstNetwork() throws IllegalAccessException, InvocationTargetException, InvalidArgumentException, InstantiationException, NoSuchMethodException, CryptoException, ClassNotFoundException, NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException, IOException, TransactionException, ProposalException, ChaincodeEndorsementPolicyParseException, ChaincodeCollectionConfigurationException {
         final CryptoSuite crypto = CryptoSuite.Factory.getCryptoSuite();
@@ -157,18 +130,6 @@ void RunSBE(HFClient client, Channel channel,  String mode) throws NoSuchAlgorit
 
     }
 
-//    private InstallProposalRequest generateSACCInstallRequest(HFClient client) throws IOException, InvalidArgumentException {
-//        return Utils.generateInstallRequest(client, "javacc", "1.0", "../fabric-chaincode-example-sacc");
-//    }
-//
-//    static public InstantiateProposalRequest generateSACCInstantiateRequest(HFClient client, String... args) throws InvalidArgumentException, IOException, ChaincodeEndorsementPolicyParseException {
-//        return Utils.generateInstantiateRequest(client, "javacc", "1.0", "src/test/resources/chaincodeendorsementpolicy.yaml", "init", args);
-//    }
-//
-//    static public TransactionProposalRequest generateSACCTransactionRequest(HFClient client, String... args) {
-//        return Utils.generateTransactionRequest(client, "javacc", "1.0", "set", args);
-//    }
-//
     private InstallProposalRequest generateSBECCInstallRequest(HFClient client) throws IOException, InvalidArgumentException {
         return Utils.generateInstallRequest(client, "sbecc", "1.0", "../fabric-chaincode-example-sbe");
     }

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

@@ -1,3 +1,8 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package org.hyperleder.fabric.shim.integration;
 
 import com.github.dockerjava.api.model.Container;