test: FIx some tests

haijima · Dec 29, 2023 · 9391124 · 9391124
1 parent 4ba97c2
commit 9391124
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ stool genconf path/to/main.go --format yaml >> .stool.yaml
 #### Global Options
 
 - `--config string` : Config file (default is `$XDG_CONFIG_HOME/.stool.yaml`)
-- `--no_color`: Disable colorized output
+- `--no-color`: Disable colorized output
 - `-q, --quiet`: Quiet output
 - `--verbosity int`: Verbosity level (default `0`)
 

diff --git a/cmd/aa_test.go b/cmd/aa_test.go
@@ -12,6 +12,7 @@ import (
 func TestNewAaCommand(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewAaCmd(v, fs)
 
 	assert.Equal(t, "aa", cmd.Name())
@@ -20,6 +21,7 @@ func TestNewAaCommand(t *testing.T) {
 func TestNewAaCommand_Run(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewAaCmd(v, fs)
 	stdout := new(bytes.Buffer)
 	cmd.SetOut(stdout)
@@ -32,6 +34,7 @@ func TestNewAaCommand_Run(t *testing.T) {
 func TestNewAaCommand_Flag_Big(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewAaCmd(v, fs)
 	v.Set("big", true)
 	stdout := new(bytes.Buffer)
@@ -45,6 +48,7 @@ func TestNewAaCommand_Flag_Big(t *testing.T) {
 func TestNewAaCommand_Flag_Text(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewAaCmd(v, fs)
 	v.Set("text", true)
 	stdout := new(bytes.Buffer)

diff --git a/cmd/genconf_test.go b/cmd/genconf_test.go
@@ -15,6 +15,7 @@ import (
 func TestNewGenConfCmd(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 
 	assert.Equal(t, "genconf", cmd.Name(), "NewGenConfCmd() should return command named \"genconf\". but: \"%s\"", cmd.Name())
@@ -23,6 +24,7 @@ func TestNewGenConfCmd(t *testing.T) {
 func TestNewGenConfCmd_Flag(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 	formatFlag := cmd.Flags().Lookup("format")
 
@@ -34,6 +36,7 @@ func TestNewGenConfCmd_Flag(t *testing.T) {
 func Test_printMatchingGroupInToml(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 
 	stdout := new(bytes.Buffer)
@@ -48,6 +51,7 @@ func Test_printMatchingGroupInToml(t *testing.T) {
 func Test_printMatchingGroupInYaml(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 
 	stdout := new(bytes.Buffer)
@@ -62,6 +66,7 @@ func Test_printMatchingGroupInYaml(t *testing.T) {
 func Test_printMatchingGroupInJson(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 
 	stdout := new(bytes.Buffer)
@@ -76,6 +81,7 @@ func Test_printMatchingGroupInJson(t *testing.T) {
 func Test_printArgNotBasicLitError(t *testing.T) {
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewGenConfCmd(v, fs)
 
 	stderr := new(bytes.Buffer)

diff --git a/cmd/param_test.go b/cmd/param_test.go
@@ -16,6 +16,7 @@ func TestNewParamCmd(t *testing.T) {
 	p := internal.NewParamProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewParamCmd(p, v, fs)
 
 	assert.Equal(t, "param", cmd.Name(), "NewParamCmd() should return command named \"param\". but: \"%s\"", cmd.Name())
@@ -25,6 +26,7 @@ func TestNewParamCmd_Flag(t *testing.T) {
 	p := internal.NewParamProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewParamCmd(p, v, fs)
 	fileFlag := cmd.Flags().Lookup("file")
 	filterFlag := cmd.Flags().Lookup("filter")

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -10,8 +10,9 @@ import (
 )
 
 func TestNewRootCmd(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
 
 	assert.Equal(t, "stool", cmd.Name(), "NewRootCommand() should return command named \"stool\". but: \"%s\"", cmd.Name())
@@ -21,36 +22,38 @@ func TestNewRootCmd(t *testing.T) {
 }
 
 func TestNewRootCmd_Flag(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
-	//fileFlag := cmd.PersistentFlags().Lookup("file")
-	//matchingGroupsFlag := cmd.PersistentFlags().Lookup("matching_groups")
-	//timeFormatFlag := cmd.PersistentFlags().Lookup("time_format")
-	//logLabelsFlag := cmd.PersistentFlags().Lookup("log_labels")
-	//filterFlag := cmd.PersistentFlags().Lookup("filter")
-	noColorFlag := cmd.PersistentFlags().Lookup("no_color")
+	versionFlag := cmd.PersistentFlags().Lookup("version")
+	configFlag := cmd.PersistentFlags().Lookup("config")
+	noColorFlag := cmd.PersistentFlags().Lookup("no-color")
+	verboseFlag := cmd.PersistentFlags().Lookup("verbose")
+	quietFlag := cmd.PersistentFlags().Lookup("quiet")
 
 	assert.True(t, cmd.HasAvailablePersistentFlags(), "root command should have available flag")
-	assert.NotNil(t, noColorFlag, "root command should have \"no_color\" flag")
-	assert.Equal(t, "", noColorFlag.Shorthand, "\"no_color\" flag doesn't have shorthand")
-	assert.Equal(t, "bool", noColorFlag.Value.Type(), "\"no_color\" flag is string")
-	//assert.NotNil(t, fileFlag, "root command should have \"file\" flag")
-	//assert.Equal(t, "f", fileFlag.Shorthand, "\"file\" flag's shorthand is \"f\"")
-	//assert.Equal(t, "string", fileFlag.Value.Type(), "\"file\" flag is string")
-	//assert.NotNil(t, matchingGroupsFlag, "root command should have \"matching_groups\" flag")
-	//assert.Equal(t, "m", matchingGroupsFlag.Shorthand, "\"matching_groups\" flag's shorthand is \"m\"")
-	//assert.Equal(t, "stringSlice", matchingGroupsFlag.Value.Type(), "\"matching_groups\" flag is string slice")
-	//assert.NotNil(t, timeFormatFlag, "root command should have \"time_format\" flag")
-	//assert.Equal(t, "string", timeFormatFlag.Value.Type(), "\"time_format\" flag is string")
-	//assert.NotNil(t, logLabelsFlag, "root command should have \"log_labels\" flag")
-	//assert.Equal(t, "stringToString", logLabelsFlag.Value.Type(), "\"log_labels\" flag is stringToString")
-	//assert.NotNil(t, filterFlag, "root command should have \"filter\" flag")
-	//assert.Equal(t, "string", filterFlag.Value.Type(), "\"filter\" flag is string")
+
+	assert.NotNil(t, versionFlag, "root command should have \"version\" flag")
+	assert.Equal(t, "V", versionFlag.Shorthand, "\"version\" flag doesn't have shorthand")
+	assert.Equal(t, "bool", versionFlag.Value.Type(), "\"version\" flag is bool")
+	assert.NotNil(t, configFlag, "root command should have \"config\" flag")
+	assert.Equal(t, "", configFlag.Shorthand, "\"config\" flag doesn't have shorthand")
+	assert.Equal(t, "string", configFlag.Value.Type(), "\"config\" flag is string")
+	assert.NotNil(t, noColorFlag, "root command should have \"no-color\" flag")
+	assert.Equal(t, "", noColorFlag.Shorthand, "\"no-color\" flag doesn't have shorthand")
+	assert.Equal(t, "bool", noColorFlag.Value.Type(), "\"no-color\" flag is bool")
+	assert.NotNil(t, verboseFlag, "root command should have \"verbose\" flag")
+	assert.Equal(t, "v", verboseFlag.Shorthand, "\"verbose\" flag doesn't have shorthand")
+	assert.Equal(t, "count", verboseFlag.Value.Type(), "\"verbose\" flag is count")
+	assert.NotNil(t, quietFlag, "root command should have \"quiet\" flag")
+	assert.Equal(t, "q", quietFlag.Shorthand, "\"quiet\" flag doesn't have shorthand")
+	assert.Equal(t, "bool", quietFlag.Value.Type(), "\"quiet\" flag is bool")
 }
 func TestNewRootCmd_Flag_Verbose(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
 
 	v.Set("verbose", true)
@@ -59,12 +62,13 @@ func TestNewRootCmd_Flag_Verbose(t *testing.T) {
 	cmd.SetArgs([]string{})                              // dummy not to use os.Args[1:]
 	err := cmd.Execute()
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }
 
 func TestNewRootCmd_Flag_Debug(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
 
 	v.Set("debug", true)
@@ -73,12 +77,13 @@ func TestNewRootCmd_Flag_Debug(t *testing.T) {
 	cmd.SetArgs([]string{})                              // dummy not to use os.Args[1:]
 	err := cmd.Execute()
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }
 
 func TestNewRootCmd_ConfigFile(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
 
 	_, _ = fs.Create(".stool.yaml")
@@ -87,15 +92,16 @@ func TestNewRootCmd_ConfigFile(t *testing.T) {
 	cmd.SetArgs([]string{"--config", ".stool.yaml"})
 	err := cmd.Execute()
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }
 
 func TestExecute(t *testing.T) {
-	fs := afero.NewMemMapFs()
 	v := viper.New()
+	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewRootCmd(v, fs)
 
 	err := cmd.Execute()
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }
diff --git a/cmd/scenario_test.go b/cmd/scenario_test.go
@@ -15,6 +15,7 @@ func TestNewScenarioCmd(t *testing.T) {
 	p := internal.NewScenarioProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewScenarioCmd(p, v, fs)
 
 	assert.Equal(t, "scenario", cmd.Name(), "NewScenarioCmd() should return command named \"scenario\". but: \"%s\"", cmd.Name())
@@ -24,6 +25,7 @@ func TestNewScenarioCmd_Flag(t *testing.T) {
 	p := internal.NewScenarioProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewScenarioCmd(p, v, fs)
 	fileFlag := cmd.Flags().Lookup("file")
 	matchingGroupsFlag := cmd.Flags().Lookup("matching_groups")
@@ -56,6 +58,7 @@ func Test_ScenarioCmd_RunE(t *testing.T) {
 	p := internal.NewScenarioProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewScenarioCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -81,6 +84,7 @@ func Test_ScenarioCmd_RunE_format_csv(t *testing.T) {
 	p := internal.NewScenarioProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewScenarioCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -103,6 +107,7 @@ func Test_ScenarioCmd_RunE_palette(t *testing.T) {
 	p := internal.NewScenarioProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewScenarioCmd(p, v, fs)
 
 	fileName := "./access.log"

diff --git a/cmd/transition_test.go b/cmd/transition_test.go
@@ -16,6 +16,7 @@ func TestNewTransitionCmd(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	assert.Equal(t, "transition", cmd.Name(), "NewTransitionCmd() should return command named \"transition\". but: \"%s\"", cmd.Name())
@@ -25,6 +26,7 @@ func TestNewTransitionCmd_Flag(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 	fileFlag := cmd.Flags().Lookup("file")
 	matchingGroupsFlag := cmd.Flags().Lookup("matching_groups")
@@ -54,6 +56,7 @@ func Test_TransitionCmd_RunE(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -79,6 +82,7 @@ func Test_TransitionCmd_RunE_file_not_exists(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	fileName := "./not_exists.log"
@@ -94,6 +98,7 @@ func Test_TransitionCmd_RunE_format_csv(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -116,6 +121,7 @@ func Test_TransitionCmd_RunE_format_mermaid(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -147,6 +153,7 @@ func Test_TransitionCmd_RunE_invalid_format(t *testing.T) {
 	p := internal.NewTransitionProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTransitionCmd(p, v, fs)
 
 	fileName := "./access.log"

diff --git a/cmd/trend_test.go b/cmd/trend_test.go
@@ -16,6 +16,7 @@ func TestNewTrendCmd(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 
 	assert.Equal(t, "trend", cmd.Name(), "NewTrendCmd() should return command named \"trend\". but: \"%s\"", cmd.Name())
@@ -25,6 +26,7 @@ func TestNewTrendCmd_Flag(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 	fileFlag := cmd.Flags().Lookup("file")
 	matchingGroupsFlag := cmd.Flags().Lookup("matching_groups")
@@ -55,6 +57,7 @@ func Test_Trend_RunE(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 
 	fileName := "./access.log"
@@ -77,6 +80,7 @@ func Test_TrendCmd_RunE_Flag_interval_not_positive(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 
 	v.Set("interval", "0")
@@ -90,6 +94,7 @@ func Test_TrendCmd_RunE_file_not_exists(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 
 	fileName := "./not_exists.log"
@@ -105,6 +110,7 @@ func Test_TrendCmd_RunE_file_profiler_error(t *testing.T) {
 	p := internal.NewTrendProfiler()
 	v := viper.New()
 	fs := afero.NewMemMapFs()
+	v.SetFs(fs)
 	cmd := NewTrendCmd(p, v, fs)
 
 	fileName := "./access.log"