From 6545fb5229d20609595df579019a44d84eb2e682 Mon Sep 17 00:00:00 2001 From: Mario Zupan Date: Fri, 30 Dec 2022 22:54:13 +0100 Subject: [PATCH] fix wording for weight --- renderer/json.go | 5 +++-- renderer/json_test.go | 7 ++++--- renderer/terminal.go | 5 +++-- renderer/terminal_test.go | 7 ++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/renderer/json.go b/renderer/json.go index ba16cef..f9955af 100644 --- a/renderer/json.go +++ b/renderer/json.go @@ -3,9 +3,10 @@ package renderer import ( "encoding/json" "fmt" + "time" + "github.com/zupzup/calories/model" "github.com/zupzup/calories/util" - "time" ) type success struct { @@ -59,7 +60,7 @@ func (r *JSONRenderer) WeightHistory(weights []model.Weight, config *model.Confi func (r *JSONRenderer) AddWeight(weight float64, config *model.Config) (string, error) { res := success{ Success: true, - Message: fmt.Sprintf("Added weight: %s", util.WeightUnit(config.UnitSystem, weight)), + Message: fmt.Sprintf("Set weight: %s", util.WeightUnit(config.UnitSystem, weight)), } b, err := json.Marshal(res) if err != nil { diff --git a/renderer/json_test.go b/renderer/json_test.go index a01f8d8..0d8c018 100644 --- a/renderer/json_test.go +++ b/renderer/json_test.go @@ -3,10 +3,11 @@ package renderer import ( "errors" "fmt" - "github.com/zupzup/calories/model" - "github.com/zupzup/calories/util" "testing" "time" + + "github.com/zupzup/calories/model" + "github.com/zupzup/calories/util" ) func TestJSONError(t *testing.T) { @@ -56,7 +57,7 @@ func TestJSONConfig(t *testing.T) { func TestJSONAddWeight(t *testing.T) { r := JSONRenderer{} res, err := r.AddWeight(85.0, &model.Config{}) - expectedString := "Added weight: 85.0 kg" + expectedString := "Set weight: 85.0 kg" expected := fmt.Sprintf("{\"success\":true,\"message\":\"%s\"}", expectedString) if res != expected || err != nil { t.Errorf("Error, actual: %v expected: %v", res, expected) diff --git a/renderer/terminal.go b/renderer/terminal.go index 5d28fcc..f47b8bf 100644 --- a/renderer/terminal.go +++ b/renderer/terminal.go @@ -2,10 +2,11 @@ package renderer import ( "fmt" + "time" + "github.com/fatih/color" "github.com/zupzup/calories/model" "github.com/zupzup/calories/util" - "time" ) // TerminalRenderer is the renderer for the CLI @@ -27,7 +28,7 @@ func (r *TerminalRenderer) WeightHistory(weights []model.Weight, config *model.C // AddWeight renders a success message and the added weight func (r *TerminalRenderer) AddWeight(weight float64, config *model.Config) (string, error) { - return fmt.Sprintf("Added weight: %s \n", util.WeightUnit(config.UnitSystem, weight)), nil + return fmt.Sprintf("Set weight: %s \n", util.WeightUnit(config.UnitSystem, weight)), nil } // Config prints the given configuration with weight, amr and bmr diff --git a/renderer/terminal_test.go b/renderer/terminal_test.go index 5b0e7d8..95fd2b5 100644 --- a/renderer/terminal_test.go +++ b/renderer/terminal_test.go @@ -3,11 +3,12 @@ package renderer import ( "errors" "fmt" + "testing" + "time" + "github.com/fatih/color" "github.com/zupzup/calories/model" "github.com/zupzup/calories/util" - "testing" - "time" ) func TestTerminalError(t *testing.T) { @@ -40,7 +41,7 @@ func TestTerminalWeightHistory(t *testing.T) { func TestTerminalAddWeight(t *testing.T) { r := TerminalRenderer{} res, err := r.AddWeight(85.0, &model.Config{}) - expected := "Added weight: 85.0 kg \n" + expected := "Set weight: 85.0 kg \n" if res != expected || err != nil { t.Errorf("Error, actual: %v expected: %v", res, expected) return