tests for StreamConnectionConfigXml objects

java/test/jmri/jmrix/configurexml/AbstractStreamConnectionConfigXmlTestBase.java

@@ -0,0 +1,11 @@
+package jmri.jmrix.configurexml;
+
+import org.junit.*;
+
+/**
+ * Base tests for StreamConnectionConfigXml objects.
+ *
+ * @author Paul Bender Copyright (C) 2018	
+ */
+abstract public class AbstractStreamConnectionConfigXmlTestBase extends AbstractConnectionConfigXmlTestBase {
+}

java/test/jmri/jmrix/dccpp/configurexml/DCCppStreamConnectionConfigXmlTest.java

@@ -0,0 +1,36 @@
+package jmri.jmrix.dccpp.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.*;
+import jmri.jmrix.dccpp.DCCppSystemConnectionMemo;
+import jmri.jmrix.dccpp.DCCppStreamConnectionConfig;
+
+/**
+ * Tests for the DCCppStreamConnectionConfigXml class.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class DCCppStreamConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractStreamConnectionConfigXmlTestBase {
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+        xmlAdapter = new DCCppStreamConnectionConfigXml();
+        cc = new DCCppStreamConnectionConfig();
+    }
+
+    @After
+    public void tearDown() {
+        // if we've started a traffic controller, dispose of it
+        if (cc.getAdapter() != null) {
+            if (cc.getAdapter().getSystemConnectionMemo() != null) {
+               ((DCCppSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).dispose();
+            }
+        }
+
+        JUnitUtil.tearDown();
+        xmlAdapter = null;
+        cc = null;
+    }
+}

java/test/jmri/jmrix/dccpp/configurexml/PackageTest.java

@@ -7,12 +7,13 @@
 @Suite.SuiteClasses({
     DCCppLightManagerXmlTest.class,
     DCCppSensorManagerXmlTest.class,
-    DCCppTurnoutManagerXmlTest.class
+    DCCppTurnoutManagerXmlTest.class,
+    DCCppStreamConnectionConfigXmlTest.class
 })
 /**
  * Tests for the jmri.jmrix.dccpp.configurexml package.
  *
- * @author Paul Bender Copyright (C) 2016
+ * @author Paul Bender Copyright (C) 2019
  */
 public class PackageTest {
 }

java/test/jmri/jmrix/lenz/configurexml/PackageTest.java

@@ -8,7 +8,8 @@
    XNetLightManagerXmlTest.class,
    XNetSensorManagerXmlTest.class,
    XNetTurnoutManagerXmlTest.class,
-   AbstractXNetSerialConnectionConfigXmlTest.class
+   AbstractXNetSerialConnectionConfigXmlTest.class,
+   XNetStreamConnectionConfigXmlTest.class
 })
 /**
  * Tests for the jmri.jmrix.lenz.configurexml package.

java/test/jmri/jmrix/lenz/configurexml/XNetStreamConnectionConfigXmlTest.java

@@ -0,0 +1,36 @@
+package jmri.jmrix.lenz.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.*;
+import jmri.jmrix.lenz.XNetSystemConnectionMemo;
+import jmri.jmrix.lenz.XNetStreamConnectionConfig;
+
+/**
+ * Tests for the XNetStreamConnectionConfigXml class.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class XNetStreamConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractStreamConnectionConfigXmlTestBase {
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+        xmlAdapter = new XNetStreamConnectionConfigXml();
+        cc = new XNetStreamConnectionConfig();
+    }
+
+    @After
+    public void tearDown() {
+        // if we've started a traffic controller, dispose of it
+        if (cc.getAdapter() != null) {
+            if (cc.getAdapter().getSystemConnectionMemo() != null) {
+                ((XNetSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).dispose();
+            }
+        }
+
+        JUnitUtil.tearDown();
+        xmlAdapter = null;
+        cc = null;
+    }
+}

java/test/jmri/jmrix/loconet/streamport/PackageTest.java

@@ -9,6 +9,7 @@
    LnStreamPortControllerTest.class,
    BundleTest.class,
    LnStreamConnectionConfigTest.class,
+   jmri.jmrix.loconet.streamport.configurexml.PackageTest.class,
 })
 
 /**

java/test/jmri/jmrix/loconet/streamport/configurexml/LnStreamConnectionConfigXmlTest.java

@@ -0,0 +1,37 @@
+package jmri.jmrix.loconet.streamport.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.*;
+import jmri.jmrix.loconet.LocoNetSystemConnectionMemo;
+import jmri.jmrix.loconet.streamport.LnStreamConnectionConfig;
+
+/**
+ * Tests for the LnStreamConnectionConfigXml class.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class LnStreamConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractStreamConnectionConfigXmlTestBase {
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+        xmlAdapter = new LnStreamConnectionConfigXml();
+        cc = new LnStreamConnectionConfig();
+    }
+
+    @After
+    public void tearDown() {
+        // if we've started a traffic controller, dispose of it
+        if (cc.getAdapter() != null) {
+            if (cc.getAdapter().getSystemConnectionMemo() != null) {
+                if ( ((LocoNetSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).getLnTrafficController() != null)
+                    ((LocoNetSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).getLnTrafficController().dispose();
+            }
+        }
+
+        JUnitUtil.tearDown();
+        xmlAdapter = null;
+        cc = null;
+    }
+}

java/test/jmri/jmrix/loconet/streamport/configurexml/PackageTest.java

@@ -0,0 +1,17 @@
+package jmri.jmrix.loconet.streamport.configurexml;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+   LnStreamConnectionConfigXmlTest.class,
+})
+
+/**
+ * Tests for the jmri.jmrix.loconet.streamport.configurexml package.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class PackageTest  {
+}

java/test/jmri/jmrix/rfid/configurexml/PackageTest.java

@@ -6,12 +6,13 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     RfidReporterManagerXmlTest.class,
-    RfidSensorManagerXmlTest.class
+    RfidSensorManagerXmlTest.class,
+    RfidStreamConnectionConfigXmlTest.class
 })
 /**
  * Tests for the jmri.jmrix.rfid.configurexml package.
  *
- * @author Paul Bender Copyright (C) 2016
+ * @author Paul Bender Copyright (C) 2019
  */
 public class PackageTest {
 }

