Split off deduplicate()/test

cv · cv · commit af57352692fc · 2018-04-16T12:54:03.000-07:00
diff --git a/cli/cli.go b/cli/cli.go
@@ -289,20 +289,3 @@ func execCommand(cmd *cobra.Command, args []string) error {
 	return syscallExec(src, append([]string{src}, args...), os.Environ())
 }
 
-/*
- * deduplicate a slice of strings, keeping the order of the elements
- */
-func deduplicate(input []string) []string {
-	var output []string
-	unique := map[string]interface{}{}
-	for _, i := range input {
-		unique[i] = new(interface{})
-	}
-	for _, i := range input {
-		if _, ok := unique[i]; ok {
-			output = append(output, i)
-			delete(unique, i)
-		}
-	}
-	return output
-}
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"testing"
 
@@ -103,24 +102,6 @@ func TestInitEditing(t *testing.T) {
 	})
 }
 
-func TestDeduplicate(t *testing.T) {
-	t.Run("simple", func(t *testing.T) {
-		assert.Equal(t, []string{"a"}, deduplicate(strings.Split("aaaaaa", "")))
-	})
-
-	t.Run("two elements", func(t *testing.T) {
-		assert.Equal(t, []string{"a", "b"}, deduplicate(strings.Split("aaaabb", "")))
-	})
-
-	t.Run("two elements repeated", func(t *testing.T) {
-		assert.Equal(t, []string{"a", "b"}, deduplicate(strings.Split("ababab", "")))
-	})
-
-	t.Run("maintains ordering", func(t *testing.T) {
-		assert.Equal(t, []string{"a", "c", "b"}, deduplicate(strings.Split("acbabab", "")))
-	})
-}
-
 func TestCommandFromScript(t *testing.T) {
 	t.Run("happy path", func(t *testing.T) {
 		f, err := ioutil.TempFile("", "test-command-from-script")
diff --git a/cli/utils.go b/cli/utils.go
@@ -0,0 +1,19 @@
+package cli
+
+/*
+ * deduplicate a slice of strings, keeping the order of the elements
+ */
+func deduplicate(input []string) []string {
+	var output []string
+	unique := map[string]interface{}{}
+	for _, i := range input {
+		unique[i] = new(interface{})
+	}
+	for _, i := range input {
+		if _, ok := unique[i]; ok {
+			output = append(output, i)
+			delete(unique, i)
+		}
+	}
+	return output
+}
diff --git a/cli/utils_test.go b/cli/utils_test.go
@@ -0,0 +1,43 @@
+package cli
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDeduplicate(t *testing.T) {
+	var tests = []struct {
+		name     string
+		input    []string
+		expected []string
+	}{
+		{
+			"simple",
+			strings.Split("aaaaaa", ""),
+			[]string{"a"},
+		},
+		{
+			"two elements",
+			[]string{"a", "b"},
+			deduplicate(strings.Split("aaaabb", "")),
+		},
+		{
+			"two elements repeated",
+			deduplicate(strings.Split("ababab", "")),
+			[]string{"a", "b"},
+		},
+		{
+			"maintains ordering",
+			deduplicate(strings.Split("acbaabab", "")),
+			[]string{"a", "c", "b"},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			assert.Equal(t, test.expected, deduplicate(test.input))
+		})
+	}
+}
