Merge "[FAB-4049] Add additional tests to core/container pkg"

Author: binhn

core/container/controller_test.go

@@ -27,8 +27,10 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/core/container/ccintf"
+	"github.com/hyperledger/fabric/core/container/dockercontroller"
+	"github.com/hyperledger/fabric/core/container/inproccontroller"
 	pb "github.com/hyperledger/fabric/protos/peer"
-
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )
 
@@ -270,3 +272,17 @@ func TestVMCStopContainer(t *testing.T) {
 	fmt.Println("VMCStopContainer-waiting for response")
 	<-c
 }
+
+func TestNewVM(t *testing.T) {
+	vm := vmcontroller.newVM("Docker")
+	dvm := vm.(*dockercontroller.DockerVM)
+	assert.NotNil(t, dvm, "Requested Docker VM but newVM did not return dockercontroller.DockerVM")
+
+	vm = vmcontroller.newVM("System")
+	ivm := vm.(*inproccontroller.InprocVM)
+	assert.NotNil(t, ivm, "Requested System VM but newVM did not return inproccontroller.InprocVM")
+
+	vm = vmcontroller.newVM("")
+	dvm = vm.(*dockercontroller.DockerVM)
+	assert.NotNil(t, dvm, "Requested default VM but newVM did not return dockercontroller.DockerVM")
+}

core/container/vm_test.go

@@ -29,14 +29,13 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	flag.BoolVar(&runTests, "run-controller-tests", false, "run tests")
+	flag.BoolVar(&runTests, "run-controller-tests", true, "run tests")
 	flag.Parse()
 	testutil.SetupTestConfig()
 	os.Exit(m.Run())
 }
 
 func TestVM_ListImages(t *testing.T) {
-	t.Skip("No need to invoke list images.")
 	vm, err := NewVM()
 	if err != nil {
 		t.Fail()
@@ -84,14 +83,27 @@ func TestVM_GetChaincodePackageBytes(t *testing.T) {
 	assert.Error(t, err,
 		"GetChaincodePackageBytes did not return error when chaincode spec is nil")
 
-	spec := &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG,
+	spec := &pb.ChaincodeSpec{ChaincodeId: nil}
+	_, err = GetChaincodePackageBytes(spec)
+	assert.Error(t, err, "Error expected when GetChaincodePackageBytes is called with nil chaincode ID")
+	assert.Contains(t, err.Error(), "invalid chaincode spec")
+
+	spec = &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG,
 		ChaincodeId: nil,
 		Input:       &pb.ChaincodeInput{Args: util.ToChaincodeArgs("f")}}
 	_, err = GetChaincodePackageBytes(spec)
 	assert.Error(t, err,
 		"GetChaincodePackageBytes did not return error when chaincode ID is nil")
 }
 
+func TestVM_BuildChaincodeContainer(t *testing.T) {
+	vm, err := NewVM()
+	assert.NoError(t, err)
+	err = vm.BuildChaincodeContainer(nil)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Error getting chaincode package bytes")
+}
+
 func TestVM_Chaincode_Compile(t *testing.T) {
 	// vm, err := NewVM()
 	// if err != nil {