From 6d865b351bb78383bdacbf5ab310139d9354b795 Mon Sep 17 00:00:00 2001 From: Joseph Kato Date: Tue, 4 Feb 2025 23:54:04 -0800 Subject: [PATCH] refactor: remove testify --- go.mod | 4 +--- internal/core/ini_test.go | 40 ++++++++++++++++++++++++++++---------- internal/lint/html_test.go | 20 +++++++++++-------- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 5bc884c6..8be6fdf1 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/remeh/sizedwaitgroup v1.0.0 github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.10.0 github.com/tomwright/dasel/v2 v2.8.1 github.com/yuin/goldmark v1.7.8 golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 @@ -38,7 +37,6 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.3.1 // indirect github.com/atomicgo/cursor v0.0.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gookit/color v1.5.4 // indirect github.com/huandu/xstrings v1.5.0 // indirect @@ -46,10 +44,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/montanaflynn/stats v0.7.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/spf13/cast v1.7.1 // indirect + github.com/stretchr/testify v1.10.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/crypto v0.32.0 // indirect golang.org/x/sync v0.10.0 // indirect diff --git a/internal/core/ini_test.go b/internal/core/ini_test.go index 088aa094..82f6e65c 100644 --- a/internal/core/ini_test.go +++ b/internal/core/ini_test.go @@ -1,9 +1,8 @@ package core import ( + "strings" "testing" - - "github.com/stretchr/testify/assert" ) func Test_processConfig_commentDelimiters(t *testing.T) { @@ -18,7 +17,7 @@ func Test_processConfig_commentDelimiters(t *testing.T) { CommentDelimiters = "{/*,*/}" `, expected: map[string][2]string{ - "*.md": [2]string{"{/*", "*/}"}, + "*.md": {"{/*", "*/}"}, }, }, { @@ -33,13 +32,26 @@ TokenIgnores = (\$+[^\n$]+\$+) for _, c := range cases { t.Run(c.description, func(t *testing.T) { uCfg, err := shadowLoad([]byte(c.body)) - assert.NoError(t, err) + if err != nil { + t.Fatal(err) + } + conf, err := NewConfig(&CLIFlags{}) - assert.NoError(t, err) + if err != nil { + t.Fatal(err) + } + _, err = processConfig(uCfg, conf, false) - assert.NoError(t, err) + if err != nil { + t.Fatal(err) + } + actual := conf.CommentDelimiters - assert.Equal(t, c.expected, actual) + for k, v := range c.expected { + if actual[k] != v { + t.Errorf("expected %v, but got %v", v, actual[k]) + } + } }) } } @@ -86,11 +98,19 @@ CommentDelimiters = "{/*" for _, c := range cases { t.Run(c.description, func(t *testing.T) { uCfg, err := shadowLoad([]byte(c.body)) - assert.NoError(t, err) + if err != nil { + t.Fatal(err) + } + conf, err := NewConfig(&CLIFlags{}) - assert.NoError(t, err) + if err != nil { + t.Fatal(err) + } + _, err = processConfig(uCfg, conf, false) - assert.ErrorContains(t, err, c.expectedErr) + if !strings.Contains(err.Error(), c.expectedErr) { + t.Errorf("expected %v, but got %v", c.expectedErr, err.Error()) + } }) } } diff --git a/internal/lint/html_test.go b/internal/lint/html_test.go index 49b318f7..76a7f356 100644 --- a/internal/lint/html_test.go +++ b/internal/lint/html_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/errata-ai/vale/v3/internal/core" - "github.com/stretchr/testify/assert" ) func Test_applyPatterns(t *testing.T) { @@ -20,7 +19,7 @@ func Test_applyPatterns(t *testing.T) { description: "MDX comment in markdown, custom comment delimiter", conf: core.Config{ CommentDelimiters: map[string][2]string{ - ".md": [2]string{"{/*", "*/}"}, + ".md": {"{/*", "*/}"}, }, }, exts: extensionConfig{".md", ".md"}, @@ -74,7 +73,7 @@ This is the intro pagragraph. description: "multiline MDX comment in markdown, custom comment delimiter", conf: core.Config{ CommentDelimiters: map[string][2]string{ - ".md": [2]string{"{/*", "*/}"}, + ".md": {"{/*", "*/}"}, }, }, exts: extensionConfig{".md", ".md"}, @@ -108,7 +107,7 @@ This is a comment content: "Call \\c func to start the process.", conf: core.Config{ TokenIgnores: map[string][]string{ - "*.cc": []string{`(\\c \w+)`}, + "*.cc": {`(\\c \w+)`}, }, Formats: map[string]string{ "cc": "md", @@ -122,8 +121,11 @@ This is a comment for _, c := range cases { t.Run(c.description, func(t *testing.T) { s, err := applyPatterns(&c.conf, c.exts, c.content) - assert.NoError(t, err) - assert.Equal(t, c.expected, s) + if err != nil { + t.Fatalf("applyPatterns returned an error: %s", err) + } else if s != c.expected { + t.Fatalf("Expected '%s', but got '%s'", c.expected, s) + } }) } } @@ -140,7 +142,7 @@ func Test_applyPatterns_errors(t *testing.T) { description: "only one delimiter", conf: core.Config{ CommentDelimiters: map[string][2]string{ - ".md": [2]string{"{/*", ""}, + ".md": {"{/*", ""}, }, }, exts: extensionConfig{".md", ".md"}, @@ -159,7 +161,9 @@ This is the intro pagragraph. for _, c := range cases { t.Run(c.description, func(t *testing.T) { _, err := applyPatterns(&c.conf, c.exts, c.content) - assert.ErrorContains(t, err, c.expectedErr) + if !strings.Contains(err.Error(), c.expectedErr) { + t.Fatalf("Expected '%s', but got '%s'", c.expectedErr, err.Error()) + } }) } }