From 52abc11fe5d85e9f1408004643a2d102b9c185d8 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Tue, 3 Oct 2023 23:27:55 +0300 Subject: [PATCH] commands: reverse actual and expected values in asserts --- commands/apps_test.go | 4 ++-- commands/auth_test.go | 2 +- commands/monitoring_test.go | 2 +- commands/registry_test.go | 6 +----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/commands/apps_test.go b/commands/apps_test.go index 619620768..c436dcffd 100644 --- a/commands/apps_test.go +++ b/commands/apps_test.go @@ -432,8 +432,8 @@ func TestRunAppsGetLogs(t *testing.T) { tc := config.Doit.(*doctl.TestConfig) tc.ListenFn = func(url *url.URL, token string, schemaFunc listen.SchemaFunc, out io.Writer) listen.ListenerService { - assert.Equal(t, token, "aa-bb-11-cc-33") - assert.Equal(t, url.String(), "wss://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=aa-bb-11-cc-33") + assert.Equal(t, "aa-bb-11-cc-33", token) + assert.Equal(t, "wss://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=aa-bb-11-cc-33", url.String()) return tm.listen } diff --git a/commands/auth_test.go b/commands/auth_test.go index 459975b54..f3f6cb7c1 100644 --- a/commands/auth_test.go +++ b/commands/auth_test.go @@ -97,7 +97,7 @@ func TestAuthInitConfig(t *testing.T) { "unset": map[interface{}]interface{}{"dev-config": ""}, }, ) - assert.Equal(t, devConfigSetting, expectedConfigSetting, "unexpected setting for 'dev.config'") + assert.Equal(t, expectedConfigSetting, devConfigSetting, "unexpected setting for 'dev.config'") }) } diff --git a/commands/monitoring_test.go b/commands/monitoring_test.go index 647509348..de87d64f2 100644 --- a/commands/monitoring_test.go +++ b/commands/monitoring_test.go @@ -203,7 +203,7 @@ func TestAlertPolicyCreate_ValidTypes(t *testing.T) { config.Doit.Set(config.NS, doctl.ArgAlertPolicySlackURLs, slackURLsStr) err := RunCmdAlertPolicyCreate(config) - assert.Equal(t, err, tt.expectedErr) + assert.Equal(t, tt.expectedErr, err) }) } } diff --git a/commands/registry_test.go b/commands/registry_test.go index b3cf7e286..fac7e0b1b 100644 --- a/commands/registry_test.go +++ b/commands/registry_test.go @@ -700,11 +700,7 @@ func TestRegistryLogin(t *testing.T) { config.Out = os.Stderr err := RunRegistryLogin(config) - if test.err != nil { - assert.Error(t, test.err, err) - } else { - assert.NoError(t, err) - } + assert.Equal(t, test.err, err) }) }) }