Merge pull request #6880 from pabender/testcreation

test improvements

.classpath

@@ -132,7 +132,7 @@
 	<classpathentry kind="lib" path="lib/picocontainer-2.15.jar"/>
 	<classpathentry kind="lib" path="lib/tag-expressions-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/typetools-0.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/webdrivermanager-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/webdrivermanager-3.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/mqtt-client-0.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/jsplitbutton-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/thumbnailator-0.4.8.jar"/>

build.xml

@@ -285,7 +285,7 @@
         <pathelement location="${libdir}/typetools-0.5.0.jar"/>
         <!-- Selenium and it's dependencies -->
         <pathelement location="${libdir}/selenium-server-standalone-3.6.0.jar"/>
-        <pathelement location="${libdir}/webdrivermanager-2.0.1.jar"/>
+        <pathelement location="${libdir}/webdrivermanager-3.4.0.jar"/>
         <!-- Spring Mock and it's dependencies -->
         <pathelement location="${libdir}/spring-test-5.1.3.RELEASE.jar"/>
         <pathelement location="${libdir}/spring-core-5.1.3.RELEASE.jar"/>

java/test/apps/AppsTest.java

@@ -2,12 +2,7 @@
 
 import java.awt.GraphicsEnvironment;
 import jmri.util.JUnitUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  *
