Merge pull request #132 from phelrine/fix-formatter-test

Fix formatter test setup and ignore condition
sqls-server · Jan 20, 2024 · d0751d8 · d0751d8
2 parents 7bc8eb6 + bf00c55
commit d0751d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/formatter/formatter_test.go b/internal/formatter/formatter_test.go
@@ -137,7 +137,6 @@ func TestFormat(t *testing.T) {
 		LowerCase:        false,
 		IdentifierQuoted: false,
 	}
-	env := &formatEnvironment{}
 	for _, fname := range files {
 		b, err := os.ReadFile(fname)
 		if err != nil {
@@ -147,6 +146,7 @@ func TestFormat(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		env := &formatEnvironment{}
 		formatted := Eval(parsed, env)
 		got := strings.TrimRight(formatted.Render(opts), "\n") + "\n"
 
@@ -156,7 +156,7 @@ func TestFormat(t *testing.T) {
 		}
 		want := string(b)
 		if got != want {
-			if _, err := os.Stat(fname[:len(fname)-4] + ".ignore"); err != nil {
+			if _, err := os.Stat(fname[:len(fname)-4] + ".ignore"); err == nil {
 				t.Logf("%s:\n"+
 					"    want: %q\n"+
 					"     got: %q\n",

diff --git a/internal/formatter/testdata/003.ignroe → internal/formatter/testdata/003.ignore b/internal/formatter/testdata/003.ignroe → internal/formatter/testdata/003.ignore