chore: migrate t.fatal to testify (#12231)
- convert t.fatal to require or assert
Этот коммит содержится в:
коммит произвёл
Ali Farooq
родитель
9b5b2831ee
Коммит
22ec2d169c
@@ -340,13 +340,11 @@ func TestPluginAPISavePluginConfig(t *testing.T) {
|
|||||||
pluginConfigJsonString := `{"mystringsetting": "str", "MyIntSetting": 32, "myboolsetting": true}`
|
pluginConfigJsonString := `{"mystringsetting": "str", "MyIntSetting": 32, "myboolsetting": true}`
|
||||||
|
|
||||||
var pluginConfig map[string]interface{}
|
var pluginConfig map[string]interface{}
|
||||||
if err := json.Unmarshal([]byte(pluginConfigJsonString), &pluginConfig); err != nil {
|
err := json.Unmarshal([]byte(pluginConfigJsonString), &pluginConfig)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
|
|
||||||
if err := api.SavePluginConfig(pluginConfig); err != nil {
|
appErr := api.SavePluginConfig(pluginConfig)
|
||||||
t.Fatal(err)
|
require.Nil(t, appErr)
|
||||||
}
|
|
||||||
|
|
||||||
type Configuration struct {
|
type Configuration struct {
|
||||||
MyStringSetting string
|
MyStringSetting string
|
||||||
@@ -355,14 +353,12 @@ func TestPluginAPISavePluginConfig(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
savedConfiguration := new(Configuration)
|
savedConfiguration := new(Configuration)
|
||||||
if err := api.LoadPluginConfiguration(savedConfiguration); err != nil {
|
err = api.LoadPluginConfiguration(savedConfiguration)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
|
|
||||||
expectedConfiguration := new(Configuration)
|
expectedConfiguration := new(Configuration)
|
||||||
if err := json.Unmarshal([]byte(pluginConfigJsonString), &expectedConfiguration); err != nil {
|
err = json.Unmarshal([]byte(pluginConfigJsonString), &expectedConfiguration)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
|
|
||||||
assert.Equal(t, expectedConfiguration, savedConfiguration)
|
assert.Equal(t, expectedConfiguration, savedConfiguration)
|
||||||
}
|
}
|
||||||
@@ -387,9 +383,9 @@ func TestPluginAPIGetPluginConfig(t *testing.T) {
|
|||||||
pluginConfigJsonString := `{"mystringsetting": "str", "myintsetting": 32, "myboolsetting": true}`
|
pluginConfigJsonString := `{"mystringsetting": "str", "myintsetting": 32, "myboolsetting": true}`
|
||||||
var pluginConfig map[string]interface{}
|
var pluginConfig map[string]interface{}
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(pluginConfigJsonString), &pluginConfig); err != nil {
|
err := json.Unmarshal([]byte(pluginConfigJsonString), &pluginConfig)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
cfg.PluginSettings.Plugins["pluginid"] = pluginConfig
|
cfg.PluginSettings.Plugins["pluginid"] = pluginConfig
|
||||||
})
|
})
|
||||||
@@ -403,9 +399,9 @@ func TestPluginAPILoadPluginConfiguration(t *testing.T) {
|
|||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
var pluginJson map[string]interface{}
|
var pluginJson map[string]interface{}
|
||||||
if err := json.Unmarshal([]byte(`{"mystringsetting": "str", "MyIntSetting": 32, "myboolsetting": true}`), &pluginJson); err != nil {
|
err := json.Unmarshal([]byte(`{"mystringsetting": "str", "MyIntSetting": 32, "myboolsetting": true}`), &pluginJson)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
|
cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
|
||||||
})
|
})
|
||||||
@@ -474,9 +470,9 @@ func TestPluginAPILoadPluginConfigurationDefaults(t *testing.T) {
|
|||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
var pluginJson map[string]interface{}
|
var pluginJson map[string]interface{}
|
||||||
if err := json.Unmarshal([]byte(`{"mystringsetting": "override"}`), &pluginJson); err != nil {
|
err := json.Unmarshal([]byte(`{"mystringsetting": "override"}`), &pluginJson)
|
||||||
t.Fatal(err)
|
require.NoError(t, err)
|
||||||
}
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
|
cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
|
||||||
})
|
})
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user