Address more comments

Author: Martin Mulholland

tests/utils/command_test_utils.go

@@ -11,8 +11,8 @@ import (
 	schema "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
 )
 
-// AddEnv creates and returns a specifed number of env attributes in a schema structure
-func AddEnv(numEnv int) []schema.EnvVar {
+// addEnv creates and returns a specifed number of env attributes in a schema structure
+func addEnv(numEnv int) []schema.EnvVar {
 	commandEnvs := make([]schema.EnvVar, numEnv)
 	for i := 0; i < numEnv; i++ {
 		commandEnvs[i].Name = "Name_" + GetRandomString(5, false)
@@ -22,8 +22,8 @@ func AddEnv(numEnv int) []schema.EnvVar {
 	return commandEnvs
 }
 
-// AddAttributes creates returns a specifed number of attributes in a schema structure
-func AddAttributes(numAtrributes int) map[string]string {
+// addAttributes creates returns a specifed number of attributes in a schema structure
+func addAttributes(numAtrributes int) map[string]string {
 	attributes := make(map[string]string)
 	for i := 0; i < numAtrributes; i++ {
 		AttributeName := "Name_" + GetRandomString(6, false)
@@ -127,7 +127,7 @@ func setExecCommandValues(execCommand *schema.ExecCommand) {
 	LogInfoMessage(fmt.Sprintf("....... HotReloadCapable: %t", execCommand.HotReloadCapable))
 
 	if GetBinaryDecision() {
-		execCommand.Env = AddEnv(GetRandomNumber(4))
+		execCommand.Env = addEnv(GetRandomNumber(4))
 	} else {
 		execCommand.Env = nil
 	}

tests/utils/component_test_utils.go

@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-// AddVolume returns volumeMounts in a schema structure based on a specified number of volumes
-func AddVolume(numVols int) []schema.VolumeMount {
+// addVolume returns volumeMounts in a schema structure based on a specified number of volumes
+func addVolume(numVols int) []schema.VolumeMount {
 	commandVols := make([]schema.VolumeMount, numVols)
 	for i := 0; i < numVols; i++ {
 		commandVols[i].Name = "Name_" + GetRandomString(5, false)
@@ -125,13 +125,13 @@ func setContainerComponentValues(containerComponent *schema.ContainerComponent)
 	}
 
 	if GetBinaryDecision() {
-		containerComponent.Env = AddEnv(GetRandomNumber(4))
+		containerComponent.Env = addEnv(GetRandomNumber(4))
 	} else {
 		containerComponent.Env = nil
 	}
 
 	if GetBinaryDecision() {
-		containerComponent.VolumeMounts = AddVolume(GetRandomNumber(4))
+		containerComponent.VolumeMounts = addVolume(GetRandomNumber(4))
 	} else {
 		containerComponent.VolumeMounts = nil
 	}

tests/utils/endpoint-test-utils.go

@@ -8,16 +8,16 @@ import (
 
 var Exposures = [...]schema.EndpointExposure{schema.PublicEndpointExposure, schema.InternalEndpointExposure, schema.NoneEndpointExposure}
 
-// GetRandomExposure returns a random exposure value
-func GetRandomExposure() schema.EndpointExposure {
+// getRandomExposure returns a random exposure value
+func getRandomExposure() schema.EndpointExposure {
 	return Exposures[GetRandomNumber(len(Exposures))-1]
 }
 
 //var Protocols = [...]schema.EndpointProtocol{schema.HTTPEndpointProtocol, schema.HTTPSEndpointProtocol, schema.WSEndpointProtocol, schema.WSSEndpointProtocol, schema.TCPEndpointProtocol, schema.UDPEndpointProtocol}
 var Protocols = [...]schema.EndpointProtocol{schema.HTTPEndpointProtocol, schema.WSEndpointProtocol, schema.TCPEndpointProtocol, schema.UDPEndpointProtocol}
 
-// GetRandomProtocol returns a random protocol value
-func GetRandomProtocol() schema.EndpointProtocol {
+// getRandomProtocol returns a random protocol value
+func getRandomProtocol() schema.EndpointProtocol {
 	return Protocols[GetRandomNumber(len(Protocols))-1]
 }
 
@@ -38,12 +38,12 @@ func CreateEndpoints() []schema.Endpoint {
 		LogInfoMessage(fmt.Sprintf("   ....... add endpoint %d targetPort: %d", i, endpoint.TargetPort))
 
 		if GetBinaryDecision() {
-			endpoint.Exposure = GetRandomExposure()
+			endpoint.Exposure = getRandomExposure()
 			LogInfoMessage(fmt.Sprintf("   ....... add endpoint %d exposure: %s", i, endpoint.Exposure))
 		}
 
 		if GetBinaryDecision() {
-			endpoint.Protocol = GetRandomProtocol()
+			endpoint.Protocol = getRandomProtocol()
 			LogInfoMessage(fmt.Sprintf("   ....... add endpoint %d protocol: %s", i, endpoint.Protocol))
 		}
 

tests/utils/project_test_utils.go

@@ -55,9 +55,6 @@ func init() {
 		}
 		testLogger.Println("Test Starting:")
 	}
-
-	testError(true)
-	testError1(true)
 }
 
 // createTempDir creates a specified sub directory under the temp directory if it does not exist.
@@ -299,9 +296,7 @@ func (devfile TestDevfile) Verify() error {
 		} else {
 			LogInfoMessage(fmt.Sprintf("No command found in %s : ", devfile.FileName))
 		}
-	}
 
-	if err == nil {
 		LogInfoMessage(fmt.Sprintf("Get components %s : ", devfile.FileName))
 		components, _ := devfile.ParsedSchemaObj.Data.GetComponents(common.DevfileOptions{})
 		if components != nil && len(components) > 0 {
@@ -313,7 +308,6 @@ func (devfile TestDevfile) Verify() error {
 			LogInfoMessage(fmt.Sprintf("No components found in %s : ", devfile.FileName))
 		}
 	}
-
 	var returnError error
 	if len(errorString) > 0 {
 		returnError = errors.New(fmt.Sprint(errorString))
@@ -379,55 +373,3 @@ func (devfile TestDevfile) EditComponents() error {
 func getError(message string) (string, error) {
 	return message, errors.New(message)
 }
-
-func testError(doit bool) {
-
-	var err error
-
-	message1, err := getError("Error21")
-	LogInfoMessage(fmt.Sprintf("Message1 : %s", message1))
-	LogInfoMessage(fmt.Sprintf("Error : %v", err))
-
-	if doit {
-		if err != nil {
-			message2, err := getError("Error22")
-			LogInfoMessage(fmt.Sprintf("Message2 : %s", message2))
-			LogInfoMessage(fmt.Sprintf("Error : %v", err))
-			if err != nil {
-				message3, err := getError("Error23")
-				LogInfoMessage(fmt.Sprintf("Message3 : %s", message3))
-				LogInfoMessage(fmt.Sprintf("Error : %v", err))
-			}
-		}
-	}
-
-	LogInfoMessage(fmt.Sprintf("At the end"))
-	LogInfoMessage(fmt.Sprintf("Error : %v", err))
-
-}
-func testError1(doit bool) {
-
-	var err error
-	var message string
-
-	message, err = getError("Message Var Error1")
-	LogInfoMessage(fmt.Sprintf("Message1 : %s", message))
-	LogInfoMessage(fmt.Sprintf("Error : %v", err))
-
-	if doit {
-		if err != nil {
-			message, err = getError("Message Var Error2")
-			LogInfoMessage(fmt.Sprintf("Message2 : %s", message))
-			LogInfoMessage(fmt.Sprintf("Error : %v", err))
-			if err != nil {
-				message, err = getError("Message Var Error3")
-				LogInfoMessage(fmt.Sprintf("Message1 : %s", message))
-				LogInfoMessage(fmt.Sprintf("Error : %v", err))
-			}
-		}
-	}
-
-	LogInfoMessage(fmt.Sprintf("At the end"))
-	LogInfoMessage(fmt.Sprintf("Error : %v", err))
-
-}