@@ -16,7 +11,7 @@
 public class AppsTest {
 
     @Test
-    @Ignore("Causes Exception")
+    @Ignore("Test emits an (unknown) error message on Appveyor")
     public void testCTor() {
         Assume.assumeFalse(GraphicsEnvironment.isHeadless());
         Apps t = new Apps();

java/test/apps/InstallTest/InstallTestTest.java

@@ -2,12 +2,7 @@
 
 import java.awt.GraphicsEnvironment;
 import jmri.util.JUnitUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  *
@@ -16,7 +11,7 @@
 public class InstallTestTest {
 
     @Test
-    @Ignore("Causes Exception")
+    @Ignore("gives error message about an invalid profile on Travis")
     public void testCTor() {
         Assume.assumeFalse(GraphicsEnvironment.isHeadless());
         InstallTest t = new InstallTest();

java/test/apps/ManagerDefaultsConfigPaneTest.java

@@ -1,11 +1,7 @@
 package apps;
 
 import jmri.util.JUnitUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  *

java/test/apps/SystemConsoleConfigPanelTest.java

@@ -1,11 +1,7 @@
 package apps;
 
 import jmri.util.JUnitUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  *
@@ -14,7 +10,6 @@
 public class SystemConsoleConfigPanelTest {
 
     @Test
-    @Ignore("Needs more setup")
     public void testCTor() {
         SystemConsoleConfigPanel t = new SystemConsoleConfigPanel();
         Assert.assertNotNull("exists",t);
@@ -24,6 +19,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        jmri.InstanceManager.setDefault(apps.systemconsole.SystemConsolePreferencesManager.class,new apps.systemconsole.SystemConsolePreferencesManager());
     }
 
     @After

nbproject/project.xml

@@ -251,7 +251,7 @@
             <compilation-unit>
                 <package-root>java/test</package-root>
                 <unit-tests/>
-                <classpath mode="compile">java/tmp:target/classes:lib/junit-4.12.jar:lib/hamcrest-core-1.3.jar:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/javacsv.jar:lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.1.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/jython-standalone-2.7.0.jar:lib/log4j-1.2.17.jar:lib/mailapi.jar:lib/purejavacomm-1.0.1.jar:lib/servlet.jar:lib/vecmath-1.5.2.jar:lib/annotations.jar:lib/jsr305.jar:lib/i18nchecker.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/pi4j-core.jar:lib/pi4j-device.jar:lib/pi4j-gpio-extension.jar:lib/pi4j-service.jar:lib/commons-lang3-3.7.jar:lib/jackson-databind-2.9.8.jar:lib/websocket-api-9.4.7.v20170914.jar:lib/javax.servlet-api-3.1.0.jar:lib/xbjlib-1.1.1.jar:lib/mockito-core-2.13.0.jar:lib/jemmy-22-00c9f753cd0a.jar:lib/jetty-util-9.4.7.v20170914.jar:lib/xbee-java-library-1.2.0.jar:lib/org-openide-util-lookup-RELEASE82.jar:lib/commons-io-2.6.jar:lib/usb-api-1.0.2.jar:lib/cucumber-core-2.0.1.jar:lib/cucumber-java-2.0.1.jar:lib/cucumber-java8-2.0.1.jar:lib/cucumber-junit-2.0.1.jar:lib/cucumber-jvm-deps-1.0.6.jar:lib/cucumber-picocontainer-2.0.1.jar:lib/gherkin-4.1.3.jar:lib/gherkin-jvm-deps-1.0.4.jar:lib/picocontainer-2.15.jar:lib/tag-expressions-1.0.1.jar:lib/typetools-0.5.0.jar:lib/webdrivermanager-2.0.1.jar:lib/json-schema-validator-1.0.4.jar:lib/selenium-server-standalone-3.6.0.jar:lib/spring-test-5.1.3.RELEASE.jar</classpath>
+                <classpath mode="compile">java/tmp:target/classes:lib/junit-4.12.jar:lib/hamcrest-core-1.3.jar:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/javacsv.jar:lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.1.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/jython-standalone-2.7.0.jar:lib/log4j-1.2.17.jar:lib/mailapi.jar:lib/purejavacomm-1.0.1.jar:lib/servlet.jar:lib/vecmath-1.5.2.jar:lib/annotations.jar:lib/jsr305.jar:lib/i18nchecker.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/pi4j-core.jar:lib/pi4j-device.jar:lib/pi4j-gpio-extension.jar:lib/pi4j-service.jar:lib/commons-lang3-3.7.jar:lib/jackson-databind-2.9.8.jar:lib/websocket-api-9.4.7.v20170914.jar:lib/javax.servlet-api-3.1.0.jar:lib/xbjlib-1.1.1.jar:lib/mockito-core-2.13.0.jar:lib/jemmy-22-00c9f753cd0a.jar:lib/jetty-util-9.4.7.v20170914.jar:lib/xbee-java-library-1.2.0.jar:lib/org-openide-util-lookup-RELEASE82.jar:lib/commons-io-2.6.jar:lib/usb-api-1.0.2.jar:lib/cucumber-core-2.0.1.jar:lib/cucumber-java-2.0.1.jar:lib/cucumber-java8-2.0.1.jar:lib/cucumber-junit-2.0.1.jar:lib/cucumber-jvm-deps-1.0.6.jar:lib/cucumber-picocontainer-2.0.1.jar:lib/gherkin-4.1.3.jar:lib/gherkin-jvm-deps-1.0.4.jar:lib/picocontainer-2.15.jar:lib/tag-expressions-1.0.1.jar:lib/typetools-0.5.0.jar:lib/webdrivermanager-3.4.0.jar:lib/json-schema-validator-1.0.4.jar:lib/selenium-server-standalone-3.6.0.jar:lib/spring-test-5.1.3.RELEASE.jar</classpath>
                 <built-to>target/classes</built-to>
                 <source-level>1.8</source-level>
             </compilation-unit>
@@ -263,7 +263,7 @@
             <compilation-unit>
                 <package-root>java/acceptancetest/step_definitions</package-root>
                 <unit-tests/>
-                <classpath mode="compile">target/classes:lib/webdrivermanager-2.0.1.jar:lib/junit-4.12.jar:lib/cucumber-java8-2.0.1.jar:lib/selenium-server-standalone-3.6.0.jar:lib/slf4j-api-1.7.25.jar</classpath>
+                <classpath mode="compile">target/classes:lib/webdrivermanager-3.4.0.jar:lib/junit-4.12.jar:lib/cucumber-java8-2.0.1.jar:lib/selenium-server-standalone-3.6.0.jar:lib/slf4j-api-1.7.25.jar</classpath>
                 <source-level>1.8</source-level>
             </compilation-unit>
         </java-data>

pom.xml

@@ -814,7 +814,7 @@
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
-            <version>2.0.1</version>
+            <version>3.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>