java/test/jmri/jmrix/rfid/configurexml/RfidStreamConnectionConfigXmlTest.java

@@ -0,0 +1,36 @@
+package jmri.jmrix.rfid.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.*;
+import jmri.jmrix.rfid.RfidSystemConnectionMemo;
+import jmri.jmrix.rfid.RfidStreamConnectionConfig;
+
+/**
+ * Tests for the RfidStreamConnectionConfigXml class.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class RfidStreamConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractStreamConnectionConfigXmlTestBase {
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+        xmlAdapter = new RfidStreamConnectionConfigXml();
+        cc = new RfidStreamConnectionConfig();
+    }
+
+    @After
+    public void tearDown() {
+        // if we've started a traffic controller, dispose of it
+        if (cc.getAdapter() != null) {
+            if (cc.getAdapter().getSystemConnectionMemo() != null) {
+               ((RfidSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).dispose();
+            }
+        }
+
+        JUnitUtil.tearDown();
+        xmlAdapter = null;
+        cc = null;
+    }
+}

java/test/jmri/jmrix/sprog/configurexml/PackageTest.java

@@ -5,7 +5,8 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-   SprogTurnoutManagerXmlTest.class
+   SprogTurnoutManagerXmlTest.class,
+   SprogCSStreamConnectionConfigXmlTest.class
 })
 /**
  * Tests for the jmri.jmrix.sprog.configurexml package.

java/test/jmri/jmrix/sprog/configurexml/SprogCSStreamConnectionConfigXmlTest.java

@@ -0,0 +1,37 @@
+package jmri.jmrix.sprog.configurexml;
+
+import jmri.util.JUnitUtil;
+import org.junit.*;
+import jmri.jmrix.sprog.SprogSystemConnectionMemo;
+import jmri.jmrix.sprog.SprogCSStreamConnectionConfig;
+
+/**
+ * Tests for the SprogCSStreamConnectionConfigXml class.
+ *
+ * @author Paul Bender Copyright (C) 2019
+ */
+public class SprogCSStreamConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractStreamConnectionConfigXmlTestBase {
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        JUnitUtil.setUp();
+        xmlAdapter = new SprogCSStreamConnectionConfigXml();
+        cc = new SprogCSStreamConnectionConfig();
+    }
+
+    @After
+    public void tearDown() {
+        // if we've started a traffic controller, dispose of it
+        if (cc.getAdapter() != null) {
+            if (cc.getAdapter().getSystemConnectionMemo() != null) {
+                if ( ((SprogSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).getSprogTrafficController() != null)
+                    ((SprogSystemConnectionMemo)cc.getAdapter().getSystemConnectionMemo()).getSprogTrafficController().dispose();
+            }
+        }
+
+        JUnitUtil.tearDown();
+        xmlAdapter = null;
+        cc = null;
+    }
+}