Revert "rely upon inherited test code" account java does not allow de…

…fault for methods in AbstractPowerManagerTestBase This reverts commit 9edc447.
JMRI · Sep 30, 2018 · 450cbf3 · 450cbf3
1 parent 9edc447
commit 450cbf3
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 0 deletions.
diff --git a/java/test/jmri/jmrix/easydcc/EasyDccPowerManagerTest.java b/java/test/jmri/jmrix/easydcc/EasyDccPowerManagerTest.java
@@ -37,6 +37,16 @@ protected void sendOffReply() {
     protected void hearOff() {
         // this does nothing, as there is no unsolicited on
     }
+
+    @Override
+    protected void sendIdleReply() {
+        // this does nothign as there is no IDLE support
+    }
+
+    @Override
+    protected void hearIdle() {
+        // this does nothign as there is no IDLE support
+    }
 
     @Override
     protected int numListeners() {
@@ -58,6 +68,11 @@ protected boolean outboundOffOK(int index) {
         return 'K' == ((controller.outbound.elementAt(index))).getOpCode();
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return false;
+    }
+
     // setup a default EasyDccTrafficController interface
     @Override
     @Before

diff --git a/java/test/jmri/jmrix/jmriclient/JMRIClientPowerManagerTest.java b/java/test/jmri/jmrix/jmriclient/JMRIClientPowerManagerTest.java
@@ -37,6 +37,17 @@ protected void sendOffReply() {
     protected void hearOff() {
        stc.sendTestReply(new JMRIClientReply("POWER OFF\n\r"));
     }
+
+    @Override
+    protected void sendIdleReply() {
+       stc.sendTestReply(new JMRIClientReply("POWER IDLE\n\r"));
+    }
+
+    @Override
+    protected void hearIdle() {
+        stc.sendTestReply(new JMRIClientReply("POWER IDLE\n\r"));
+    }
+
     @Override
     protected int numListeners() {
         return stc.numListeners();
@@ -57,6 +68,11 @@ protected boolean outboundOffOK(int index) {
         return ((stc.outbound.elementAt(index))).toString().equals("POWER OFF\n");
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return ((stc.outbound.elementAt(index))).toString().equals("POWER IDLE\n");
+    }
+
     // The minimal setup for log4J
     @Before
     @Override

diff --git a/java/test/jmri/jmrix/lenz/XNetPowerManagerTest.java b/java/test/jmri/jmrix/lenz/XNetPowerManagerTest.java
@@ -45,11 +45,21 @@ protected void sendOffReply() {
         pm.message(m);
     }
 
+    @Override
+    protected void sendIdleReply() {
+        return;
+    }
+
     @Override
     protected void hearOff() {
         sendOffReply();
     }
 
+    @Override
+    protected void hearIdle() {
+        return;
+    }
+
     @Override
     protected int numListeners() {
         return tc.numListeners();
@@ -72,6 +82,11 @@ protected boolean outboundOffOK(int index) {
         return tc.outbound.elementAt(index).equals(m);
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return true;
+    }
+
     @Test
     public void testGetUserName() {
         Assert.assertEquals("User Name", "XpressNet", pm.getUserName());

diff --git a/java/test/jmri/jmrix/nce/NcePowerManagerTest.java b/java/test/jmri/jmrix/nce/NcePowerManagerTest.java
@@ -34,6 +34,17 @@ protected void hearOff() {
         // this does nothing, as there is no unsolicited on
     }
 
+    @Override
+    protected void sendIdleReply() {
+        NceReply l = new NceReply(controller);
+        controller.sendTestReply(l);
+    }
+
+    @Override
+    protected void hearIdle() {
+        // this does nothing, as there is no unsolicited on
+    }
+
     @Override
     protected int numListeners() {
         return controller.numListeners();
@@ -54,6 +65,11 @@ protected boolean outboundOffOK(int index) {
         return controller.outbound.elementAt(index).isKillMain();
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return controller.outbound.elementAt(index).isKillMain();
+    }
+
     // setup a default NceTrafficController interface
     @Before
     @Override

diff --git a/java/test/jmri/jmrix/sprog/SprogPowerManagerTest.java b/java/test/jmri/jmrix/sprog/SprogPowerManagerTest.java
@@ -36,6 +36,17 @@ protected void sendOffReply() {
     protected void hearOff() {
        stc.sendTestReply(new SprogReply("-"));
     }
+
+    @Override
+    protected void sendIdleReply() {
+        return;
+    }
+
+    @Override
+    protected void hearIdle() {
+        return;
+    }
+
     @Override
     protected int numListeners() {
         return stc.numListeners();
@@ -56,6 +67,11 @@ protected boolean outboundOffOK(int index) {
         return ((stc.outbound.elementAt(index))).toString().equals("-");
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return true;
+    }
+
     @Test
     @Override
     @Ignore("unsolicited state changes are currently ignored")

diff --git a/java/test/jmri/jmrix/srcp/SRCPPowerManagerTest.java b/java/test/jmri/jmrix/srcp/SRCPPowerManagerTest.java
@@ -39,6 +39,16 @@ protected void hearOff() {
        stc.sendTestReply(new SRCPReply("12345678910 100 INFO 1 POWER OFF hello world\n\r"));
     }
 
+    @Override
+    protected void sendIdleReply() {
+       return;
+    }
+
+    @Override
+    protected void hearIdle() {
+       return;
+    }
+
     @Override
     protected int numListeners() {
         return stc.numListeners();
@@ -59,6 +69,11 @@ protected boolean outboundOffOK(int index) {
         return ((stc.outbound.elementAt(index))).toString().equals("SET 1 POWER OFF\n");
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return ((stc.outbound.elementAt(index))).toString().equals("SET 1 POWER OFF\n");
+    }
+
     @Test
     @Override
     @Ignore("unsolicited state changes are currently ignored")

diff --git a/java/test/jmri/jmrix/xpa/XpaPowerManagerTest.java b/java/test/jmri/jmrix/xpa/XpaPowerManagerTest.java
@@ -33,6 +33,15 @@ protected void sendOffReply() {
     protected void hearOff() {
     }
 
+    @Override
+    protected void sendIdleReply() {
+        ((XpaPowerManager) p).reply(new XpaMessage("ATDT0;"));
+    }
+
+    @Override
+    protected void hearIdle() {
+    }
+
     @Override
     protected int numListeners() {
         return tc.numListeners();
@@ -53,6 +62,11 @@ protected boolean outboundOffOK(int index) {
         return ((tc.outbound.get(index))).toString().equals("ATDT0;");
     }
 
+    @Override
+    protected boolean outboundIdleOK(int index) {
+        return ((tc.outbound.get(index))).toString().equals("ATDT0;");
+    }
+
     @Test
     @Override
     @Ignore("unsolicited state changes are currently ignored")