changed tests, and added new tests

Author: Pake-TU

ZigBeeValve/ZigBeeValve.go

@@ -62,7 +62,7 @@ func main() {
 	// Find zigbee gateway and store it in a global variable for reuse
 	err = findGateway()
 	if err != nil {
-		log.Fatal("Error getting gateway, shutting down:", err)
+		log.Fatal("Error getting gateway, shutting down: ", err)
 	}
 
 	// start the http handler and server
@@ -93,17 +93,18 @@ func (rsc *UnitAsset) setpt(w http.ResponseWriter, r *http.Request) {
 	case "PUT":
 		sig, err := usecases.HTTPProcessSetRequest(w, r)
 		if err != nil {
-			log.Println("Error with the setting desired temp ", err)
+			log.Println("Error processing request")
+			http.Error(w, "Request incorrectly formated", http.StatusBadRequest)
+			return
 		}
-		log.Println("sig:", sig)
-		log.Println("URL:", r.URL)
-		log.Println("Model:", rsc.Model)
+
 		rsc.setSetPoint(sig)
 		if rsc.Model == "SmartThermostat" {
 			err = rsc.sendSetPoint()
 			if err != nil {
-				log.Println("Error sending setpoint:", err)
+				log.Println("Error sending setpoint:")
 				http.Error(w, "Couldn't send setpoint.", http.StatusInternalServerError)
+				return
 			}
 		}
 

ZigBeeValve/systemconfig.json

@@ -82,7 +82,7 @@ func initTemplate() components.UnitAsset {
 	uat := &UnitAsset{
 		Name:    "Template",
 		Details: map[string][]string{"Location": {"Kitchen"}},
-		Model:   "",
+		Model:   "SmartThermostat",
 		Period:  10,
 		Setpt:   20,
 		Apikey:  "1234",
@@ -246,9 +246,11 @@ func (ua *UnitAsset) getSetPoint() (f forms.SignalA_v1a) {
 // setSetPoint updates the thermal setpoint
 func (ua *UnitAsset) setSetPoint(f forms.SignalA_v1a) {
 	ua.Setpt = f.Value
-	log.Println("*---------------------*")
-	log.Printf("New set point: %.1f\n", f.Value)
-	log.Println("*---------------------*")
+	/*
+		log.Println("*---------------------*")
+		log.Printf("New set point: %.1f\n", f.Value)
+		log.Println("*---------------------*")
+	*/
 }
 
 func (ua *UnitAsset) sendSetPoint() (err error) {