[FAB-4335] Remove checks on mock/util function

External unit tests that call `GenerateMockPublicPrivateKeyPairPEM` shouldn't have to check for the error returned by this function. This should be checked once by the `TestGenerateMockPublicPrivateKeyPairPEM` test. This changeset addresses this. Change-Id: Ia70f707f4943647ef614533686b99105213e855d Signed-off-by: Kostas Christidis <kostas@christidis.io>
hyperledger · Jun 2, 2017 · 56d06f7 · 56d06f7
1 parent a690a05
commit 56d06f7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 45 deletions.
diff --git a/common/viperutil/config_test.go b/common/viperutil/config_test.go
@@ -217,10 +217,7 @@ func TestPEMBlocksFromFile(t *testing.T) {
 	numberOfCertificates := 3
 	var pems []byte
 	for i := 0; i < numberOfCertificates; i++ {
-		publicKeyCert, _, err := util.GenerateMockPublicPrivateKeyPairPEM(true)
-		if err != nil {
-			t.Fatalf("Enable to generate a signer certificate: %v", err)
-		}
+		publicKeyCert, _, _ := util.GenerateMockPublicPrivateKeyPairPEM(true)
 		pems = append(pems, publicKeyCert...)
 	}
 
@@ -259,10 +256,7 @@ func TestPEMBlocksFromFileEnv(t *testing.T) {
 	numberOfCertificates := 3
 	var pems []byte
 	for i := 0; i < numberOfCertificates; i++ {
-		publicKeyCert, _, err := util.GenerateMockPublicPrivateKeyPairPEM(true)
-		if err != nil {
-			t.Fatalf("Enable to generate a signer certificate: %v", err)
-		}
+		publicKeyCert, _, _ := util.GenerateMockPublicPrivateKeyPairPEM(true)
 		pems = append(pems, publicKeyCert...)
 	}
 

diff --git a/orderer/kafka/util_test.go b/orderer/kafka/util_test.go
@@ -112,14 +112,8 @@ func TestNewBrokerConfig(t *testing.T) {
 }
 
 func TestTLSConfigEnabled(t *testing.T) {
-	publicKey, privateKey, err := util.GenerateMockPublicPrivateKeyPairPEM(false)
-	if err != nil {
-		t.Fatalf("Enable to generate a public/private key pair: %v", err)
-	}
-	caPublicKey, _, err := util.GenerateMockPublicPrivateKeyPairPEM(true)
-	if err != nil {
-		t.Fatalf("Enable to generate a signer certificate: %v", err)
-	}
+	publicKey, privateKey, _ := util.GenerateMockPublicPrivateKeyPairPEM(false)
+	caPublicKey, _, _ := util.GenerateMockPublicPrivateKeyPairPEM(true)
 
 	config := newBrokerConfig(testConf.Kafka.Version, 0, config.TLS{
 		Enabled:     true,
@@ -137,14 +131,8 @@ func TestTLSConfigEnabled(t *testing.T) {
 }
 
 func TestTLSConfigDisabled(t *testing.T) {
-	publicKey, privateKey, err := util.GenerateMockPublicPrivateKeyPairPEM(false)
-	if err != nil {
-		t.Fatalf("Enable to generate a public/private key pair: %v", err)
-	}
-	caPublicKey, _, err := util.GenerateMockPublicPrivateKeyPairPEM(true)
-	if err != nil {
-		t.Fatalf("Enable to generate a signer certificate: %v", err)
-	}
+	publicKey, privateKey, _ := util.GenerateMockPublicPrivateKeyPairPEM(false)
+	caPublicKey, _, _ := util.GenerateMockPublicPrivateKeyPairPEM(true)
 
 	config := newBrokerConfig(testConf.Kafka.Version, 0, config.TLS{
 		Enabled:     false,
@@ -159,14 +147,8 @@ func TestTLSConfigDisabled(t *testing.T) {
 }
 
 func TestTLSConfigBadCert(t *testing.T) {
-	publicKey, privateKey, err := util.GenerateMockPublicPrivateKeyPairPEM(false)
-	if err != nil {
-		t.Fatalf("Enable to generate a public/private key pair: %v", err)
-	}
-	caPublicKey, _, err := util.GenerateMockPublicPrivateKeyPairPEM(true)
-	if err != nil {
-		t.Fatalf("Enable to generate a signer certificate: %v", err)
-	}
+	publicKey, privateKey, _ := util.GenerateMockPublicPrivateKeyPairPEM(false)
+	caPublicKey, _, _ := util.GenerateMockPublicPrivateKeyPairPEM(true)
 
 	t.Run("BadPrivateKey", func(t *testing.T) {
 		assert.Panics(t, func() {

diff --git a/orderer/mocks/util/util.go b/orderer/mocks/util/util.go
@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2017 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 util
@@ -25,7 +15,8 @@ import (
 	"math/big"
 )
 
-// GenerateMockPublicPrivateKeyPairPEM returns public/private key pair encoded as PEM strings
+// GenerateMockPublicPrivateKeyPairPEM returns public/private key pair encoded
+// as PEM strings.
 func GenerateMockPublicPrivateKeyPairPEM(isCA bool) (string, string, error) {
 	privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
 	if err != nil {

diff --git a/orderer/mocks/util/util_test.go b/orderer/mocks/util/util_test.go
@@ -0,0 +1,23 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package util
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGenerateMockPublicPrivateKeyPairPEM(t *testing.T) {
+	_, _, err := GenerateMockPublicPrivateKeyPairPEM(false)
+	assert.NoError(t, err, "Unable to generate a public/private key pair: %v", err)
+}
+
+func TestGenerateMockPublicPrivateKeyPairPEMWhenCASet(t *testing.T) {
+	_, _, err := GenerateMockPublicPrivateKeyPairPEM(true)
+	assert.NoError(t, err, "Unable to generate a signer certificate: %v", err)
+}