Merge remote-tracking branch 'JMRI/master' into javadoc-warnings

java/src/jmri/jmrit/symbolicprog/NewLocoSelPane.java

@@ -70,7 +70,7 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
 
         JPanel pane1a = new JPanel();
         pane1a.setLayout(new BoxLayout(pane1a, BoxLayout.X_AXIS));
-        pane1a.add(new JLabel(java.util.ResourceBundle.getBundle("jmri/jmrit/symbolicprog/SymbolicProgBundle").getString("DecoderInstalled")));
+        pane1a.add(new JLabel(java.util.ResourceBundle.getBundle("jmri/jmrit/symbolicprog/SymbolicProgBundle").getString("LabelDecoderInstalled")));
         JButton iddecoder = new JButton(java.util.ResourceBundle.getBundle("jmri/jmrit/symbolicprog/SymbolicProgBundle").getString("IdentifyDecoder"));
         iddecoder.addActionListener(new ActionListener() {
             @Override

java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle.properties

@@ -281,3 +281,6 @@ FactoryResetOpsWarn4 = (The manufacturer may specify an alternate address to use
 FactoryResetOpsWarn5 = The reset will most likely change the loco address, usually (but not always) to short address 3.
 FactoryResetOpsWarn6 = Before doing further Programming On Main, change the Roster Entry to the after-reset address on the Basic sheet, save, close and reopen.
 FactoryResetOpsWarn7 = Was the Roster Entry set to the current loco address when opened? Do you wish to continue with Reset on Main?
+
+NewLocoProgTrack = New locomotive on programming track
+IdentifyDecoder = Identify Decoder

java/test/jmri/jmrit/PackageTest.java

@@ -49,8 +49,8 @@ public static Test suite() {
         suite.addTest(new JUnit4TestAdapter(jmri.jmrit.mastbuilder.MastBuilderTest.class));
         suite.addTest(jmri.jmrit.powerpanel.PackageTest.suite());
         suite.addTest(jmri.jmrit.roster.PackageTest.suite());
-        suite.addTest(new JUnit4TestAdapter(jmri.jmrit.sendpacket.SendPacketTest.class));
-        suite.addTest(new JUnit4TestAdapter(jmri.jmrit.sensorgroup.SensorGroupTest.class));
+        suite.addTest(new JUnit4TestAdapter(jmri.jmrit.sendpacket.PackageTest.class));
+        suite.addTest(new JUnit4TestAdapter(jmri.jmrit.sensorgroup.PackageTest.class));
         suite.addTest(jmri.jmrit.simpleclock.PackageTest.suite());
         suite.addTest(jmri.jmrit.symbolicprog.PackageTest.suite());
         suite.addTest(jmri.jmrit.tracker.PackageTest.suite());

java/test/jmri/jmrit/revhistory/PackageTest.java

@@ -9,7 +9,8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
    FileHistoryTest.class,
-   jmri.jmrit.revhistory.configurexml.PackageTest.class
+   jmri.jmrit.revhistory.configurexml.PackageTest.class,
+   jmri.jmrit.revhistory.swing.PackageTest.class
 })
 /**
  * Tests for the jmri.jmrit.revhistory package.

java/test/jmri/jmrit/revhistory/swing/FileHistoryActionTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.revhistory.swing;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class FileHistoryActionTest {
+
+    @Test
+    public void testCTor() {
+        FileHistoryAction t = new FileHistoryAction();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(FileHistoryActionTest.class.getName());
+
+}

java/test/jmri/jmrit/revhistory/swing/PackageTest.java

@@ -0,0 +1,19 @@
+package jmri.jmrit.revhistory.swing;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    FileHistoryActionTest.class
+})
+/**
+ * Tests for the jmri.jmrit.revhistory.swing package
+ *
+ * @author      Paul Bender Copyright (C) 2017
+ */
+public class PackageTest {
+
+
+}

java/test/jmri/jmrit/roster/LocoFileTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class LocoFileTest {
+
+    @Test
+    public void testCTor() {
+        LocoFile t = new LocoFile();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(LocoFileTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/PackageTest.java

@@ -35,7 +35,14 @@ public static Test suite() {
         suite.addTest(new JUnit4TestAdapter(FunctionLabelPaneTest.class));
         suite.addTest(IdentifyLocoTest.suite());
         suite.addTest(jmri.jmrit.roster.swing.PackageTest.suite());
-
+        suite.addTest(new JUnit4TestAdapter(LocoFileTest.class));
+        suite.addTest(new JUnit4TestAdapter(RecreateRosterActionTest.class));
+        suite.addTest(new JUnit4TestAdapter(RosterConfigManagerTest.class));
+        suite.addTest(new JUnit4TestAdapter(RosterConfigPaneTest.class));
+        suite.addTest(new JUnit4TestAdapter(RosterIconFactoryTest.class));
+        suite.addTest(new JUnit4TestAdapter(RosterMediaPaneTest.class));
+        suite.addTest(new JUnit4TestAdapter(RosterRecorderTest.class));
+        suite.addTest(new JUnit4TestAdapter(jmri.jmrit.roster.rostergroup.PackageTest.class));
         return suite;
     }
 

java/test/jmri/jmrit/roster/RecreateRosterActionTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RecreateRosterActionTest {
+
+    @Test
+    public void testCTor() {
+        RecreateRosterAction t = new RecreateRosterAction();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RecreateRosterActionTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/RosterConfigManagerTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RosterConfigManagerTest {
+
+    @Test
+    public void testCTor() {
+        RosterConfigManager t = new RosterConfigManager();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RosterConfigManagerTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/RosterConfigPaneTest.java

@@ -0,0 +1,39 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RosterConfigPaneTest {
+
+    @Test
+    public void testCTor() {
+        RosterConfigPane t = new RosterConfigPane();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+        jmri.InstanceManager.setDefault(RosterConfigManager.class,new RosterConfigManager());
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RosterConfigPaneTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/RosterIconFactoryTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RosterIconFactoryTest {
+
+    @Test
+    public void testCTor() {
+        RosterIconFactory t = new RosterIconFactory();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RosterIconFactoryTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/RosterMediaPaneTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RosterMediaPaneTest {
+
+    @Test
+    public void testCTor() {
+        RosterMediaPane t = new RosterMediaPane();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RosterMediaPaneTest.class.getName());
+
+}

java/test/jmri/jmrit/roster/RosterRecorderTest.java

@@ -0,0 +1,38 @@
+package jmri.jmrit.roster;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Paul Bender Copyright (C) 2017	
+ */
+public class RosterRecorderTest {
+
+    @Test
+    public void testCTor() {
+        RosterRecorder t = new RosterRecorder();
+        Assert.assertNotNull("exists",t);
+    }
+
+    // The minimal setup for log4J
+    @Before
+    public void setUp() {
+        apps.tests.Log4JFixture.setUp();
+        jmri.util.JUnitUtil.resetInstanceManager();
+    }
+
+    @After
+    public void tearDown() {
+        jmri.util.JUnitUtil.resetInstanceManager();
+        apps.tests.Log4JFixture.tearDown();
+    }
+
+    private final static Logger log = LoggerFactory.getLogger(RosterRecorderTest.class.getName());
+
+}