From 7d3da0e6851240a8b701ef01c88a2cba6ebc96ff Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 27 Dec 2025 17:05:01 -0500 Subject: Use internal flagset within the registry --- subcmd_test.go | 56 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'subcmd_test.go') diff --git a/subcmd_test.go b/subcmd_test.go index bd3c083..e6e5301 100644 --- a/subcmd_test.go +++ b/subcmd_test.go @@ -34,13 +34,11 @@ func (m *mockCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...any) } -// setupOsArgs sets up os.Args and flag.CommandLine for testing, +// setupOsArgs sets up os.Args for testing, // returning a cleanup function that restores the original state. func setupOsArgs(args ...string) func() { oldArgs := os.Args os.Args = args - flag.CommandLine = flag.NewFlagSet(args[0], flag.ExitOnError) - flag.Parse() return func() { os.Args = oldArgs } } @@ -59,9 +57,9 @@ func TestRegistry_Register(t *testing.T) { func TestRegistry_Execute_NoSubcommand(t *testing.T) { var buf bytes.Buffer - r := NewRegistry(WithOutput(&buf)) cleanup := setupOsArgs("prog") defer cleanup() + r := NewRegistry(WithOutput(&buf)) status := r.Execute(context.Background()) @@ -73,9 +71,9 @@ func TestRegistry_Execute_NoSubcommand(t *testing.T) { func TestRegistry_Execute_UnknownSubcommand(t *testing.T) { var buf bytes.Buffer - r := NewRegistry(WithOutput(&buf)) cleanup := setupOsArgs("prog", "unknown") defer cleanup() + r := NewRegistry(WithOutput(&buf)) status := r.Execute(context.Background()) @@ -89,10 +87,10 @@ func TestRegistry_Execute_Success(t *testing.T) { name: "test", exitStatus: ExitSuccess, } - r := NewRegistry(WithOutput(&buf)) - r.Register(cmd, "") cleanup := setupOsArgs("prog", "test") defer cleanup() + r := NewRegistry(WithOutput(&buf)) + r.Register(cmd, "") status := r.Execute(context.Background()) @@ -106,10 +104,10 @@ func TestRegistry_Execute_WithFlags(t *testing.T) { name: "test", exitStatus: ExitSuccess, } - r := NewRegistry(WithOutput(&buf)) - r.Register(cmd, "") cleanup := setupOsArgs("prog", "test", "-test=value") defer cleanup() + r := NewRegistry(WithOutput(&buf)) + r.Register(cmd, "") status := r.Execute(context.Background()) @@ -117,26 +115,45 @@ func TestRegistry_Execute_WithFlags(t *testing.T) { check.Equal(t, cmd.flagValue, "value") } -func TestRegistry_Execute_HelpFlag(t *testing.T) { +func TestRegistry_Execute_SubcommandHelpFlag(t *testing.T) { var buf bytes.Buffer cmd := &mockCommand{ name: "test", usage: "test:\n This is the test command usage.\n", } + cleanup := setupOsArgs("prog", "test", "-h") + defer cleanup() r := NewRegistry( WithOutput(&buf), WithErrorHandling(flag.ContinueOnError), ) r.Register(cmd, "") - cleanup := setupOsArgs("prog", "test", "-h") - defer cleanup() status := r.Execute(context.Background()) - check.Equal(t, status, ExitFailure) + check.Equal(t, status, ExitSuccess) check.Contains(t, buf.String(), "This is the test command usage.") } +func TestRegistry_Execute_TopLevelHelpFlag(t *testing.T) { + var buf bytes.Buffer + cmd := &mockCommand{name: "test", synopsis: "Test command"} + cleanup := setupOsArgs("prog", "-h") + defer cleanup() + r := NewRegistry( + WithOutput(&buf), + WithErrorHandling(flag.ContinueOnError), + ) + r.Register(cmd, "") + + status := r.Execute(context.Background()) + + check.Equal(t, status, ExitSuccess) + output := buf.String() + check.Contains(t, output, "Usage: prog") + check.Contains(t, output, "test") +} + func TestRegistry_Commands(t *testing.T) { cmd1 := &mockCommand{name: "aaa", synopsis: "First"} cmd2 := &mockCommand{name: "bbb", synopsis: "Second"} @@ -320,21 +337,14 @@ func TestFlagsCommand_NoFlags(t *testing.T) { func TestFlagsCommand_WithFlags(t *testing.T) { var buf bytes.Buffer r := NewRegistry(WithOutput(&buf)) + r.Flags().String("testflag", "default", "test flag description") + cmd := &flagsCommand{registry: r} fs := flag.NewFlagSet("flags", flag.ExitOnError) - flag.String("testflag", "default", "test flag description") - flags := &flagsCommand{registry: r} - status := flags.Execute(context.Background(), fs) + status := cmd.Execute(context.Background(), fs) check.Equal(t, status, ExitSuccess) output := buf.String() - check.Equal( - t, - output, - `Top-level flags: - -testflag (default: default) - test flag description -`) check.Contains(t, output, "testflag") check.Contains(t, output, "test flag description") } -- cgit v1.2.3