Save updated fixture and test-jsons

bouwew · bouwew · commit 85f81e9e5b96 · 2024-11-18T20:17:03.000+01:00
diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json
@@ -1,5 +1,5 @@
 {
-  "devices": {
+  "device_zones": {
     "01b85360fdd243d0aaad4d6ac2a5ba7e": {
       "active_preset": "home",
       "available_schedules": [
@@ -103,6 +103,5 @@
     "notifications": {},
     "reboot": true,
     "smile_name": "Smile Anna"
-  },
-  "zones": {}
+  }
 }
diff --git a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json
@@ -1,45 +1,47 @@
 {
-  "67d73d0bd469422db25a618a5fb8eeb0": {
-    "switches": {
-      "lock": true
-    }
-  },
-  "29542b2b6a6a4169acecc15c72a599b8": {
-    "switches": {
-      "relay": false,
-      "lock": false
-    }
-  },
-  "2568cc4b9c1e401495d4741a5f89bee1": {
-    "sensors": {
-      "electricity_consumed": 0.0,
-      "electricity_consumed_interval": 0.0
+  "device_zones": {
+    "67d73d0bd469422db25a618a5fb8eeb0": {
+      "switches": {
+        "lock": true
+      }
     },
-    "switches": {
-      "relay": false,
-      "lock": false
-    }
-  },
-  "1772a4ea304041adb83f357b751341ff": {
-    "available": false
-  },
-  "e2f4322d57924fa090fbbc48b3a140dc": {
-    "binary_sensors": {
-      "low_battery": true
-    }
-  },
-  "da224107914542988a88561b4452b0f6": {
-    "binary_sensors": {
-      "plugwise_notification": true
-    }
-  },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "members": [
-      "2568cc4b9c1e401495d4741a5f89bee1",
-      "29542b2b6a6a4169acecc15c72a599b8"
-    ],
-    "switches": {
-      "relay": false
+    "29542b2b6a6a4169acecc15c72a599b8": {
+      "switches": {
+        "relay": false,
+        "lock": false
+      }
+    },
+    "2568cc4b9c1e401495d4741a5f89bee1": {
+      "sensors": {
+        "electricity_consumed": 0.0,
+        "electricity_consumed_interval": 0.0
+      },
+      "switches": {
+        "relay": false,
+        "lock": false
+      }
+    },
+    "1772a4ea304041adb83f357b751341ff": {
+      "available": false
+    },
+    "e2f4322d57924fa090fbbc48b3a140dc": {
+      "binary_sensors": {
+        "low_battery": true
+      }
+    },
+    "da224107914542988a88561b4452b0f6": {
+      "binary_sensors": {
+        "plugwise_notification": true
+      }
+    },
+    "e8ef2a01ed3b4139a53bf749204fe6b4": {
+      "members": [
+        "2568cc4b9c1e401495d4741a5f89bee1",
+        "29542b2b6a6a4169acecc15c72a599b8"
+      ],
+      "switches": {
+        "relay": false
+      }
     }
-  }
+  }    
 }
diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json
@@ -1,5 +1,5 @@
 {
-  "devices": {
+  "device_zones": {
     "01b85360fdd243d0aaad4d6ac2a5ba7e": {
       "active_preset": "home",
       "available_schedules": [
@@ -94,15 +94,5 @@
       },
       "vendor": "Bosch Thermotechniek B.V."
     }
-  },
-  "gateway": {
-    "cooling_present": false,
-    "gateway_id": "0466eae8520144c78afb29628384edeb",
-    "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
-    "item_count": 58,
-    "notifications": {},
-    "reboot": true,
-    "smile_name": "Smile Anna"
-  },
-  "zones": {}
+  }
 }
diff --git a/tests/data/anna/anna_v4_UPDATED_DATA.json b/tests/data/anna/anna_v4_UPDATED_DATA.json
@@ -1,52 +1,54 @@
 {
-  "cd0e6156b1f04d5f952349ffbe397481": {
-    "maximum_boiler_temperature": {
-      "setpoint": 69.0,
-      "lower_bound": 0.0,
-      "upper_bound": 100.0,
-      "resolution": 1.0
+  "device_zones": {
+    "cd0e6156b1f04d5f952349ffbe397481": {
+      "maximum_boiler_temperature": {
+        "setpoint": 69.0,
+        "lower_bound": 0.0,
+        "upper_bound": 100.0,
+        "resolution": 1.0
+      },
+      "max_dhw_temperature": {
+        "setpoint": 59.0,
+        "lower_bound": 30.0,
+        "upper_bound": 60.0,
+        "resolution": 0.01
+      },
+      "binary_sensors": {
+        "dhw_state": false,
+        "heating_state": false,
+        "flame_state": false
+      },
+      "sensors": {
+        "water_temperature": 51.0,
+        "intended_boiler_temperature": 0.0,
+        "modulation_level": 0,
+        "return_temperature": 41.0,
+        "water_pressure": 2.1
+      },
+      "switches": {
+        "dhw_cm_switch": true
+      }
     },
-    "max_dhw_temperature": {
-      "setpoint": 59.0,
-      "lower_bound": 30.0,
-      "upper_bound": 60.0,
-      "resolution": 0.01
+    "01b85360fdd243d0aaad4d6ac2a5ba7e": {
+      "thermostat": {
+        "setpoint": 19.5,
+        "lower_bound": 4.0,
+        "upper_bound": 30.0,
+        "resolution": 0.1
+      },
+      "active_preset": "away",
+      "select_schedule": "Standaard",
+      "climate_mode": "auto",
+      "sensors": {
+        "temperature": 19.5,
+        "setpoint": 19.5,
+        "illuminance": 39.5
+      }
     },
-    "binary_sensors": {
-      "dhw_state": false,
-      "heating_state": false,
-      "flame_state": false
-    },
-    "sensors": {
-      "water_temperature": 51.0,
-      "intended_boiler_temperature": 0.0,
-      "modulation_level": 0,
-      "return_temperature": 41.0,
-      "water_pressure": 2.1
-    },
-    "switches": {
-      "dhw_cm_switch": true
-    }
-  },
-  "01b85360fdd243d0aaad4d6ac2a5ba7e": {
-    "thermostat": {
-      "setpoint": 19.5,
-      "lower_bound": 4.0,
-      "upper_bound": 30.0,
-      "resolution": 0.1
-    },
-    "active_preset": "away",
-    "select_schedule": "Standaard",
-    "climate_mode": "auto",
-    "sensors": {
-      "temperature": 19.5,
-      "setpoint": 19.5,
-      "illuminance": 39.5
-    }
-  },
-  "0466eae8520144c78afb29628384edeb": {
-    "sensors": {
-      "outdoor_temperature": 6.44
+    "0466eae8520144c78afb29628384edeb": {
+      "sensors": {
+        "outdoor_temperature": 6.44
+      }
     }
   }
 }
diff --git a/tests/test_adam.py b/tests/test_adam.py
@@ -49,6 +49,8 @@ async def test_connect_adam_plus_anna_new(self):
             "854f8a9b0e7e425db97f1f110e1ce4b3",
             "2568cc4b9c1e401495d4741a5f89bee1",
             "e8ef2a01ed3b4139a53bf749204fe6b4",
+            "f2bf9048bef64cc5b6d5110154e33c81", 
+            "f871b8c4d63549319221e294e4f88074",
         ]
 
         result = await self.tinker_thermostat(

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "devices": {`
	`2`	`+ "device_zones": {`
`3`	`3`	`"01b85360fdd243d0aaad4d6ac2a5ba7e": {`
`4`	`4`	`"active_preset": "home",`
`5`	`5`	`"available_schedules": [`
`@@ -103,6 +103,5 @@`
`103`	`103`	`"notifications": {},`
`104`	`104`	`"reboot": true,`
`105`	`105`	`"smile_name": "Smile Anna"`
`106`		`- },`
`107`		`- "zones": {}`
	`106`	`+ }`
`108`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ async def test_connect_adam_plus_anna_new(self):`
`49`	`49`	`"854f8a9b0e7e425db97f1f110e1ce4b3",`
`50`	`50`	`"2568cc4b9c1e401495d4741a5f89bee1",`
`51`	`51`	`"e8ef2a01ed3b4139a53bf749204fe6b4",`
	`52`	`+ "f2bf9048bef64cc5b6d5110154e33c81",`
	`53`	`+ "f871b8c4d63549319221e294e4f88074",`
`52`	`54`	`]`
`53`	`55`
`54`	`56`	`result = await self.tinker_thermostat(`