From a1a91fa9252bb93ca2337101e3e5841a2f2ee145 Mon Sep 17 00:00:00 2001 From: Mostafa Moradian Date: Sun, 22 Dec 2024 22:07:33 +0100 Subject: [PATCH] Update tests --- cmd/config_init_test.go | 8 ++++---- cmd/config_lint_test.go | 6 +++--- cmd/plugin_init_test.go | 7 ++++--- cmd/plugin_install_test.go | 18 ++++++++++-------- cmd/plugin_list_test.go | 6 +++--- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cmd/config_init_test.go b/cmd/config_init_test.go index 79e073c0..9b36ca0b 100644 --- a/cmd/config_init_test.go +++ b/cmd/config_init_test.go @@ -15,21 +15,21 @@ func Test_configInitCmd(t *testing.T) { output, err := executeCommandC(rootCmd, "config", "init", "-c", globalTestConfigFile) require.NoError(t, err, "configInitCmd should not return an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was created successfully.", globalTestConfigFile), + fmt.Sprintf("Config file '%s' was created successfully.", App.GlobalConfigFile), output, "configInitCmd should print the correct output") // Check that the config file was created. - assert.FileExists(t, globalTestConfigFile, "configInitCmd should create a config file") + assert.FileExists(t, App.GlobalConfigFile, "configInitCmd should create a config file") // Test configInitCmd with the --force flag to overwrite the config file. output, err = executeCommandC(rootCmd, "config", "init", "--force", "-c", globalTestConfigFile) require.NoError(t, err, "configInitCmd should not return an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was overwritten successfully.", globalTestConfigFile), + fmt.Sprintf("Config file '%s' was overwritten successfully.", App.GlobalConfigFile), output, "configInitCmd should print the correct output") // Clean up. - err = os.Remove(globalTestConfigFile) + err = os.Remove(App.GlobalConfigFile) assert.Nil(t, err) } diff --git a/cmd/config_lint_test.go b/cmd/config_lint_test.go index 19030df7..e91161bd 100644 --- a/cmd/config_lint_test.go +++ b/cmd/config_lint_test.go @@ -15,11 +15,11 @@ func Test_configLintCmd(t *testing.T) { output, err := executeCommandC(rootCmd, "config", "init", "-c", globalTestConfigFile) require.NoError(t, err, "configInitCmd should not return an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was created successfully.", globalTestConfigFile), + fmt.Sprintf("Config file '%s' was created successfully.", App.GlobalConfigFile), output, "configInitCmd should print the correct output") // Check that the config file was created. - assert.FileExists(t, globalTestConfigFile, "configInitCmd should create a config file") + assert.FileExists(t, App.GlobalConfigFile, "configInitCmd should create a config file") // Test configLintCmd. output, err = executeCommandC(rootCmd, "config", "lint", "-c", globalTestConfigFile) @@ -30,6 +30,6 @@ func Test_configLintCmd(t *testing.T) { "configLintCmd should print the correct output") // Clean up. - err = os.Remove(globalTestConfigFile) + err = os.Remove(App.GlobalConfigFile) assert.Nil(t, err) } diff --git a/cmd/plugin_init_test.go b/cmd/plugin_init_test.go index 2d9abb32..88fb878e 100644 --- a/cmd/plugin_init_test.go +++ b/cmd/plugin_init_test.go @@ -15,12 +15,13 @@ func Test_pluginInitCmd(t *testing.T) { output, err := executeCommandC(rootCmd, "plugin", "init", "-p", pluginTestConfigFile) require.NoError(t, err, "plugin init command should not have returned an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was created successfully.", pluginTestConfigFile), + fmt.Sprintf("Config file '%s' was created successfully.", App.PluginConfigFile), output, "plugin init command should have returned the correct output") - assert.FileExists(t, pluginTestConfigFile, "plugin init command should have created a config file") + assert.FileExists( + t, App.PluginConfigFile, "plugin init command should have created a config file") // Clean up. - err = os.Remove(pluginTestConfigFile) + err = os.Remove(App.PluginConfigFile) assert.Nil(t, err) } diff --git a/cmd/plugin_install_test.go b/cmd/plugin_install_test.go index e3364c49..269f5c9a 100644 --- a/cmd/plugin_install_test.go +++ b/cmd/plugin_install_test.go @@ -17,10 +17,11 @@ func Test_pluginInstallCmd(t *testing.T) { output, err := executeCommandC(rootCmd, "plugin", "init", "-p", pluginTestConfigFile) require.NoError(t, err, "plugin init should not return an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was created successfully.", pluginTestConfigFile), + fmt.Sprintf("Config file '%s' was created successfully.", App.PluginConfigFile), output, "plugin init command should have returned the correct output") - assert.FileExists(t, pluginTestConfigFile, "plugin init command should have created a config file") + assert.FileExists( + t, App.PluginConfigFile, "plugin init command should have created a config file") // Pull the plugin archive and install it. pluginArchivePath, err = mustPullPlugin() @@ -41,7 +42,7 @@ func Test_pluginInstallCmd(t *testing.T) { // Clean up. assert.FileExists(t, "plugins/gatewayd-plugin-cache") - assert.FileExists(t, pluginTestConfigFile+BackupFileExt) + assert.FileExists(t, App.PluginConfigFile+BackupFileExt) assert.NoFileExists(t, "gatewayd-plugin-cache-linux-amd64-v0.2.4.tar.gz") assert.NoFileExists(t, "checksums.txt") assert.NoFileExists(t, "plugins/LICENSE") @@ -50,8 +51,8 @@ func Test_pluginInstallCmd(t *testing.T) { assert.NoFileExists(t, "plugins/gatewayd_plugin.yaml") require.NoError(t, os.RemoveAll("plugins/")) - require.NoError(t, os.Remove(pluginTestConfigFile)) - require.NoError(t, os.Remove(pluginTestConfigFile+BackupFileExt)) + require.NoError(t, os.Remove(App.PluginConfigFile)) + require.NoError(t, os.Remove(App.PluginConfigFile+BackupFileExt)) } func Test_pluginInstallCmdAutomatedNoOverwrite(t *testing.T) { @@ -65,7 +66,8 @@ func Test_pluginInstallCmdAutomatedNoOverwrite(t *testing.T) { rootCmd, "plugin", "install", "-p", pluginTestConfigFile, "--update", "--backup", "--overwrite-config=false") require.NoError(t, err, "plugin install should not return an error") - assert.Contains(t, output, fmt.Sprintf("/gatewayd-plugin-cache-%s-%s-", runtime.GOOS, runtime.GOARCH)) + assert.Contains( + t, output, fmt.Sprintf("/gatewayd-plugin-cache-%s-%s-", runtime.GOOS, runtime.GOARCH)) assert.Contains(t, output, "/checksums.txt") assert.Contains(t, output, "Download completed successfully") assert.Contains(t, output, "Checksum verification passed") @@ -79,12 +81,12 @@ func Test_pluginInstallCmdAutomatedNoOverwrite(t *testing.T) { // Clean up. assert.FileExists(t, "plugins/gatewayd-plugin-cache") - assert.FileExists(t, pluginTestConfigFile+BackupFileExt) + assert.FileExists(t, App.PluginConfigFile+BackupFileExt) assert.NoFileExists(t, "plugins/LICENSE") assert.NoFileExists(t, "plugins/README.md") assert.NoFileExists(t, "plugins/checksum.txt") assert.NoFileExists(t, "plugins/gatewayd_plugin.yaml") require.NoError(t, os.RemoveAll("plugins/")) - require.NoError(t, os.Remove(pluginTestConfigFile+BackupFileExt)) + require.NoError(t, os.Remove(App.PluginConfigFile+BackupFileExt)) } diff --git a/cmd/plugin_list_test.go b/cmd/plugin_list_test.go index c96342ba..a1d51e80 100644 --- a/cmd/plugin_list_test.go +++ b/cmd/plugin_list_test.go @@ -15,10 +15,10 @@ func Test_pluginListCmd(t *testing.T) { output, err := executeCommandC(rootCmd, "plugin", "init", "-p", pluginTestConfigFile) require.NoError(t, err, "plugin init command should not have returned an error") assert.Equal(t, - fmt.Sprintf("Config file '%s' was created successfully.", pluginTestConfigFile), + fmt.Sprintf("Config file '%s' was created successfully.", App.PluginConfigFile), output, "plugin init command should have returned the correct output") - assert.FileExists(t, pluginTestConfigFile, "plugin init command should have created a config file") + assert.FileExists(t, App.PluginConfigFile, "plugin init command should have created a config file") output, err = executeCommandC(rootCmd, "plugin", "list", "-p", pluginTestConfigFile) require.NoError(t, err, "plugin list command should not have returned an error") @@ -28,7 +28,7 @@ func Test_pluginListCmd(t *testing.T) { "plugin list command should have returned empty output") // Clean up. - err = os.Remove(pluginTestConfigFile) + err = os.Remove(App.PluginConfigFile) assert.Nil(t, err) }