chore: Test fixes and small tweaks (#75)

As the follow-up for recent merges. `make test` should be passing now.

Author: mumoshu

Makefile

@@ -20,6 +20,10 @@ build:
 	mkdir -p bin/
 	go build -i -v -o bin/diff -ldflags="$(LDFLAGS)"
 
+.PHONY: test
+test:
+	go test -v ./...
+
 .PHONY: bootstrap
 bootstrap:
 ifndef HAS_GLIDE

diff/diff.go

@@ -20,43 +20,47 @@ func DiffManifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppre
 			if oldContent.Content != newContent.Content {
 				// modified
 				fmt.Fprintf(to, ansi.Color("%s has changed:", "yellow")+"\n", key)
-				diffs := generateDiff(oldContent, newContent)
+				diffs := diffMappingResults(oldContent, newContent)
 				if len(diffs) > 0 {
 					seenAnyChanges = true
 				}
-				printDiff(suppressedKinds, oldContent.Kind, context, diffs, to)
+				printDiffRecords(suppressedKinds, oldContent.Kind, context, diffs, to)
 			}
 		} else {
 			// removed
 			fmt.Fprintf(to, ansi.Color("%s has been removed:", "yellow")+"\n", key)
-			diffs := generateDiff(oldContent, emptyMapping)
+			diffs := diffMappingResults(oldContent, emptyMapping)
 			if len(diffs) > 0 {
 				seenAnyChanges = true
 			}
-			printDiff(suppressedKinds, oldContent.Kind, context, diffs, to)
+			printDiffRecords(suppressedKinds, oldContent.Kind, context, diffs, to)
 		}
 	}
 
 	for key, newContent := range newIndex {
 		if _, ok := oldIndex[key]; !ok {
 			// added
 			fmt.Fprintf(to, ansi.Color("%s has been added:", "yellow")+"\n", key)
-			diffs := generateDiff(emptyMapping, newContent)
+			diffs := diffMappingResults(emptyMapping, newContent)
 			if len(diffs) > 0 {
 				seenAnyChanges = true
 			}
-			printDiff(suppressedKinds, newContent.Kind, context, diffs, to)
+			printDiffRecords(suppressedKinds, newContent.Kind, context, diffs, to)
 		}
 	}
 	return seenAnyChanges
 }
 
-func generateDiff(oldContent *manifest.MappingResult, newContent *manifest.MappingResult) []difflib.DiffRecord {
+func diffMappingResults(oldContent *manifest.MappingResult, newContent *manifest.MappingResult) []difflib.DiffRecord {
+	return diffStrings(oldContent.Content, newContent.Content)
+}
+
+func diffStrings(before, after string) []difflib.DiffRecord {
 	const sep = "\n"
-	return difflib.Diff(strings.Split(oldContent.Content, sep), strings.Split(newContent.Content, sep))
+	return difflib.Diff(strings.Split(before, sep), strings.Split(after, sep))
 }
 
-func printDiff(suppressedKinds []string, kind string, context int, diffs []difflib.DiffRecord, to io.Writer) {
+func printDiffRecords(suppressedKinds []string, kind string, context int, diffs []difflib.DiffRecord, to io.Writer) {
 	for _, ckind := range suppressedKinds {
 		if ckind == kind {
 			str := fmt.Sprintf("+ Changes suppressed on sensitive content of type %s\n", kind)

diff/diff_test.go

@@ -119,7 +119,8 @@ func TestPrintDiffWithContext(t *testing.T) {
 func assertDiff(t *testing.T, before, after string, context int, expected string) {
 	ansi.DisableColors(true)
 	var output bytes.Buffer
-	printDiff([]string{}, "some-resource", context, before, after, &output)
+	diffs := diffStrings(before, after)
+	printDiffRecords([]string{}, "some-resource", context, diffs, &output)
 	actual := output.String()
 	if actual != expected {
 		t.Errorf("Unexpected diff output: \nExpected:\n#%v# \nActual:\n#%v#", expected, actual)
@@ -153,16 +154,32 @@ metadata:
 `,
 		}}
 
-	var buf bytes.Buffer
-	DiffManifests(specBeta, specRelease, []string{}, 10, &buf)
+	t.Run("OnChange", func(t *testing.T) {
 
-	require.Equal(t, `default, nginx, Deployment (apps) has changed:
+		var buf1 bytes.Buffer
+
+		if changesSeen := DiffManifests(specBeta, specRelease, []string{}, 10, &buf1); !changesSeen {
+			t.Error("Unexpected return value from DiffManifests: Expected the return value to be `true` to indicate that it has seen any change(s), but was `false`")
+		}
+
+		require.Equal(t, `default, nginx, Deployment (apps) has changed:
   
 - apiVersion: apps/v1beta1
 + apiVersion: apps/v1
   kind: Deployment
   metadata:
     name: nginx
   
-`, buf.String())
+`, buf1.String())
+	})
+
+	t.Run("OnNoChange", func(t *testing.T) {
+		var buf2 bytes.Buffer
+
+		if changesSeen := DiffManifests(specRelease, specRelease, []string{}, 10, &buf2); changesSeen {
+			t.Error("Unexpected return value from DiffManifests: Expected the return value to be `false` to indicate that it has NOT seen any change(s), but was `true`")
+		}
+
+		require.Equal(t, ``, buf2.String())
+	})
 }