fix test error messages

kubernetes-sigs · Jul 16, 2018 · c6968cb · c6968cb
1 parent bdfde6a
commit c6968cb
Showing 1 changed file with 34 additions and 16 deletions.
diff --git a/clusterctl/validation/validate_cluster_api_objects_test.go b/clusterctl/validation/validate_cluster_api_objects_test.go
@@ -157,11 +157,14 @@ func TestGetClusterObjectWithOneCluster(t *testing.T) {
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
 			cluster, err := getClusterObject(clusterApiClient, testcase.clusterName, testcase.namespace)
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 			if err == nil && cluster.Name != testClusterName {
-				t.Fatalf("Unexpected cluster name. Got: %s, Want: %s", cluster.Name, testClusterName)
+				t.Fatalf("Unexpected cluster name. Expect: %s, Got: %s", testClusterName, cluster.Name)
 			}
 		})
 	}
@@ -209,11 +212,14 @@ func TestGetClusterObjectWithMoreThanOneCluster(t *testing.T) {
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
 			cluster, err := getClusterObject(clusterApiClient, testcase.clusterName, testNamespace)
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 			if err == nil && cluster.Name != testClusterName1 {
-				t.Fatalf("Unexpected cluster name. Got: %s, Want: %s", cluster.Name, testClusterName1)
+				t.Fatalf("Unexpected cluster name. Expect: %s, Got: %s", testClusterName1, cluster.Name)
 			}
 		})
 	}
@@ -256,8 +262,11 @@ func TestValidateClusterObject(t *testing.T) {
 			cluster := getClusterWithError("test-cluster", testcase.errorReason, testcase.errorMessage)
 			var b bytes.Buffer
 			err := validateClusterObject(&b, &cluster)
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 		})
 	}
@@ -328,8 +337,11 @@ func TestValidateMachineObjects(t *testing.T) {
 			}
 			var b bytes.Buffer
 			err := validateMachineObjects(&b, &machines, k8sClient)
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 		})
 	}
@@ -384,8 +396,11 @@ func TestValidateMachineObjectWithReferredNode(t *testing.T) {
 			}
 			var b bytes.Buffer
 			err := validateMachineObjects(&b, &machines, k8sClient)
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 		})
 	}
@@ -511,17 +526,20 @@ func TestValidateClusterAPIObjectsOutput(t *testing.T) {
 			var output bytes.Buffer
 			err = ValidateClusterAPIObjects(&output, clusterApiClient, k8sClient, testClusterName, testNamespace)
 
-			if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
-				t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
+			if testcase.expectErr && err == nil {
+				t.Fatalf("Expect to get error, but got no returned error.")
+			}
+			if !testcase.expectErr && err != nil {
+				t.Fatalf("Expect to get no error, but got returned error: %v", err)
 			}
 
 			outputFilePath := path.Join("testdata", testcase.outputFileName)
 			expectedOutput, err := ioutil.ReadFile(outputFilePath)
 			if err != nil {
-				t.Fatalf("unable to read output file '%v': %v", outputFilePath, err)
+				t.Fatalf("Unable to read output file '%v': %v", outputFilePath, err)
 			}
 			if bytes.Compare(expectedOutput, output.Bytes()) != 0 {
-				t.Errorf("unexpected output, want %v, got %v", string(expectedOutput), output.String())
+				t.Errorf("Unexpected output. Expect %v, Got %v", string(expectedOutput), output.String())
 			}
 		})
 	}