tests: simplify, use t.Helper, use t.Setenv

This commit is contained in:
Bruno Reis 2023-08-06 16:05:52 -07:00
parent 660b9045e1
commit 134cfaeba0
2 changed files with 173 additions and 281 deletions

File diff suppressed because it is too large Load Diff

View File

@ -42,8 +42,7 @@ func TestMinimalSubcommand(t *testing.T) {
var args struct {
List *listCmd `arg:"subcommand"`
}
p, err := pparse("list", &args)
require.NoError(t, err)
p := pparse(t, "list", &args)
assert.NotNil(t, args.List)
assert.Equal(t, args.List, p.Subcommand())
assert.Equal(t, []string{"list"}, p.SubcommandNames())
@ -66,7 +65,7 @@ func TestNoSuchSubcommand(t *testing.T) {
var args struct {
List *listCmd `arg:"subcommand"`
}
_, err := pparse("invalid", &args)
_, err := parseWithEnvErr(t, "invalid", nil, &args)
assert.Error(t, err)
}
@ -76,8 +75,7 @@ func TestNamedSubcommand(t *testing.T) {
var args struct {
List *listCmd `arg:"subcommand:ls"`
}
p, err := pparse("ls", &args)
require.NoError(t, err)
p := pparse(t, "ls", &args)
assert.NotNil(t, args.List)
assert.Equal(t, args.List, p.Subcommand())
assert.Equal(t, []string{"ls"}, p.SubcommandNames())
@ -89,8 +87,7 @@ func TestEmptySubcommand(t *testing.T) {
var args struct {
List *listCmd `arg:"subcommand"`
}
p, err := pparse("", &args)
require.NoError(t, err)
p := pparse(t, "", &args)
assert.Nil(t, args.List)
assert.Nil(t, p.Subcommand())
assert.Empty(t, p.SubcommandNames())
@ -105,8 +102,7 @@ func TestTwoSubcommands(t *testing.T) {
Get *getCmd `arg:"subcommand"`
List *listCmd `arg:"subcommand"`
}
p, err := pparse("list", &args)
require.NoError(t, err)
p := pparse(t, "list", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
assert.Equal(t, args.List, p.Subcommand())
@ -128,16 +124,14 @@ func TestSubcommandsWithOptions(t *testing.T) {
{
var args cmd
err := parse("list", &args)
require.NoError(t, err)
parse(t, "list", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
}
{
var args cmd
err := parse("list --limit 3", &args)
require.NoError(t, err)
parse(t, "list --limit 3", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
assert.Equal(t, args.List.Limit, 3)
@ -145,8 +139,7 @@ func TestSubcommandsWithOptions(t *testing.T) {
{
var args cmd
err := parse("list --limit 3 --verbose", &args)
require.NoError(t, err)
parse(t, "list --limit 3 --verbose", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
assert.Equal(t, args.List.Limit, 3)
@ -155,8 +148,7 @@ func TestSubcommandsWithOptions(t *testing.T) {
{
var args cmd
err := parse("list --verbose --limit 3", &args)
require.NoError(t, err)
parse(t, "list --verbose --limit 3", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
assert.Equal(t, args.List.Limit, 3)
@ -165,8 +157,7 @@ func TestSubcommandsWithOptions(t *testing.T) {
{
var args cmd
err := parse("--verbose list --limit 3", &args)
require.NoError(t, err)
parse(t, "--verbose list --limit 3", &args)
assert.Nil(t, args.Get)
assert.NotNil(t, args.List)
assert.Equal(t, args.List.Limit, 3)
@ -175,16 +166,14 @@ func TestSubcommandsWithOptions(t *testing.T) {
{
var args cmd
err := parse("get", &args)
require.NoError(t, err)
parse(t, "get", &args)
assert.NotNil(t, args.Get)
assert.Nil(t, args.List)
}
{
var args cmd
err := parse("get --name test", &args)
require.NoError(t, err)
parse(t, "get --name test", &args)
assert.NotNil(t, args.Get)
assert.Nil(t, args.List)
assert.Equal(t, args.Get.Name, "test")
@ -207,8 +196,7 @@ func TestSubcommandsWithEnvVars(t *testing.T) {
{
var args cmd
setenv(t, "LIMIT", "123")
err := parse("list", &args)
require.NoError(t, err)
parse(t, "list", &args)
require.NotNil(t, args.List)
assert.Equal(t, 123, args.List.Limit)
}
@ -216,7 +204,7 @@ func TestSubcommandsWithEnvVars(t *testing.T) {
{
var args cmd
setenv(t, "LIMIT", "not_an_integer")
err := parse("list", &args)
_, err := parseWithEnvErr(t, "list", nil, &args)
assert.Error(t, err)
}
}
@ -235,8 +223,7 @@ func TestNestedSubcommands(t *testing.T) {
{
var args root
p, err := pparse("grandparent parent child", &args)
require.NoError(t, err)
p := pparse(t, "grandparent parent child", &args)
require.NotNil(t, args.Grandparent)
require.NotNil(t, args.Grandparent.Parent)
require.NotNil(t, args.Grandparent.Parent.Child)
@ -246,8 +233,7 @@ func TestNestedSubcommands(t *testing.T) {
{
var args root
p, err := pparse("grandparent parent", &args)
require.NoError(t, err)
p := pparse(t, "grandparent parent", &args)
require.NotNil(t, args.Grandparent)
require.NotNil(t, args.Grandparent.Parent)
require.Nil(t, args.Grandparent.Parent.Child)
@ -257,8 +243,7 @@ func TestNestedSubcommands(t *testing.T) {
{
var args root
p, err := pparse("grandparent", &args)
require.NoError(t, err)
p := pparse(t, "grandparent", &args)
require.NotNil(t, args.Grandparent)
require.Nil(t, args.Grandparent.Parent)
assert.Equal(t, args.Grandparent, p.Subcommand())
@ -267,8 +252,7 @@ func TestNestedSubcommands(t *testing.T) {
{
var args root
p, err := pparse("", &args)
require.NoError(t, err)
p := pparse(t, "", &args)
require.Nil(t, args.Grandparent)
assert.Nil(t, p.Subcommand())
assert.Empty(t, p.SubcommandNames())
@ -286,16 +270,14 @@ func TestSubcommandsWithPositionals(t *testing.T) {
{
var args cmd
err := parse("list", &args)
require.NoError(t, err)
parse(t, "list", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "", args.List.Pattern)
}
{
var args cmd
err := parse("list --format json", &args)
require.NoError(t, err)
parse(t, "list --format json", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "", args.List.Pattern)
assert.Equal(t, "json", args.Format)
@ -303,16 +285,14 @@ func TestSubcommandsWithPositionals(t *testing.T) {
{
var args cmd
err := parse("list somepattern", &args)
require.NoError(t, err)
parse(t, "list somepattern", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "somepattern", args.List.Pattern)
}
{
var args cmd
err := parse("list somepattern --format json", &args)
require.NoError(t, err)
parse(t, "list somepattern --format json", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "somepattern", args.List.Pattern)
assert.Equal(t, "json", args.Format)
@ -320,8 +300,7 @@ func TestSubcommandsWithPositionals(t *testing.T) {
{
var args cmd
err := parse("list --format json somepattern", &args)
require.NoError(t, err)
parse(t, "list --format json somepattern", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "somepattern", args.List.Pattern)
assert.Equal(t, "json", args.Format)
@ -329,8 +308,7 @@ func TestSubcommandsWithPositionals(t *testing.T) {
{
var args cmd
err := parse("--format json list somepattern", &args)
require.NoError(t, err)
parse(t, "--format json list somepattern", &args)
assert.NotNil(t, args.List)
assert.Equal(t, "somepattern", args.List.Pattern)
assert.Equal(t, "json", args.Format)
@ -338,8 +316,7 @@ func TestSubcommandsWithPositionals(t *testing.T) {
{
var args cmd
err := parse("--format json", &args)
require.NoError(t, err)
parse(t, "--format json", &args)
assert.Nil(t, args.List)
assert.Equal(t, "json", args.Format)
}
@ -355,16 +332,14 @@ func TestSubcommandsWithMultiplePositionals(t *testing.T) {
{
var args cmd
err := parse("get", &args)
require.NoError(t, err)
parse(t, "get", &args)
assert.NotNil(t, args.Get)
assert.Empty(t, args.Get.Items)
}
{
var args cmd
err := parse("get --limit 5", &args)
require.NoError(t, err)
parse(t, "get --limit 5", &args)
assert.NotNil(t, args.Get)
assert.Empty(t, args.Get.Items)
assert.Equal(t, 5, args.Limit)
@ -372,24 +347,21 @@ func TestSubcommandsWithMultiplePositionals(t *testing.T) {
{
var args cmd
err := parse("get item1", &args)
require.NoError(t, err)
parse(t, "get item1", &args)
assert.NotNil(t, args.Get)
assert.Equal(t, []string{"item1"}, args.Get.Items)
}
{
var args cmd
err := parse("get item1 item2 item3", &args)
require.NoError(t, err)
parse(t, "get item1 item2 item3", &args)
assert.NotNil(t, args.Get)
assert.Equal(t, []string{"item1", "item2", "item3"}, args.Get.Items)
}
{
var args cmd
err := parse("get item1 --limit 5 item2", &args)
require.NoError(t, err)
parse(t, "get item1 --limit 5 item2", &args)
assert.NotNil(t, args.Get)
assert.Equal(t, []string{"item1", "item2"}, args.Get.Items)
assert.Equal(t, 5, args.Limit)