Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: use the assert package #44

Merged
merged 1 commit into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ module go.tmz.dev/musttag

go 1.19

require golang.org/x/tools v0.8.0
require (
go-simpler.org/assert v0.5.0
golang.org/x/tools v0.8.0
)

require (
golang.org/x/mod v0.10.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
go-simpler.org/assert v0.5.0 h1:+5L/lajuQtzmbtEfh69sr5cRf2/xZzyJhFjoOz/PPqs=
go-simpler.org/assert v0.5.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
Expand Down
54 changes: 24 additions & 30 deletions musttag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"path/filepath"
"testing"

"go-simpler.org/assert"
. "go-simpler.org/assert/dotimport"
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/analysis/analysistest"
)
Expand All @@ -24,9 +26,11 @@ func TestAnalyzer(t *testing.T) {
t.Run("tests", func(t *testing.T) {
r := report
defer func() { report = r }()

report = func(pass *analysis.Pass, st *structType, fn Func, fnPos token.Position) {
pass.Reportf(st.Pos, fn.shortName())
}

analyzer := New()
analysistest.Run(t, testdata, analyzer, "tests")
})
Expand All @@ -40,15 +44,11 @@ func TestAnalyzer(t *testing.T) {
})

t.Run("bad Func.ArgPos", func(t *testing.T) {
const want = `Func.ArgPos cannot be 10: encoding/json.Marshal accepts only 1 argument(s)`
analyzer := New(
// override the builtin function.
Func{Name: "encoding/json.Marshal", Tag: "json", ArgPos: 10},
)
result := analysistest.Run(nopT{}, testdata, analyzer, "tests")[0]
if got := result.Err.Error(); got != want {
t.Errorf("\ngot\t%s\nwant\t%s", got, want)
}
err := analysistest.Run(nopT{}, testdata, analyzer, "tests")[0].Err
assert.Equal[E](t, err.Error(), `Func.ArgPos cannot be 10: encoding/json.Marshal accepts only 1 argument(s)`)
})
}

Expand All @@ -59,25 +59,17 @@ func TestFlags(t *testing.T) {

t.Run("ok", func(t *testing.T) {
err := analyzer.Flags.Parse([]string{"-fn=test.Test:test:0"})
if err != nil {
t.Errorf("\ngot\t%s\nwant\tno error", err)
}
assert.NoErr[E](t, err)
})

t.Run("invalid format", func(t *testing.T) {
const want = `invalid value "test.Test" for flag -fn: invalid syntax`
err := analyzer.Flags.Parse([]string{"-fn=test.Test"})
if got := err.Error(); got != want {
t.Errorf("\ngot\t%s\nwant\t%s", got, want)
}
assert.Equal[E](t, err.Error(), `invalid value "test.Test" for flag -fn: invalid syntax`)
})

t.Run("non-number argpos", func(t *testing.T) {
const want = `invalid value "test.Test:test:-" for flag -fn: strconv.Atoi: parsing "-": invalid syntax`
err := analyzer.Flags.Parse([]string{"-fn=test.Test:test:-"})
if got := err.Error(); got != want {
t.Errorf("\ngot\t%s\nwant\t%s", got, want)
}
assert.Equal[E](t, err.Error(), `invalid value "test.Test:test:-" for flag -fn: strconv.Atoi: parsing "-": invalid syntax`)
})
}

Expand All @@ -89,29 +81,31 @@ func prepareTestFiles(t *testing.T) {
testdata := analysistest.TestData()

t.Cleanup(func() {
_ = os.RemoveAll(filepath.Join(testdata, "src"))
err := os.RemoveAll(filepath.Join(testdata, "src"))
assert.NoErr[F](t, err)
})

hardlink := func(dir, file string) {
target := filepath.Join(testdata, "src", dir, file)
if err := os.MkdirAll(filepath.Dir(target), 0o777); err != nil {
t.Fatal(err)
}
if err := os.Link(filepath.Join(testdata, file), target); err != nil {
t.Fatal(err)
}

err := os.MkdirAll(filepath.Dir(target), 0o777)
assert.NoErr[F](t, err)

err = os.Link(filepath.Join(testdata, file), target)
assert.NoErr[F](t, err)
}

hardlink("tests", "tests.go")
hardlink("builtins", "builtins.go")

for file, data := range stubs {
target := filepath.Join(testdata, "src", file)
if err := os.MkdirAll(filepath.Dir(target), 0o777); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(target, []byte(data), 0o666); err != nil {
t.Fatal(err)
}

err := os.MkdirAll(filepath.Dir(target), 0o777)
assert.NoErr[F](t, err)

err = os.WriteFile(target, []byte(data), 0o666)
assert.NoErr[F](t, err)
}
}

Expand Down