Avoid using %q because of weird quoting

Author: alexchebotarsky

model/thermostat/current_state.go

@@ -10,7 +10,7 @@ type CurrentState struct {
 	Timestamp          time.Time      `json:"timestamp" db:"timestamp"`
 	OperatingState     OperatingState `json:"operatingState" db:"operating_state"`
 	CurrentTemperature float64        `json:"currentTemperature" db:"current_temperature"`
-	CurrentHumidity    *float64       `json:"currentHumidity" db:"current_humidity"` // Not all thermostats may report humidity
+	CurrentHumidity    *float64       `json:"currentHumidity,omitempty" db:"current_humidity"` // Not all thermostats may report humidity
 }
 
 func (s *CurrentState) Validate() error {
@@ -19,14 +19,14 @@ func (s *CurrentState) Validate() error {
 	}
 
 	if time.Since(s.Timestamp) > 1*time.Hour {
-		return fmt.Errorf("timestamp cannot be older than 1 hour, got: %q", s.Timestamp)
+		return fmt.Errorf("timestamp cannot be older than 1 hour, got: '%s'", s.Timestamp)
 	}
 
 	switch s.OperatingState {
 	case IdleOperatingState, HeatingOperatingState, CoolingOperatingState:
 		// Valid
 	default:
-		return fmt.Errorf("operating state must be one of: [%s, %s, %s], got: %q", IdleOperatingState, HeatingOperatingState, CoolingOperatingState, s.OperatingState)
+		return fmt.Errorf("operating state must be one of: [%s, %s, %s], got: '%s'", IdleOperatingState, HeatingOperatingState, CoolingOperatingState, s.OperatingState)
 	}
 
 	if s.CurrentTemperature < -55 || s.CurrentTemperature > 125 {

model/thermostat/target_state.go

@@ -14,7 +14,7 @@ func (s *TargetState) Validate() error {
 		case OffMode, HeatMode, CoolMode, AutoMode:
 			// Valid
 		default:
-			return fmt.Errorf("mode must be one of: [%s, %s, %s, %s], got: %q", OffMode, HeatMode, CoolMode, AutoMode, *s.Mode)
+			return fmt.Errorf("mode must be one of: [%s, %s, %s, %s], got: '%s'", OffMode, HeatMode, CoolMode, AutoMode, *s.Mode)
 		}
 	}
 

processor/handler/current_state_test.go

@@ -232,24 +232,24 @@ func TestCurrentState(t *testing.T) {
 			for deviceID, wantState := range tt.wantUpdaterStates {
 				state, exists := tt.args.updater.States[deviceID]
 				if !exists {
-					t.Errorf("CurrentState() updater.States[%q] not found", deviceID)
+					t.Errorf("CurrentState() updater.States[%s] not found", deviceID)
 					continue
 				}
 
 				if !state.Timestamp.Equal(wantState.Timestamp) {
-					t.Errorf("CurrentState() updater.States[%q].Timestamp = %v, want %v", deviceID, state.Timestamp, wantState.Timestamp)
+					t.Errorf("CurrentState() updater.States[%s].Timestamp = %v, want %v", deviceID, state.Timestamp, wantState.Timestamp)
 				}
 
 				if state.OperatingState != wantState.OperatingState {
-					t.Errorf("CurrentState() updater.States[%q].OperationState = %v, want %v", deviceID, state.OperatingState, wantState.OperatingState)
+					t.Errorf("CurrentState() updater.States[%s].OperationState = %v, want %v", deviceID, state.OperatingState, wantState.OperatingState)
 				}
 
 				if state.CurrentTemperature != wantState.CurrentTemperature {
-					t.Errorf("CurrentState() updater.States[%q].TargetTemperature = %v, want %v", deviceID, state.CurrentTemperature, wantState.CurrentTemperature)
+					t.Errorf("CurrentState() updater.States[%s].TargetTemperature = %v, want %v", deviceID, state.CurrentTemperature, wantState.CurrentTemperature)
 				}
 
 				if !ptrEqual(state.CurrentHumidity, wantState.CurrentHumidity) {
-					t.Errorf("CurrentState() updater.States[%q].CurrentHumidity = %v, want %v", deviceID, state.CurrentHumidity, wantState.CurrentHumidity)
+					t.Errorf("CurrentState() updater.States[%s].CurrentHumidity = %v, want %v", deviceID, state.CurrentHumidity, wantState.CurrentHumidity)
 				}
 			}
 		})

server/handler/target_state_test.go

@@ -519,16 +519,16 @@ func TestUpdateTargetState(t *testing.T) {
 			for deviceID, wantState := range tt.wantUpdaterStates {
 				state, exists := tt.args.updater.States[deviceID]
 				if !exists {
-					t.Errorf("UpdateTargetState() updater.States[%q] not found", deviceID)
+					t.Errorf("UpdateTargetState() updater.States[%s] not found", deviceID)
 					continue
 				}
 
 				if !ptrEqual(state.Mode, wantState.Mode) {
-					t.Errorf("UpdateTargetState() updater.States[%q].Mode = %v, want %v", deviceID, state.Mode, wantState.Mode)
+					t.Errorf("UpdateTargetState() updater.States[%s].Mode = %v, want %v", deviceID, state.Mode, wantState.Mode)
 				}
 
 				if !ptrEqual(state.TargetTemperature, wantState.TargetTemperature) {
-					t.Errorf("UpdateTargetState() updater.States[%q].TargetTemperature = %v, want %v", deviceID, state.TargetTemperature, wantState.TargetTemperature)
+					t.Errorf("UpdateTargetState() updater.States[%s].TargetTemperature = %v, want %v", deviceID, state.TargetTemperature, wantState.TargetTemperature)
 				}
 			}