[FAB-4299] Improve UT coverage of orderer/localconfig

Change-Id: I13eb4502eebd1e16bc3217b73c8c3670e8ebad0c
Signed-off-by: Jay Guo <[email protected]>

orderer/localconfig/config.go

@@ -224,7 +224,7 @@ func (c *TopLevel) completeInitialization(configDir string) {
 			logger.Panicf("General.Kafka.TLS.PrivateKey must be set if General.Kafka.TLS.Enabled is set to true.")
 		case c.Kafka.TLS.Enabled && c.Kafka.TLS.RootCAs == nil:
 			logger.Panicf("General.Kafka.TLS.CertificatePool must be set if General.Kafka.TLS.Enabled is set to true.")
-		case c.General.Profile.Enabled && (c.General.Profile.Address == ""):
+		case c.General.Profile.Enabled && c.General.Profile.Address == "":
 			logger.Infof("Profiling enabled and General.Profile.Address unset, setting to %s", defaults.General.Profile.Address)
 			c.General.Profile.Address = defaults.General.Profile.Address
 		case c.General.LocalMSPDir == "":
@@ -252,7 +252,7 @@ func (c *TopLevel) completeInitialization(configDir string) {
 }
 
 func translateCAs(configDir string, certificateAuthorities []string) []string {
-	results := make([]string, 0)
+	var results []string
 	for _, ca := range certificateAuthorities {
 		result := cf.TranslatePath(configDir, ca)
 		results = append(results, result)

orderer/localconfig/config_test.go

@@ -18,41 +18,50 @@ package config
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/common/viperutil"
-	cf "github.com/hyperledger/fabric/core/config"
-
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestGoodConfig(t *testing.T) {
-	config := Load()
-	if config == nil {
-		t.Fatalf("Could not load config")
-	}
-	t.Logf("%+v", config)
+	assert.NotNil(t, Load(), "Could not load config")
 }
 
-func TestBadConfig(t *testing.T) {
-	config := viper.New()
-	config.SetConfigName("orderer")
-	cf.AddDevConfigPath(config)
+func TestMissingConfigFile(t *testing.T) {
+	envVar1 := "FABRIC_CFG_PATH"
+	envVal1 := "invalid fabric cfg path"
+	os.Setenv(envVar1, envVal1)
+	defer os.Unsetenv(envVar1)
 
-	err := config.ReadInConfig()
-	if err != nil {
-		t.Fatalf("Error reading %s plugin config: %s", Prefix, err)
+	assert.Panics(t, func() { Load() }, "Should panic")
+}
+
+func TestMalformedConfigFile(t *testing.T) {
+	name, err := ioutil.TempDir("", "hyperledger_fabric")
+	assert.Nil(t, err, "Error creating temp dir: %s", err)
+	defer func() {
+		err = os.RemoveAll(name)
+		assert.Nil(t, os.RemoveAll(name), "Error removing temp dir: %s", err)
+	}()
+
+	{
+		// Create a malformed orderer.yaml file in temp dir
+		f, err := os.OpenFile(filepath.Join(name, "orderer.yaml"), os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+		assert.Nil(t, err, "Error creating file: %s", err)
+		f.WriteString("General: 42")
+		assert.NoError(t, f.Close(), "Error closing file")
 	}
 
-	var uconf struct{}
+	envVar1 := "FABRIC_CFG_PATH"
+	envVal1 := name
+	os.Setenv(envVar1, envVal1)
+	defer os.Unsetenv(envVar1)
 
-	err = viperutil.EnhancedExactUnmarshal(config, &uconf)
-	if err == nil {
-		t.Fatalf("Should have failed to unmarshal")
-	}
+	assert.Panics(t, func() { Load() }, "Should panic")
 }
 
 // TestEnvInnerVar verifies that with the Unmarshal function that
@@ -70,17 +79,11 @@ func TestEnvInnerVar(t *testing.T) {
 	defer os.Unsetenv(envVar2)
 	config := Load()
 
-	if config == nil {
-		t.Fatalf("Could not load config")
-	}
+	assert.NotNil(t, config, "Could not load config")
+	assert.Equal(t, config.General.ListenPort, envVal1, "Environmental override of inner config test 1 did not work")
 
-	if config.General.ListenPort != envVal1 {
-		t.Fatalf("Environmental override of inner config test 1 did not work")
-	}
 	v2, _ := time.ParseDuration(envVal2)
-	if config.Kafka.Retry.Period != v2 {
-		t.Fatalf("Environmental override of inner config test 2 did not work")
-	}
+	assert.Equal(t, config.Kafka.Retry.Period, v2, "Environmental override of inner config test 2 did not work")
 }
 
 const DummyPath = "/dummy/path"
@@ -107,3 +110,9 @@ func TestKafkaTLSConfig(t *testing.T) {
 		})
 	}
 }
+
+func TestProfileConfig(t *testing.T) {
+	uconf := &TopLevel{General: General{Profile: Profile{Enabled: true}}}
+	uconf.completeInitialization(DummyPath)
+	assert.Equal(t, defaults.General.Profile.Address, uconf.General.Profile.Address, "Expected profile address to be filled with default value")
+}