Quick Fix of extra Ln menu showing, update tests

JMRI · Jun 10, 2018 · ec33316 · ec33316
1 parent bc375b3
commit ec33316
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/java/src/jmri/jmrix/loconet/loconetovertcp/Bundle.properties b/java/src/jmri/jmrix/loconet/loconetovertcp/Bundle.properties
@@ -21,7 +21,7 @@ StartButton=Start Server
 #Button text for stopping server
 StopButton=Stop Server
 #Server status label
-StatusLabel=Server Status: {0}  Client Count: {1}
+StatusLabel=Server Status: {0} - Client Count: {1}
 #Status label when server after server is started
 Running=Running
 #Status label when server is stopped

diff --git a/java/src/jmri/jmrix/loconet/loconetovertcp/LnTcpServer.java b/java/src/jmri/jmrix/loconet/loconetovertcp/LnTcpServer.java
@@ -73,7 +73,7 @@ public void setStateListner(LnTcpServerListener l) {
      */
     public static synchronized LnTcpServer getDefault() {
         return InstanceManager.getOptionalDefault(LnTcpServer.class).orElseGet(() -> {
-            LnTcpServer server = new LnTcpServer(new LocoNetSystemConnectionMemo());
+            LnTcpServer server = new LnTcpServer(jmri.InstanceManager.getDefault(LocoNetSystemConnectionMemo.class));
             return InstanceManager.setDefault(LnTcpServer.class, server);
         });
     }

diff --git a/java/test/jmri/jmrix/loconet/loconetovertcp/LnTcpServerFrameTest.java b/java/test/jmri/jmrix/loconet/loconetovertcp/LnTcpServerFrameTest.java
@@ -1,6 +1,8 @@
 package jmri.jmrix.loconet.loconetovertcp;
 
 import java.awt.GraphicsEnvironment;
+import jmri.jmrix.loconet.LocoNetInterfaceScaffold;
+import jmri.jmrix.loconet.LocoNetSystemConnectionMemo;
 import jmri.util.JUnitUtil;
 import org.junit.After;
 import org.junit.Assert;
@@ -15,6 +17,9 @@
  */
 public class LnTcpServerFrameTest {
 
+    private LocoNetInterfaceScaffold lnis;
+    private LocoNetSystemConnectionMemo memo;
+
     @Test
     public void testGetDefault() {
         Assume.assumeFalse(GraphicsEnvironment.isHeadless());
@@ -35,8 +40,17 @@ public void testGetInstance() {
     public void setUp() {
         JUnitUtil.setUp();
         JUnitUtil.resetProfileManager();
+        lnis = new LocoNetInterfaceScaffold();
+        memo = new LocoNetSystemConnectionMemo();
+        lnis.setSystemConnectionMemo(memo);
+        memo.setLnTrafficController(lnis);
     }
 
     @After
-    public void tearDown() {        JUnitUtil.tearDown();    }
+    public void tearDown() {
+        memo.dispose();
+        lnis = null;
+        JUnitUtil.tearDown();
+    }
+
 }
diff --git a/java/test/jmri/jmrix/loconet/loconetovertcp/LnTcpServerTest.java b/java/test/jmri/jmrix/loconet/loconetovertcp/LnTcpServerTest.java
@@ -1,5 +1,7 @@
 package jmri.jmrix.loconet.loconetovertcp;
 
+import jmri.jmrix.loconet.LocoNetInterfaceScaffold;
+import jmri.jmrix.loconet.LocoNetSystemConnectionMemo;
 import jmri.util.JUnitUtil;
 import org.junit.After;
 import org.junit.Assert;
@@ -14,16 +16,23 @@
  */
 public class LnTcpServerTest {
 
+    private LocoNetInterfaceScaffold lnis;
+
     @Test
     public void getInstanceTest() {
+        LocoNetSystemConnectionMemo memo = new LocoNetSystemConnectionMemo();
+        lnis.setSystemConnectionMemo(memo);
+        memo.setLnTrafficController(lnis);
         Assert.assertNotNull("Server getInstance", LnTcpServer.getDefault());
         LnTcpServer.getDefault().disable();  // turn the server off after enabled during creation.
+        memo.dispose();
     }
 
     @Before
     public void setUp() {
         JUnitUtil.setUp();
         JUnitUtil.resetProfileManager();
+        lnis = new LocoNetInterfaceScaffold();
     }
 
     @After