ZoneSettings can now exist with null setpoint (#267)

home-climate-control · Jun 12, 2024 · 63b3a79 · 63b3a79
1 parent 47c3f54
commit 63b3a79
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/modules/hcc-http-gae/src/test/java/net/sf/dz3r/view/http/gae/v3/ZoneRendererTest.java b/modules/hcc-http-gae/src/test/java/net/sf/dz3r/view/http/gae/v3/ZoneRendererTest.java
@@ -38,7 +38,7 @@ void setModes() {
     void deviation() {
 
         // Abbreviated constructor - sets enabled = true, voting = true
-        var settingsActual = new ZoneSettings(25);
+        var settingsActual = new ZoneSettings(25.0);
 
         // Full constructor - explicit values
         var settingsPeriod = new ZoneSettings(

diff --git a/modules/hcc-model/src/main/java/net/sf/dz3r/model/ZoneSettings.java b/modules/hcc-model/src/main/java/net/sf/dz3r/model/ZoneSettings.java
@@ -42,7 +42,7 @@ public class ZoneSettings {
      *
      * @param setpoint Setpoint to set.
      */
-    public ZoneSettings(double setpoint) {
+    public ZoneSettings(Double setpoint) {
         this(true, setpoint, true, false, 0, null);
     }
 

diff --git a/...model/src/test/java/net/sf/dz3r/device/actuator/damper/BalancingDamperControllerTest.java b/...model/src/test/java/net/sf/dz3r/device/actuator/damper/BalancingDamperControllerTest.java
@@ -47,7 +47,7 @@ void testSingleZone() {
         assertThatIllegalStateException()
                 .isThrownBy(() -> {
 
-                    var zoneSettings = new ZoneSettings(20);
+                    var zoneSettings = new ZoneSettings(20.0);
                     var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
 
                     var d1 = new NullDamper("d1");
@@ -66,7 +66,7 @@ void testBoundaries1() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 
@@ -127,7 +127,7 @@ void testBoundaries2() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 
@@ -181,7 +181,7 @@ void testNaN() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 

diff --git a/...cc-model/src/test/java/net/sf/dz3r/device/actuator/damper/SimpleDamperControllerTest.java b/...cc-model/src/test/java/net/sf/dz3r/device/actuator/damper/SimpleDamperControllerTest.java
@@ -47,7 +47,7 @@ void testSingleZone() {
         assertThatIllegalStateException()
                 .isThrownBy(() -> {
 
-                    var zoneSettings = new ZoneSettings(20);
+                    var zoneSettings = new ZoneSettings(20.0);
                     var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
 
                     var d1 = new NullDamper("d1");
@@ -66,7 +66,7 @@ void testBoundaries1() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 
@@ -126,7 +126,7 @@ void testBoundaries2() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 
@@ -180,7 +180,7 @@ void testNaN() {
 
         assertThatCode(() -> {
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
             var z1 = new Zone(new Thermostat("Z1", 20.0, 1, 0, 0, 1), zoneSettings);
             var z2 = new Zone(new Thermostat("Z2", 20.0, 1, 0, 0, 1), zoneSettings);
 

diff --git a/modules/hcc-model/src/test/java/net/sf/dz3r/device/actuator/damper/THTest.java b/modules/hcc-model/src/test/java/net/sf/dz3r/device/actuator/damper/THTest.java
@@ -183,7 +183,7 @@ private void testSync(String marker, Class<? extends AbstractDamperController> c
             assertThat(switchWestDamper.getState().block()).isTrue();
             assertThat(switchWestBoosterFan.getState().block()).isTrue();
 
-            var zoneSettings = new ZoneSettings(20);
+            var zoneSettings = new ZoneSettings(20.0);
 
             // For a good measure, let's advance the timestamp between signals
             timestamp += 50 + rg.nextInt(100);

diff --git a/modules/hcc-model/src/test/java/net/sf/dz3r/model/ZoneSettingsTest.java b/modules/hcc-model/src/test/java/net/sf/dz3r/model/ZoneSettingsTest.java
@@ -28,8 +28,8 @@ private static Stream<Source> settingsProvider() {
 
         return Stream.of(
                 new Source(
-                        new ZoneSettings(25),
-                        new ZoneSettings(25),
+                        new ZoneSettings(25.0),
+                        new ZoneSettings(25.0),
                         true
                 ),
                 new Source(