Dodged another exception (#303)

home-climate-control · Dec 29, 2023 · 4fbb955 · 4fbb955
1 parent f595dcc
commit 4fbb955
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v1/Z2MJsonListener.java b/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v1/Z2MJsonListener.java
@@ -104,7 +104,7 @@ private Signal<Double, Void> convert(Signal<String, Void> signal) {
 
             return new Signal<>(signal.timestamp, value);
 
-        } catch (JsonProcessingException ex) {
+        } catch (JsonProcessingException | NumberFormatException ex) {
 
             // Throwing an exception here breaks everything
             // https://github.com/home-climate-control/dz/issues/303

diff --git a/dz3r-mqtt/src/test/java/net/sf/dz3r/device/zwave/v2/ZWaveCqrsBinarySwitchTest.java b/dz3r-mqtt/src/test/java/net/sf/dz3r/device/zwave/v2/ZWaveCqrsBinarySwitchTest.java
@@ -14,6 +14,7 @@
 import java.time.Clock;
 import java.time.Duration;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
 @EnabledIfEnvironmentVariable(
@@ -72,4 +73,15 @@ void setState1010() {
 
         }).doesNotThrowAnyException();
     }
+
+    @Test
+    void parseBinary() {
+        assertThat(Boolean.valueOf("TRUE")).isTrue();
+        assertThat(Boolean.valueOf("true")).isTrue();
+        assertThat(Boolean.valueOf("false")).isFalse();
+
+        assertThat(Boolean.valueOf(null)).isFalse();
+        assertThat(Boolean.valueOf("")).isFalse();
+        assertThat(Boolean.valueOf("what's that?")).isFalse();
+    }
 }