Re-enabled ignored tests; handled ripples on other tests (#130, #131)

home-climate-control · May 18, 2021 · 27d1eed · 27d1eed
1 parent 4f5611f
commit 27d1eed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/dz3-master/dz3-model/src/test/java/net/sf/dz3/device/actuator/impl/THTest.java b/dz3-master/dz3-model/src/test/java/net/sf/dz3/device/actuator/impl/THTest.java
@@ -50,7 +50,6 @@ public class THTest {
     private static final String WRONG_POSITION = "wrong position";
     private static final String WRONG_STATE = "wrong switch state";
 
-    @Ignore
     @Test
     public void moveGroup() throws Exception {
         ThreadContext.push("moveGroup");
@@ -80,7 +79,6 @@ public void moveGroup() throws Exception {
         }
     }
 
-    @Ignore
     @Test
     public void lockUp() throws Exception {
         ThreadContext.push("lockUp");
@@ -138,7 +136,6 @@ public void testSyncSlowSimple()
         testSync("slow/simple", SimpleDamperController.class, 100, 500);
     }
 
-    @Ignore
     @Test
     public void testSyncFastBalancing()
             throws InterruptedException, ExecutionException, IOException, NoSuchMethodException, SecurityException,

diff --git a/dz3-model/src/main/java/net/sf/dz3/device/actuator/impl/SwitchDamper.java b/dz3-model/src/main/java/net/sf/dz3/device/actuator/impl/SwitchDamper.java
@@ -1,6 +1,7 @@
 package net.sf.dz3.device.actuator.impl;
 
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 
 import org.apache.logging.log4j.ThreadContext;
 
@@ -72,7 +73,7 @@ public class SwitchDamper extends AbstractDamper {
      * @param heartbeatSeconds The command to set the position will not be sent to the actual switch
      * more often than once in this many seconds.
      */
-    public SwitchDamper(String name, Switch target, double threshold, int heartbeatSeconds) {
+    public SwitchDamper(String name, Switch target, double threshold, int heartbeatSeconds) throws IOException {
 
         this(name, target, threshold, 1.0, heartbeatSeconds, false);
     }
@@ -87,7 +88,7 @@ public SwitchDamper(String name, Switch target, double threshold, int heartbeatS
      * @param heartbeatSeconds The command to set the position will not be sent to the actual switch
      * more often than once in this many seconds.
      */
-    public SwitchDamper(String name, Switch target, double threshold, double parkPosition, int heartbeatSeconds) {
+    public SwitchDamper(String name, Switch target, double threshold, double parkPosition, int heartbeatSeconds) throws IOException {
 
         this(name, target, threshold, parkPosition, heartbeatSeconds, false);
     }
@@ -103,7 +104,7 @@ public SwitchDamper(String name, Switch target, double threshold, double parkPos
      * more often than once in this many seconds.
      * @param inverted {@code true} if the switch position needs to be inverted.
      */
-    public SwitchDamper(String name, Switch target, double threshold, double parkPosition, int heartbeatSeconds, boolean inverted) {
+    public SwitchDamper(String name, Switch target, double threshold, double parkPosition, int heartbeatSeconds, boolean inverted) throws IOException {
 
         super(name);
 
@@ -123,7 +124,11 @@ public SwitchDamper(String name, Switch target, double threshold, double parkPos
 
         setParkPosition(parkPosition);
 
-        set(getParkPosition());
+        try {
+            set(getParkPosition()).get();
+        } catch (InterruptedException | ExecutionException ex) {
+            throw new IOException("can't set switch position", ex);
+        }
     }
 
     private void check(Switch target) {

diff --git a/dz3-model/src/test/java/net/sf/dz3/device/actuator/impl/SwitchDamperTest.java b/dz3-model/src/test/java/net/sf/dz3/device/actuator/impl/SwitchDamperTest.java
@@ -25,7 +25,7 @@ public class SwitchDamperTest extends TestCase {
     /**
      * Test whether the {@link SwitchDamper} is properly parked.
      */
-    public void testPark() {
+    public void testPark() throws IOException {
 
         NullSwitch s = new NullSwitch("switch");
         Damper d = new SwitchDamper("damper", s, 0.5, 0);

diff --git a/dz3-model/src/test/java/net/sf/dz3/device/model/impl/BalancingDamperControllerTest.java b/dz3-model/src/test/java/net/sf/dz3/device/model/impl/BalancingDamperControllerTest.java
@@ -83,8 +83,7 @@ public void testNaN() throws InterruptedException, ExecutionException {
 
             assertTrue(status.isOK());
 
-            // VT: NOTE: Need this because of asynchronous nature of damper transitions
-            logger.debug("about to assert");
+            damperController.powerOff().get();
 
             assertEquals("Wrong damper position", d1.getParkPosition(), d1.get(), 0.000000000001);