[FAB-4065] core/container/inproccontroller coverage

This change brings the test coverage of
core/container/inproccontroller up to 91.9%

Change-Id: I82a6e8f7eb8e9cffa8c326cd64f1ebb504978ee4
Signed-off-by: Liam Grace <liamgrace.896@gmail.com>
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: liam-grace

core/chaincode/platforms/platforms_test.go

@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package platforms
@@ -118,7 +108,7 @@ func GetPathErr(str string) string {
 	return ""
 }
 
-func VGetBoolErr(str string) bool {
+func VGetBoolFalse(str string) bool {
 	return false
 }
 
@@ -130,7 +120,7 @@ func GetPathOk(str string) string {
 	return "OK"
 }
 
-func VGetBoolOk(str string) bool {
+func VGetBoolTrue(str string) bool {
 	return true
 }
 
@@ -155,7 +145,7 @@ func TestGetPeerTLSCert(t *testing.T) {
 	}()
 
 	_GetPath = GetPathErr
-	_VGetBool = VGetBoolErr
+	_VGetBool = VGetBoolFalse
 	_OSStat = OSStatOk
 	_IOUtilReadFile = IOUtilReadFile
 
@@ -165,7 +155,7 @@ func TestGetPeerTLSCert(t *testing.T) {
 	assert.Nil(t, err, "err should have been nil")
 
 	_GetPath = GetPathOk
-	_VGetBool = VGetBoolOk
+	_VGetBool = VGetBoolTrue
 	_OSStat = OSStatOk
 	_IOUtilReadFile = IOUtilReadFile
 
@@ -174,7 +164,7 @@ func TestGetPeerTLSCert(t *testing.T) {
 	assert.Nil(t, err, "Err should have been nil")
 	assert.NotNil(t, response, "Response should not  have been nil")
 
-	_VGetBool = VGetBoolOk
+	_VGetBool = VGetBoolTrue
 	_GetPath = GetPathErr
 	_OSStat = OSStatOk
 	_IOUtilReadFile = IOUtilReadFile
@@ -184,7 +174,7 @@ func TestGetPeerTLSCert(t *testing.T) {
 	assert.Nil(t, err, "Err should have been nil")
 	assert.NotNil(t, response, "Response should not have been nil")
 
-	_VGetBool = VGetBoolOk
+	_VGetBool = VGetBoolTrue
 	_GetPath = GetPathOk
 	_OSStat = OSStatErr
 	_IOUtilReadFile = IOUtilReadFile

core/container/inproccontroller/inproccontroller.go

@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package inproccontroller
@@ -38,9 +28,11 @@ type inprocContainer struct {
 }
 
 var (
-	inprocLogger = flogging.MustGetLogger("inproccontroller")
-	typeRegistry = make(map[string]*inprocContainer)
-	instRegistry = make(map[string]*inprocContainer)
+	inprocLogger        = flogging.MustGetLogger("inproccontroller")
+	typeRegistry        = make(map[string]*inprocContainer)
+	instRegistry        = make(map[string]*inprocContainer)
+	_shimStartInProc    = shim.StartInProc
+	_inprocLoggerErrorf = inprocLogger.Errorf
 )
 
 // errors
@@ -117,10 +109,10 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 		if env == nil {
 			env = ipc.env
 		}
-		err := shim.StartInProc(env, args, ipc.chaincode, ccRcvPeerSend, peerRcvCCSend)
+		err := _shimStartInProc(env, args, ipc.chaincode, ccRcvPeerSend, peerRcvCCSend)
 		if err != nil {
 			err = fmt.Errorf("chaincode-support ended with err: %s", err)
-			inprocLogger.Errorf("%s", err)
+			_inprocLoggerErrorf("%s", err)
 		}
 		inprocLogger.Debugf("chaincode ended with for  %s with err: %s", id, err)
 	}()
@@ -132,7 +124,7 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 		err := ccSupport.HandleChaincodeStream(ctxt, inprocStream)
 		if err != nil {
 			err = fmt.Errorf("chaincode ended with err: %s", err)
-			inprocLogger.Errorf("%s", err)
+			_inprocLoggerErrorf("%s", err)
 		}
 		inprocLogger.Debugf("chaincode-support ended with for  %s with err: %s", id, err)
 	}()
@@ -149,7 +141,6 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 		close(peerRcvCCSend)
 		inprocLogger.Debugf("chaincode %s stopped", id)
 	}
-
 	return err
 }