From b012801833ecb50236fe0cdfe8b332f0d41f1ce6 Mon Sep 17 00:00:00 2001 From: fgy Date: Mon, 24 Oct 2022 15:41:28 +0800 Subject: [PATCH] style: goimports --- flag_test.go | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/flag_test.go b/flag_test.go index 4a0d6e9396..ded6369af5 100644 --- a/flag_test.go +++ b/flag_test.go @@ -3030,55 +3030,55 @@ func TestFlagDefaultValue(t *testing.T) { name: "stringSlice", flag: &StringSliceFlag{Name: "flag", Value: NewStringSlice("default1", "default2")}, toParse: []string{"--flag", "parsed"}, - expect: `--flag value [ --flag value ] (default: "default1", "default2")`, + expect: `--flag value [ --flag value ] (default: "default1", "default2")`, }, { name: "float64Slice", flag: &Float64SliceFlag{Name: "flag", Value: NewFloat64Slice(1.1, 2.2)}, toParse: []string{"--flag", "13.3"}, - expect: `--flag value [ --flag value ] (default: 1.1, 2.2)`, + expect: `--flag value [ --flag value ] (default: 1.1, 2.2)`, }, { name: "int64Slice", flag: &Int64SliceFlag{Name: "flag", Value: NewInt64Slice(1, 2)}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)`, + expect: `--flag value [ --flag value ] (default: 1, 2)`, }, { name: "intSlice", flag: &IntSliceFlag{Name: "flag", Value: NewIntSlice(1, 2)}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)`, + expect: `--flag value [ --flag value ] (default: 1, 2)`, }, { name: "uint64Slice", flag: &Uint64SliceFlag{Name: "flag", Value: NewUint64Slice(1, 2)}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)`, + expect: `--flag value [ --flag value ] (default: 1, 2)`, }, { name: "uintSlice", flag: &UintSliceFlag{Name: "flag", Value: NewUintSlice(1, 2)}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)`, + expect: `--flag value [ --flag value ] (default: 1, 2)`, }, { name: "string", flag: &StringFlag{Name: "flag", Value: "default"}, toParse: []string{"--flag", "parsed"}, - expect: `--flag value (default: "default")`, + expect: `--flag value (default: "default")`, }, { name: "bool", flag: &BoolFlag{Name: "flag", Value: true}, toParse: []string{"--flag", "false"}, - expect: `--flag (default: true)`, + expect: `--flag (default: true)`, }, { name: "uint64", flag: &Uint64Flag{Name: "flag", Value: 1}, toParse: []string{"--flag", "13"}, - expect: `--flag value (default: 1)`, + expect: `--flag value (default: 1)`, }, } for i, v := range cases { @@ -3115,7 +3115,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "stringSlice", flag: &StringSliceFlag{Name: "flag", Value: NewStringSlice("default1", "default2"), EnvVars: []string{"ssflag"}}, toParse: []string{"--flag", "parsed"}, - expect: `--flag value [ --flag value ] (default: "default1", "default2")` + withEnvHint([]string{"ssflag"}, ""), + expect: `--flag value [ --flag value ] (default: "default1", "default2")` + withEnvHint([]string{"ssflag"}, ""), environ: map[string]string{ "ssflag": "some-other-env_value", }, @@ -3124,7 +3124,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "float64Slice", flag: &Float64SliceFlag{Name: "flag", Value: NewFloat64Slice(1.1, 2.2), EnvVars: []string{"fsflag"}}, toParse: []string{"--flag", "13.3"}, - expect: `--flag value [ --flag value ] (default: 1.1, 2.2)` + withEnvHint([]string{"fsflag"}, ""), + expect: `--flag value [ --flag value ] (default: 1.1, 2.2)` + withEnvHint([]string{"fsflag"}, ""), environ: map[string]string{ "fsflag": "20304.222", }, @@ -3133,7 +3133,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "int64Slice", flag: &Int64SliceFlag{Name: "flag", Value: NewInt64Slice(1, 2), EnvVars: []string{"isflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"isflag"}, ""), + expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"isflag"}, ""), environ: map[string]string{ "isflag": "101", }, @@ -3142,7 +3142,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "intSlice", flag: &IntSliceFlag{Name: "flag", Value: NewIntSlice(1, 2), EnvVars: []string{"isflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"isflag"}, ""), + expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"isflag"}, ""), environ: map[string]string{ "isflag": "101", }, @@ -3151,7 +3151,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "uint64Slice", flag: &Uint64SliceFlag{Name: "flag", Value: NewUint64Slice(1, 2), EnvVars: []string{"uisflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"uisflag"}, ""), + expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"uisflag"}, ""), environ: map[string]string{ "uisflag": "3", }, @@ -3160,7 +3160,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "uintSlice", flag: &UintSliceFlag{Name: "flag", Value: NewUintSlice(1, 2), EnvVars: []string{"uisflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"uisflag"}, ""), + expect: `--flag value [ --flag value ] (default: 1, 2)` + withEnvHint([]string{"uisflag"}, ""), environ: map[string]string{ "uisflag": "3", }, @@ -3169,7 +3169,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "string", flag: &StringFlag{Name: "flag", Value: "default", EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "parsed"}, - expect: `--flag value (default: "default")` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: "default")` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "some-other-string", }, @@ -3178,7 +3178,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "bool", flag: &BoolFlag{Name: "flag", Value: true, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "false"}, - expect: `--flag (default: true)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag (default: true)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "false", }, @@ -3187,7 +3187,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "uint64", flag: &Uint64Flag{Name: "flag", Value: 1, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "10", }, @@ -3196,7 +3196,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "uint", flag: &UintFlag{Name: "flag", Value: 1, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "10", }, @@ -3205,7 +3205,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "int64", flag: &Int64Flag{Name: "flag", Value: 1, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "10", }, @@ -3214,7 +3214,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "int", flag: &IntFlag{Name: "flag", Value: 1, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "13"}, - expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: 1)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "10", }, @@ -3223,7 +3223,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "duration", flag: &DurationFlag{Name: "flag", Value: time.Second, EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "2m"}, - expect: `--flag value (default: 1s)` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: 1s)` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "2h4m10s", }, @@ -3232,7 +3232,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "path", flag: &PathFlag{Name: "flag", Value: "/tmp/foo", EnvVars: []string{"uflag"}}, toParse: []string{"--flag", "/bar/ddfr"}, - expect: `--flag value (default: "/tmp/foo")` + withEnvHint([]string{"uflag"}, ""), + expect: `--flag value (default: "/tmp/foo")` + withEnvHint([]string{"uflag"}, ""), environ: map[string]string{ "uflag": "/bar/t/err", }, @@ -3241,7 +3241,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "timestamp", flag: &TimestampFlag{Name: "flag", Value: NewTimestamp(ts), Layout: time.RFC3339, EnvVars: []string{"tflag"}}, toParse: []string{"--flag", "2006-11-02T15:04:05Z"}, - expect: `--flag value (default: 2005-01-02 15:04:05 +0000 UTC)` + withEnvHint([]string{"tflag"}, ""), + expect: `--flag value (default: 2005-01-02 15:04:05 +0000 UTC)` + withEnvHint([]string{"tflag"}, ""), environ: map[string]string{ "tflag": "2010-01-02T15:04:05Z", }, @@ -3250,7 +3250,7 @@ func TestFlagDefaultValueWithEnv(t *testing.T) { name: "generic", flag: &GenericFlag{Name: "flag", Value: &Parser{"11", "12"}, EnvVars: []string{"gflag"}}, toParse: []string{"--flag", "15,16"}, - expect: `--flag value (default: 11,12)` + withEnvHint([]string{"gflag"}, ""), + expect: `--flag value (default: 11,12)` + withEnvHint([]string{"gflag"}, ""), environ: map[string]string{ "gflag": "13,14", }, @@ -3399,4 +3399,3 @@ func TestCustomizedSliceFlagSeparator(t *testing.T) { } } } -