tests refactored pretty nicely now

lexer_test.go

@@ -6,17 +6,11 @@ import (
 	"code.ndumas.com/ndumas/wikilink-parser"
 )
 
-func Test_ObsidianWikilinks_LinksEndOfInput(t *testing.T) {
+var testCases = []tc{
-	tcs := []struct {
-		name     string
-		in       string
-		expected []wikilink.Lexeme
-	}{
 	{
 		name: "wikilink",
 		in:   "[[wikilink]]",
 		expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexText, Val: "this is a "},
 			{Typ: wikilink.LexOpenLink, Val: "[["},
 			{Typ: wikilink.LexIdent, Val: "wikilink"},
 			{Typ: wikilink.LexCloseLink, Val: "]]"},
@@ -25,9 +19,8 @@ func Test_ObsidianWikilinks_LinksEndOfInput(t *testing.T) {
 	},
 	{
 		name: "wikilink|display name",
-			in:   "is a [[wikilink|display name]]",
+		in:   "[[wikilink|display name]]",
 		expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexText, Val: "this is a "},
 			{Typ: wikilink.LexOpenLink, Val: "[["},
 			{Typ: wikilink.LexIdent, Val: "wikilink"},
 			{Typ: wikilink.LexAlias, Val: "|"},
@@ -215,249 +208,27 @@ func Test_ObsidianWikilinks_LinksEndOfInput(t *testing.T) {
 		},
 	},
 }
-	for _, tc := range tcs {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			// t.Parallel()
-			l := wikilink.Lex("testLexer", tc.in)
-			defer l.L.Sync()
-			if len(tc.expected) != len(l.Items) {
-				t.Logf("expected %d tokens, got %d\n", len(tc.expected), len(l.Items))
-				t.Fail()
 
-				return
+func Test_ObsidianWikilinks_LinksEndOfInput(t *testing.T) {
-			}
+	for _, tc := range testCases {
-			for i, e := range tc.expected {
+		mut, test := mutateTestCase(tc,
-				n := l.Items[i]
+			"this is a ",
-				if e.Typ != n.Typ {
+			"",
-					t.Logf("expected Type %s, received %s", e.Typ.String(), n.Typ.String())
+			[]wikilink.Lexeme{
-					t.Fail()
+				{Typ: wikilink.LexText, Val: "this is a "},
-
+			},
-					return
+			nil,
-				}
+			"",
-
+		)
-				if e.Val != n.Val {
+		t.Run(mut.name, test)
-					t.Logf("expected Value %q, received %q", e.Val, n.Val)
-					t.Fail()
-
-					return
-				}
-			}
-		})
 	}
 }
 
 func Test_ObsidianWikilinks_Basic(t *testing.T) {
-	t.Parallel()
+	// t.Parallel()
-	tcs := []struct {
-		name     string
-		in       string
-		expected []wikilink.Lexeme
-	}{
-		{
-			name: "wikilink",
-			in:   "[[wikilink]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink|display name",
-			in:   "[[wikilink|display name]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink|display name|second pipe",
-			in:   "[[wikilink|display name|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink with numeric alias|420|second pipe",
-			in:   "[[wikilink|420|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "420"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink with spaces in filename",
-			in:   "[[wikilink spaces]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink spaces"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "#heading",
-			in:   "[[#heading]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: ""},
-				{Typ: wikilink.LexHeading, Val: "#"},
-				{Typ: wikilink.LexIdent, Val: "heading"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#heading",
-			in:   "[[wikilink#heading]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexHeading, Val: "#"},
-				{Typ: wikilink.LexIdent, Val: "heading"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#heading|display name",
-			in:   "[[wikilink#heading|display name]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexHeading, Val: "#"},
-				{Typ: wikilink.LexIdent, Val: "heading"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#heading|display name|second pipe",
-			in:   "[[wikilink#heading|display name|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexHeading, Val: "#"},
-				{Typ: wikilink.LexIdent, Val: "heading"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink with numeric aliases#heading|420|display name",
-			in:   "[[wikilink#heading|420|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexHeading, Val: "#"},
-				{Typ: wikilink.LexIdent, Val: "heading"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "420"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "#^blockRef",
-			in:   "[[#^blockRef]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: ""},
-				{Typ: wikilink.LexBlockRef, Val: "#^"},
-				{Typ: wikilink.LexIdent, Val: "blockRef"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#^blockRef",
-			in:   "[[wikilink#^blockRef]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexBlockRef, Val: "#^"},
-				{Typ: wikilink.LexIdent, Val: "blockRef"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#^blockRef|display name",
-			in:   "[[wikilink#^blockRef|display name]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexBlockRef, Val: "#^"},
-				{Typ: wikilink.LexIdent, Val: "blockRef"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink#^blockRef|display name|second pipe",
-			in:   "[[wikilink#^blockRef|display name|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexBlockRef, Val: "#^"},
-				{Typ: wikilink.LexIdent, Val: "blockRef"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "display name"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-		{
-			name: "wikilink with numeric aliases#^blockRef|420|second pipe",
-			in:   "[[wikilink#^blockRef|420|second pipe]]",
-			expected: []wikilink.Lexeme{
-				{Typ: wikilink.LexOpenLink, Val: "[["},
-				{Typ: wikilink.LexIdent, Val: "wikilink"},
-				{Typ: wikilink.LexBlockRef, Val: "#^"},
-				{Typ: wikilink.LexIdent, Val: "blockRef"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "420"},
-				{Typ: wikilink.LexAlias, Val: "|"},
-				{Typ: wikilink.LexIdent, Val: "second pipe"},
-				{Typ: wikilink.LexCloseLink, Val: "]]"},
-				{Typ: wikilink.LexText, Val: ""},
-			},
-		},
-	}
 
-	for _, tc := range tcs {
+	for _, tc := range testCases {
-		mut, test := mutateTestCase(tc, "", "")
+		mut, test := mutateTestCase(tc, "", "", nil, nil, "")
 		t.Run(mut.name, test)
 	}
 }
@@ -468,15 +239,24 @@ type tc struct {
 	expected []wikilink.Lexeme
 }
 
-func mutateTestCase(tc tc, prefix, suffix string) (tc, func(t *testing.T)) {
+func mutateTestCase(tc tc, prefix, suffix string, expectedPrefix, expectedSuffix []wikilink.Lexeme, name string) (tc, func(t *testing.T)) {
+	tc.name = tc.name + "/" + name
 	tc.in = prefix + tc.in
 	tc.in = tc.in + suffix
+	if expectedPrefix != nil {
+		tc.expected = append(expectedPrefix, tc.expected...)
+	}
+	if expectedSuffix != nil {
+		tc.expected = append(tc.expected, expectedSuffix...)
+	}
+
 	return tc, func(t *testing.T) {
 		// t.Parallel()
 		l := wikilink.Lex("testLexer", tc.in)
 		defer l.L.Sync()
 		if len(tc.expected) != len(l.Items) {
 			t.Logf("expected %d tokens, got %d\n", len(tc.expected), len(l.Items))
+			t.Logf("raw items: %#v\n", l.Items)
 			t.Fail()
 
 			return