[FAB-8247] Improve instantiated chaincodes test

Change-Id: I1fbf55377b61fc4d3c977ea658f8852794697b53
Signed-off-by: Sandra Vrtikapa <sandra.vrtikapa@securekey.com>

Author: sandrask

test/integration/fab/channel_ledger_test.go

@@ -106,7 +106,7 @@ func TestLedgerQueries(t *testing.T) {
 
 	testQueryBlock(t, ledger, targets)
 
-	testInstantiatedChaincodes(t, ledger, targets)
+	testInstantiatedChaincodes(t, chaincodeID, ledger, targets)
 
 }
 
@@ -211,19 +211,27 @@ func testQueryBlock(t *testing.T, ledger fab.ChannelLedger, targets []fab.Propos
 	}
 }
 
-func testInstantiatedChaincodes(t *testing.T, ledger fab.ChannelLedger, targets []fab.ProposalProcessor) {
+func testInstantiatedChaincodes(t *testing.T, ccID string, ledger fab.ChannelLedger, targets []fab.ProposalProcessor) {
 
 	// Test Query Instantiated chaincodes
 	chaincodeQueryResponses, err := ledger.QueryInstantiatedChaincodes(targets)
 	if err != nil {
 		t.Fatalf("QueryInstantiatedChaincodes return error: %v", err)
 	}
 
+	found := false
 	for _, chaincodeQueryResponse := range chaincodeQueryResponses {
 		for _, chaincode := range chaincodeQueryResponse.Chaincodes {
 			t.Logf("**InstantiatedCC: %s", chaincode)
+			if chaincode.Name == ccID {
+				found = true
+			}
 		}
 	}
+
+	if !found {
+		t.Fatalf("QueryInstantiatedChaincodes failed to find instantiated %s chaincode", ccID)
+	}
 }
 
 // MoveFundsAndGetTxID ...

test/integration/fab/channel_queries_test.go

@@ -23,7 +23,7 @@ func TestChannelQueries(t *testing.T) {
 
 	testQueryChannels(t, testSetup.Channel, testSetup.Client)
 
-	testInstalledChaincodes(t, testSetup.Channel, testSetup.Client)
+	testInstalledChaincodes(t, chaincodeID, testSetup.Channel, testSetup.Client)
 
 	testQueryByChaincode(t, testSetup.SDK.Config(), testSetup.Channel)
 }
@@ -60,7 +60,7 @@ func testQueryChannels(t *testing.T, channel fab.Channel, client fab.Resource) {
 
 }
 
-func testInstalledChaincodes(t *testing.T, channel fab.Channel, client fab.Resource) {
+func testInstalledChaincodes(t *testing.T, ccID string, channel fab.Channel, client fab.Resource) {
 
 	// Our target will be primary peer on this channel
 	target := channel.PrimaryPeer()
@@ -71,10 +71,17 @@ func testInstalledChaincodes(t *testing.T, channel fab.Channel, client fab.Resou
 		t.Fatalf("QueryInstalledChaincodes return error: %v", err)
 	}
 
+	found := false
 	for _, chaincode := range chaincodeQueryResponse.Chaincodes {
 		t.Logf("**InstalledCC: %s", chaincode)
+		if chaincode.Name == ccID {
+			found = true
+		}
 	}
 
+	if !found {
+		t.Fatalf("QueryInstalledChaincodes failed to find installed %s chaincode", ccID)
+	}
 }
 
 func testQueryByChaincode(t *testing.T, config apiconfig.Config, channel fab.Channel) {