Merge pull request #98 from posener/refactor

Some refactorings

1 files changed, 102 insertions, 0 deletions

diff --git a/predict_test.go b/predict_test.go
index 24df78d..c376207 100644
--- a/predict_test.go
+++ b/predict_test.go
@@ -1,6 +1,8 @@
 package complete
 
 import (
+	"fmt"
+	"os"
 	"sort"
 	"strings"
 	"testing"
@@ -167,3 +169,103 @@ func TestPredicate(t *testing.T) {
 		}
 	}
 }
+
+func TestMatchFile(t *testing.T) {
+	t.Parallel()
+
+	// Change to tests directory for testing completion of
+	// files and directories
+	err := os.Chdir("../tests")
+	if err != nil {
+		panic(err)
+	}
+
+	type matcherTest struct {
+		prefix string
+		want   bool
+	}
+
+	tests := []struct {
+		long  string
+		tests []matcherTest
+	}{
+		{
+			long: "file.txt",
+			tests: []matcherTest{
+				{prefix: "", want: true},
+				{prefix: "f", want: true},
+				{prefix: "./f", want: true},
+				{prefix: "./.", want: false},
+				{prefix: "file.", want: true},
+				{prefix: "./file.", want: true},
+				{prefix: "file.txt", want: true},
+				{prefix: "./file.txt", want: true},
+				{prefix: "other.txt", want: false},
+				{prefix: "/other.txt", want: false},
+				{prefix: "/file.txt", want: false},
+				{prefix: "/fil", want: false},
+				{prefix: "/file.txt2", want: false},
+				{prefix: "/.", want: false},
+			},
+		},
+		{
+			long: "./file.txt",
+			tests: []matcherTest{
+				{prefix: "", want: true},
+				{prefix: "f", want: true},
+				{prefix: "./f", want: true},
+				{prefix: "./.", want: false},
+				{prefix: "file.", want: true},
+				{prefix: "./file.", want: true},
+				{prefix: "file.txt", want: true},
+				{prefix: "./file.txt", want: true},
+				{prefix: "other.txt", want: false},
+				{prefix: "/other.txt", want: false},
+				{prefix: "/file.txt", want: false},
+				{prefix: "/fil", want: false},
+				{prefix: "/file.txt2", want: false},
+				{prefix: "/.", want: false},
+			},
+		},
+		{
+			long: "/file.txt",
+			tests: []matcherTest{
+				{prefix: "", want: true},
+				{prefix: "f", want: false},
+				{prefix: "./f", want: false},
+				{prefix: "./.", want: false},
+				{prefix: "file.", want: false},
+				{prefix: "./file.", want: false},
+				{prefix: "file.txt", want: false},
+				{prefix: "./file.txt", want: false},
+				{prefix: "other.txt", want: false},
+				{prefix: "/other.txt", want: false},
+				{prefix: "/file.txt", want: true},
+				{prefix: "/fil", want: true},
+				{prefix: "/file.txt2", want: false},
+				{prefix: "/.", want: false},
+			},
+		},
+		{
+			long: "./",
+			tests: []matcherTest{
+				{prefix: "", want: true},
+				{prefix: ".", want: true},
+				{prefix: "./", want: true},
+				{prefix: "./.", want: false},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		for _, ttt := range tt.tests {
+			name := fmt.Sprintf("long=%q&prefix=%q", tt.long, ttt.prefix)
+			t.Run(name, func(t *testing.T) {
+				got := matchFile(tt.long, ttt.prefix)
+				if got != ttt.want {
+					t.Errorf("Failed %s: got = %t, want: %t", name, got, ttt.want)
+				}
+			})
+		}
+	}
+}