From d101053188e9a18f05407a48864f7312e3dd4093 Mon Sep 17 00:00:00 2001 From: Nicolas Duhamel Date: Wed, 2 Nov 2022 08:21:08 +0100 Subject: [PATCH] code lint --- pkg/device/device.go | 32 ++++---- pkg/device/device_test.go | 150 +++++++++++++++++++------------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pkg/device/device.go b/pkg/device/device.go index 47688cf..550815e 100644 --- a/pkg/device/device.go +++ b/pkg/device/device.go @@ -22,11 +22,11 @@ type Error string func (e Error) Error() string { return string(e) } type DeviceState struct { - Mode string `json:"mode"` - Setpoint int `json:"setpoint"` - Time time.Time `json:"time"` - Program_name string `json:"program_name"` - UntilTime time.Time `json:"until_time"` + Mode string `json:"mode"` + Setpoint int `json:"setpoint"` + Time time.Time `json:"time"` + ProgramName string `json:"program_name"` + UntilTime time.Time `json:"until_time"` } func (s *DeviceState) Equivalent(state DeviceState) bool { @@ -54,7 +54,7 @@ func (s *DeviceState) Equivalent(state DeviceState) bool { return false } case "program": - if state.Program_name != s.Program_name { + if state.ProgramName != s.ProgramName { return false } } @@ -81,8 +81,8 @@ func (d Device) ListenTopic() (string, error) { func (d *Device) Program() (WeekProgram, error) { // return current device program if specified or default one prog_name := "default" - if d.State.Program_name != "" { - prog_name = d.State.Program_name + if d.State.ProgramName != "" { + prog_name = d.State.ProgramName } program, ok := d.Settings.Programs[prog_name] @@ -94,8 +94,8 @@ func (d *Device) Program() (WeekProgram, error) { } func (d *Device) ProgramName() string { - if d.State.Program_name != "" { - return d.State.Program_name + if d.State.ProgramName != "" { + return d.State.ProgramName } return "default" } @@ -175,7 +175,7 @@ func (d *Device) update(log *zerolog.Logger, pubchan chan Message) (bool, error) Int("current_setpoint", d.CurrentSetpoint). Str("State.Mode", d.State.Mode). Int("State.Setpoint", d.State.Setpoint). - Str("State.Program_name", d.State.Program_name). + Str("State.Program_name", d.State.ProgramName). Logger() log.Debug().Msg("check if setpoint need an update") @@ -245,10 +245,10 @@ func (d *Device) handle_reset_state(log *zerolog.Logger, pubchan chan Message) ( } d.State = DeviceState{ - Setpoint: value, - Mode: "program", - Program_name: d.ProgramName(), - Time: timeNow(), + Setpoint: value, + Mode: "program", + ProgramName: d.ProgramName(), + Time: timeNow(), } if d.CurrentSetpoint != value { @@ -329,7 +329,7 @@ func (d *Device) handle_until_next(log *zerolog.Logger, pubchan chan Message) (b } func (d *Device) handle_program(log *zerolog.Logger, pubchan chan Message) (bool, error) { - *log = log.With().Str("program", d.State.Program_name).Logger() + *log = log.With().Str("program", d.State.ProgramName).Logger() program, err := d.Program() if err != nil { diff --git a/pkg/device/device_test.go b/pkg/device/device_test.go index 930e2a2..a85e0d8 100644 --- a/pkg/device/device_test.go +++ b/pkg/device/device_test.go @@ -48,10 +48,10 @@ var test_device = Device{ }, CurrentSetpoint: 0, State: DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time, + ProgramName: "default", }, } @@ -64,10 +64,10 @@ func TestStateEquivalent(t *testing.T) { }{ { DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time, + ProgramName: "default", }, DeviceState{ Mode: "always", @@ -78,46 +78,46 @@ func TestStateEquivalent(t *testing.T) { }, { DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time, + ProgramName: "default", }, DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time.Add(1 * time.Minute), - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time.Add(1 * time.Minute), + ProgramName: "default", }, false, }, { DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time, + ProgramName: "default", }, DeviceState{ - Mode: "program", - Setpoint: 13, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 13, + Time: test_time, + ProgramName: "default", }, true, }, { DeviceState{ - Mode: "program", - Setpoint: 14, - Time: test_time, - Program_name: "default", + Mode: "program", + Setpoint: 14, + Time: test_time, + ProgramName: "default", }, DeviceState{ - Mode: "program", - Setpoint: 13, - Time: test_time, - Program_name: "other", + Mode: "program", + Setpoint: 13, + Time: test_time, + ProgramName: "other", }, false, }, @@ -128,11 +128,11 @@ func TestStateEquivalent(t *testing.T) { Time: test_time, }, DeviceState{ - Mode: "always", - Setpoint: 14, - Time: test_time, - Program_name: "other", - UntilTime: test_time, + Mode: "always", + Setpoint: 14, + Time: test_time, + ProgramName: "other", + UntilTime: test_time, }, true, }, @@ -143,11 +143,11 @@ func TestStateEquivalent(t *testing.T) { Time: test_time, }, DeviceState{ - Mode: "always", - Setpoint: 15, - Time: test_time, - Program_name: "other", - UntilTime: test_time, + Mode: "always", + Setpoint: 15, + Time: test_time, + ProgramName: "other", + UntilTime: test_time, }, false, }, @@ -158,11 +158,11 @@ func TestStateEquivalent(t *testing.T) { Time: test_time, }, DeviceState{ - Mode: "until_next", - Setpoint: 14, - Time: test_time, - Program_name: "other", - UntilTime: test_time, + Mode: "until_next", + Setpoint: 14, + Time: test_time, + ProgramName: "other", + UntilTime: test_time, }, true, }, @@ -173,11 +173,11 @@ func TestStateEquivalent(t *testing.T) { Time: test_time, }, DeviceState{ - Mode: "until_next", - Setpoint: 13, - Time: test_time, - Program_name: "other", - UntilTime: test_time, + Mode: "until_next", + Setpoint: 13, + Time: test_time, + ProgramName: "other", + UntilTime: test_time, }, false, }, @@ -189,11 +189,11 @@ func TestStateEquivalent(t *testing.T) { UntilTime: test_time.Add(1 * time.Hour), }, DeviceState{ - Mode: "until_time", - Setpoint: 14, - Time: test_time, - Program_name: "other", - UntilTime: test_time.Add(1 * time.Hour), + Mode: "until_time", + Setpoint: 14, + Time: test_time, + ProgramName: "other", + UntilTime: test_time.Add(1 * time.Hour), }, true, }, @@ -205,11 +205,11 @@ func TestStateEquivalent(t *testing.T) { UntilTime: test_time.Add(1 * time.Hour), }, DeviceState{ - Mode: "until_time", - Setpoint: 13, - Time: test_time, - Program_name: "other", - UntilTime: test_time.Add(1 * time.Hour), + Mode: "until_time", + Setpoint: 13, + Time: test_time, + ProgramName: "other", + UntilTime: test_time.Add(1 * time.Hour), }, false, }, @@ -221,11 +221,11 @@ func TestStateEquivalent(t *testing.T) { UntilTime: test_time.Add(1 * time.Hour), }, DeviceState{ - Mode: "until_time", - Setpoint: 14, - Time: test_time, - Program_name: "other", - UntilTime: test_time.Add(2 * time.Hour), + Mode: "until_time", + Setpoint: 14, + Time: test_time, + ProgramName: "other", + UntilTime: test_time.Add(2 * time.Hour), }, false, }, @@ -262,7 +262,7 @@ func TestListenTopic(t *testing.T) { func TestProgram(t *testing.T) { //case 1: no program set in state return default case1_device := test_device - case1_device.State.Program_name = "" + case1_device.State.ProgramName = "" //case 2: program set "confort" must return it var test_confort_weekprogram = WeekProgram{ @@ -279,11 +279,11 @@ func TestProgram(t *testing.T) { "default": test_weekprogram, "confort": test_confort_weekprogram, } - case2_device.State.Program_name = "confort" + case2_device.State.ProgramName = "confort" //case 3: program set "confort" but not exist case3_device := test_device - case3_device.State.Program_name = "confort" + case3_device.State.ProgramName = "confort" var tests = []struct { name string @@ -324,15 +324,15 @@ func TestUpdate(t *testing.T) { device1 := test_device device1.Name = "1" device1.State = DeviceState{ - Mode: "program", - Setpoint: 0, - Time: test_time, - Program_name: "", + Mode: "program", + Setpoint: 0, + Time: test_time, + ProgramName: "", } device2 := test_device device2.Name = "2" - device2.State.Program_name = "unknown" + device2.State.ProgramName = "unknown" device3 := test_device device3.Name = "3"