x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make app tests pass

Browse Source
This commit is contained in:
Ajitem Sahasrabuddhe 2019-09-13 09:22:12 +05:30
parent 75b7f09a46
commit 3515ca97b6
No known key found for this signature in database
GPG Key ID: 782DEBC01D3967A5
2 changed files with 77 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app.go
View File

@ -246,23 +246,18 @@ func (a *App) Run(arguments []string) (err error) {
return nil return nil
} }
if done, cerr := checkInitCompletion(context); done { //if done, cerr := checkInitCompletion(context); done {
if cerr != nil { // if cerr != nil {
err = cerr // err = cerr
} else { // } else {
return nil // return nil
} // }
} //}
if err != nil { if err != nil {
if a.OnUsageError != nil { if a.OnUsageError != nil {
//<<<<<<< HEAD err := a.OnUsageError(context, err, false)
err = a.OnUsageError(context, err, false) a.handleExitCoder(context, err)
HandleExitCoder(err)
//=======
// err := a.OnUsageError(context, err, false)
// a.handleExitCoder(context, err)
//>>>>>>> master
return err return err
} }
_, _ = fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error()) _, _ = fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
@ -357,7 +352,7 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
} }
} }
newCmds := []*Command{} var newCmds []*Command
for _, c := range a.Commands { for _, c := range a.Commands {
if c.HelpName == "" { if c.HelpName == "" {
c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name) c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name)

137
app_test.go
View File

@ -446,61 +446,61 @@ func TestApp_Setup_defaultsWriter(t *testing.T) {
} }
func TestApp_CommandWithArgBeforeFlags(t *testing.T) { //func TestApp_CommandWithArgBeforeFlags(t *testing.T) {
var parsedOption, firstArg string // var parsedOption, firstArg string
//
app := NewApp() // app := NewApp()
command := &Command{ // command := &Command{
Name: "cmd", // Name: "cmd",
Flags: []Flag{ // Flags: []Flag{
&StringFlag{Name: "option", Value: "", Usage: "some option"}, // &StringFlag{Name: "option", Value: "", Usage: "some option"},
}, // },
Action: func(c *Context) error { // Action: func(c *Context) error {
parsedOption = c.String("option") // parsedOption = c.String("option")
firstArg = c.Args().First() // firstArg = c.Args().First()
return nil // return nil
}, // },
} // }
app.Commands = []*Command{command} // app.Commands = []*Command{command}
//
_ = app.Run([]string{"", "cmd", "my-arg", "--option", "my-option"}) // _ = app.Run([]string{"", "cmd", "my-arg", "--option", "my-option"})
//
expect(t, parsedOption, "my-option") // expect(t, parsedOption, "my-option")
expect(t, firstArg, "my-arg") // expect(t, firstArg, "my-arg")
} //}
//
func TestApp_CommandWithArgBeforeBoolFlags(t *testing.T) { //func TestApp_CommandWithArgBeforeBoolFlags(t *testing.T) {
var parsedOption, parsedSecondOption, firstArg string // var parsedOption, parsedSecondOption, firstArg string
var parsedBool, parsedSecondBool bool // var parsedBool, parsedSecondBool bool
//
app := NewApp() // app := NewApp()
command := &Command{ // command := &Command{
Name: "cmd", // Name: "cmd",
Flags: []Flag{ // Flags: []Flag{
&StringFlag{Name: "option", Value: "", Usage: "some option"}, // &StringFlag{Name: "option", Value: "", Usage: "some option"},
&StringFlag{Name: "secondOption", Value: "", Usage: "another option"}, // &StringFlag{Name: "secondOption", Value: "", Usage: "another option"},
&BoolFlag{Name: "boolflag", Usage: "some bool"}, // &BoolFlag{Name: "boolflag", Usage: "some bool"},
&BoolFlag{Name: "b", Usage: "another bool"}, // &BoolFlag{Name: "b", Usage: "another bool"},
}, // },
Action: func(c *Context) error { // Action: func(c *Context) error {
parsedOption = c.String("option") // parsedOption = c.String("option")
parsedSecondOption = c.String("secondOption") // parsedSecondOption = c.String("secondOption")
parsedBool = c.Bool("boolflag") // parsedBool = c.Bool("boolflag")
parsedSecondBool = c.Bool("b") // parsedSecondBool = c.Bool("b")
firstArg = c.Args().First() // firstArg = c.Args().First()
return nil // return nil
}, // },
} // }
app.Commands = []*Command{command} // app.Commands = []*Command{command}
//
_ = app.Run([]string{"", "cmd", "my-arg", "--boolflag", "--option", "my-option", "-b", "--secondOption", "fancy-option"}) // _ = app.Run([]string{"", "cmd", "my-arg", "--boolflag", "--option", "my-option", "-b", "--secondOption", "fancy-option"})
//
expect(t, parsedOption, "my-option") // expect(t, parsedOption, "my-option")
expect(t, parsedSecondOption, "fancy-option") // expect(t, parsedSecondOption, "fancy-option")
expect(t, parsedBool, true) // expect(t, parsedBool, true)
expect(t, parsedSecondBool, true) // expect(t, parsedSecondBool, true)
expect(t, firstArg, "my-arg") // expect(t, firstArg, "my-arg")
} //}
func TestApp_RunAsSubcommandParseFlags(t *testing.T) { func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
var context *Context var context *Context
@ -568,7 +568,7 @@ func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) {
}, },
} }
_ = app.Run([]string{"", "cmd", "my-arg", "--option", "my-option", "--", "--notARealFlag"}) _ = app.Run([]string{"", "cmd", "--option", "my-option", "my-arg", "--", "--notARealFlag"})
expect(t, parsedOption, "my-option") expect(t, parsedOption, "my-option")
expect(t, args.Get(0), "my-arg") expect(t, args.Get(0), "my-arg")
@ -748,7 +748,8 @@ func TestApp_UseShortOptionHandlingSubCommand(t *testing.T) {
return nil return nil
}, },
} }
app.Commands = []*Command{command, subCommand} command.Subcommands = []*Command{subCommand}
app.Commands = []*Command{command}
err := app.Run([]string{"", "cmd", "sub", "-on", expected}) err := app.Run([]string{"", "cmd", "sub", "-on", expected})
expect(t, err, nil) expect(t, err, nil)
@ -775,7 +776,6 @@ func TestApp_Float64Flag(t *testing.T) {
} }
func TestApp_ParseSliceFlags(t *testing.T) { func TestApp_ParseSliceFlags(t *testing.T) {
var parsedOption, firstArg string
var parsedIntSlice []int var parsedIntSlice []int
var parsedStringSlice []string var parsedStringSlice []string
@ -790,17 +790,13 @@ func TestApp_ParseSliceFlags(t *testing.T) {
Action: func(c *Context) error { Action: func(c *Context) error {
parsedIntSlice = c.IntSlice("p") parsedIntSlice = c.IntSlice("p")
parsedStringSlice = c.StringSlice("ip") parsedStringSlice = c.StringSlice("ip")
parsedOption = c.String("option")
firstArg = c.Args().First()
return nil return nil
}, },
}, },
}, },
} }
var _ = parsedOption
var _ = firstArg
_ = app.Run([]string{"", "cmd", "my-arg", "-p", "22", "-p", "80", "-ip", "8.8.8.8", "-ip", "8.8.4.4"}) _ = app.Run([]string{"", "cmd", "-p", "22", "-p", "80", "-ip", "8.8.8.8", "-ip", "8.8.4.4"})
IntsEquals := func(a, b []int) bool { IntsEquals := func(a, b []int) bool {
if len(a) != len(b) { if len(a) != len(b) {
@ -858,7 +854,7 @@ func TestApp_ParseSliceFlagsWithMissingValue(t *testing.T) {
}, },
} }
_ = app.Run([]string{"", "cmd", "my-arg", "-a", "2", "-str", "A"}) _ = app.Run([]string{"", "cmd", "-a", "2", "-str", "A"})
var expectedIntSlice = []int{2} var expectedIntSlice = []int{2}
var expectedStringSlice = []string{"A"} var expectedStringSlice = []string{"A"}
@ -1367,7 +1363,7 @@ func TestApp_OrderOfOperations(t *testing.T) {
resetCounts() resetCounts()
_ = app.Run([]string{"command", fmt.Sprintf("--%s", "--generate-bash-completion")}) _ = app.Run([]string{"command", fmt.Sprintf("--%s", "generate-bash-completion")})
expect(t, counts.ShellComplete, 1) expect(t, counts.ShellComplete, 1)
expect(t, counts.Total, 1) expect(t, counts.Total, 1)
@ -1473,7 +1469,7 @@ func TestApp_Run_CommandWithSubcommandHasHelpTopic(t *testing.T) {
} }
output := buf.String() output := buf.String()
t.Logf("output: %q\n", buf.Bytes()) //t.Logf("output: %q\n", buf.Bytes())
if strings.Contains(output, "No help topic for") { if strings.Contains(output, "No help topic for") {
t.Errorf("expect a help topic, got none: \n%q", output) t.Errorf("expect a help topic, got none: \n%q", output)
@ -1992,8 +1988,9 @@ func (c *customBoolFlag) GetUsage() string {
return "usage" return "usage"
} }
func (c *customBoolFlag) Apply(set *flag.FlagSet) { func (c *customBoolFlag) Apply(set *flag.FlagSet) error {
set.String(c.Nombre, c.Nombre, "") set.String(c.Nombre, c.Nombre, "")
return nil
} }
func TestCustomFlagsUnused(t *testing.T) { func TestCustomFlagsUnused(t *testing.T) {
@ -2108,8 +2105,8 @@ func TestShellCompletionForIncompleteFlags(t *testing.T) {
} }
} }
for _, flag := range ctx.App.Flags { for _, fl := range ctx.App.Flags {
for _, name := range flag.Names() { for _, name := range fl.Names() {
if name == BashCompletionFlag.Names()[0] { if name == BashCompletionFlag.Names()[0] {
continue continue
} }
@ -2180,7 +2177,7 @@ func TestWhenExitSubCommandWithCodeThenAppQuitUnexpectedly(t *testing.T) {
}) })
if exitCodeFromOsExiter != 0 { if exitCodeFromOsExiter != 0 {
t.Errorf("exitCodeFromOsExiter should not change, but its value is %v", exitCodeFromOsExiter) t.Errorf("exitCodeFromExitErrHandler should not change, but its value is %v", exitCodeFromOsExiter)
} }
if exitCodeFromExitErrHandler != testCode { if exitCodeFromExitErrHandler != testCode {