Skip to content
Permalink
Browse files

update user profiles used in test, increase TASTMAXTIME,

remove unused files in profiles
  • Loading branch information...
silverailscolo committed Jun 1, 2019
1 parent c5e186e commit 4e36ef298befb999b1e3e113bee17d8dbbc3f357
Showing with 395 additions and 221 deletions.
  1. +26 −9 java/test/apps/DecoderPro/DecoderProTest.java
  2. +16 −4 java/test/apps/DispatcherPro/DispatcherProTest.java
  3. +8 −8 java/test/apps/LaunchJmriAppBase.java
  4. +12 −4 java/test/apps/PanelPro/PanelProTest.java
  5. +14 −12 java/test/apps/PanelPro/profiles/EasyDcc_Simulator/profile/profile.properties
  6. +6 −3 java/test/apps/PanelPro/profiles/EasyDcc_Simulator/profile/profile.xml
  7. +1 −1 ...ofile/474e81b0-593b-11e8-8000-406c8f33a40d → EasyDcc_Simulator/profile/subdir}/profile.properties
  8. +13 −0 java/test/apps/PanelPro/profiles/EasyDcc_Simulator/profile/subdir/profile.xml
  9. +41 −0 java/test/apps/PanelPro/profiles/EasyDcc_Simulator/profile/subdir/user-interface.xml
  10. +10 −12 java/test/apps/PanelPro/profiles/Grapevine_Simulator/profile/profile.properties
  11. +4 −0 java/test/apps/PanelPro/profiles/Grapevine_Simulator/profile/subdir/profile.properties
  12. +20 −0 java/test/apps/PanelPro/profiles/Grapevine_Simulator/profile/subdir/profile.xml
  13. +41 −0 java/test/apps/PanelPro/profiles/Grapevine_Simulator/profile/subdir/user-interface.xml
  14. +4 −0 java/test/apps/PanelPro/profiles/LocoNet_Simulator/profile/subdir/profile.properties
  15. 0 ...ro/profiles/LocoNet_Simulator/profile/{474e81b0-593b-11e8-8000-406c8f33a40d → subdir}/profile.xml
  16. 0 ...iles/LocoNet_Simulator/profile/{474e81b0-593b-11e8-8000-406c8f33a40d → subdir}/user-interface.xml
  17. +0 −33 java/test/apps/PanelPro/profiles/LocoNet_Simulator/signal/WarrantPreferences.xml
  18. +0 −52 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/ProfileConfig.xml
  19. +0 −4 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/networkServices/JmriSRCPServerPreferences.xml
  20. +0 −4 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/networkServices/SimpleServer.xml
  21. +12 −8 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/profile/profile.properties
  22. +1 −1 ...iles/Prevent_Init_Loop/profile/{474e81b0-593b-11e8-8000-406c8f33a40d → subdir}/profile.properties
  23. 0 ...ro/profiles/Prevent_Init_Loop/profile/{474e81b0-593b-11e8-8000-406c8f33a40d → subdir}/profile.xml
  24. 0 ...iles/Prevent_Init_Loop/profile/{474e81b0-593b-11e8-8000-406c8f33a40d → subdir}/user-interface.xml
  25. +0 −9 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/roster/consist/consist.xml
  26. +0 −33 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/signal/WarrantPreferences.xml
  27. +0 −5 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/throttle/ThrottlesPreferences.xml
  28. +0 −4 java/test/apps/PanelPro/profiles/Prevent_Init_Loop/throttle/WiThrottlePreferences.xml
  29. +16 −5 java/test/apps/PanelPro/profiles/Sprog_Simulator/profile/profile.properties
  30. +4 −0 java/test/apps/PanelPro/profiles/Sprog_Simulator/profile/subdir/profile.properties
  31. +14 −0 java/test/apps/PanelPro/profiles/Sprog_Simulator/profile/subdir/profile.xml
  32. +41 −0 java/test/apps/PanelPro/profiles/Sprog_Simulator/profile/subdir/user-interface.xml
  33. +11 −7 java/test/apps/PanelPro/profiles/TMCC_Simulator/profile/profile.properties
  34. +4 −0 java/test/apps/PanelPro/profiles/TMCC_Simulator/profile/subdir/profile.properties
  35. +14 −0 java/test/apps/PanelPro/profiles/TMCC_Simulator/profile/subdir/profile.xml
  36. +41 −0 java/test/apps/PanelPro/profiles/TMCC_Simulator/profile/subdir/user-interface.xml
  37. +21 −3 java/test/apps/SoundPro/SoundProTest.java
@@ -6,13 +6,19 @@
import org.junit.Test;

/**
* This is more of an acceptance test than a unit test. It confirms that the entire
* application can start up and configure itself.
* This is more of an acceptance test than a unit test, loading a series
* of connection user profiles in DecoderPro.
* <p>
* It confirms that the entire application can start up and configure itself.
* <p>
* When format of user configuration (profile) files is changed, update the
* sets stored in java/test/apps/PanelPro/profiles/ to match.
* Also check the required TESTMAXTIME in {@link apps.LaunchJmriAppBase} to
* prevent timeouts on app startup tests if structure of data develops.
*
* @author Paul Bender Copyright (C) 2017
* @author Paul Bender Copyright (C) 2017, 2019
* @author Bob Jacobsen Copyright (C) 2017
*/

public class DecoderProTest extends apps.LaunchJmriAppBase {

protected void launch(String[] args) {
@@ -21,27 +27,38 @@ protected void launch(String[] args) {

@Test
public void testLaunchLocoNet() throws IOException {
runOne("LocoNet_Simulator", "DecoderPro", "DecoderPro version");
runOne("LocoNet_Simulator", "DecoderPro", "DecoderPro version"); // param 2 and 3 must match Console output
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnPowerManager LnTrackStatusUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnSensorUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnSensorUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
}
@Ignore ("test")

@Test
public void testLaunchEasyDcc() throws IOException {
runOne("EasyDcc_Simulator", "DecoderPro", "DecoderPro version");
}
@Ignore ("test")

@Test
public void testLaunchSprog() throws IOException {
runOne("Sprog_Simulator", "DecoderPro", "DecoderPro version");
}
@Ignore ("test")

@Test
public void testLaunchGrapevine() throws IOException {
runOne("Grapevine_Simulator", "DecoderPro", "DecoderPro version");
}

@Test
public void testLaunchTmcc() throws IOException {
runOne("TMCC_Simulator", "DecoderPro", "DecoderPro version");
}
@Ignore ("test")

@Test
public void testLaunchInitLoop() throws IOException {
runOne("Prevent_Init_Loop", "DecoderPro", "DecoderPro version");
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnPowerManager LnTrackStatusUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnSensorUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
jmri.util.JUnitAppender.suppressWarnMessage("passing to xmit: unexpected exception: [LnSensorUpdateThread] jmri.jmrix.loconet.LnPacketizer.sendLocoNetMessage()");
}

}
@@ -6,10 +6,17 @@
import org.junit.Test;

/**
* This is more of an acceptance test than a unit test. It confirms that the entire
* application can start up and configure itself.
* This is more of an acceptance test than a unit test, loading a series
* of connection user profiles in DispatcherPro.
* <p>
* It confirms that the entire application can start up and configure itself.
* <p>
* When format of user configuration (profile) files is changed, update the
* sets stored in java/test/apps/PanelPro/profiles/ to match.
* Also check the required TESTMAXTIME in {@link apps.LaunchJmriAppBase} to
* prevent timeouts on app startup tests if structure of data develops.
*
* @author Paul Bender Copyright (C) 2017
* @author Paul Bender Copyright (C) 2017, 2019
* @author Bob Jacobsen Copyright (C) 2017
*/
public class DispatcherProTest extends apps.LaunchJmriAppBase {
@@ -20,7 +27,7 @@ protected void launch(String[] args) {

@Test
public void testLaunchLocoNet() throws IOException {
runOne("LocoNet_Simulator", "DispatcherPro", "DispatcherPro version");
runOne("LocoNet_Simulator", "DispatcherPro", "DispatcherPro version"); // param 2 and 3 must match Console output
}

@Test
@@ -40,6 +47,11 @@ public void testLaunchTmcc() throws IOException {
runOne("TMCC_Simulator", "DispatcherPro", "DispatcherPro version");
}

@Test
public void testLaunchSprog() throws IOException {
runOne("Sprog_Simulator", "PanelPro", "PanelPro version");
}

@Test
public void testLaunchInitLoop() throws IOException {
runOne("Prevent_Init_Loop", "DispatcherPro", "DispatcherPro version");
@@ -32,7 +32,7 @@
abstract public class LaunchJmriAppBase {

static final int RELEASETIME = 3000; // mSec
static final int TESTMAXTIME = 25; // seconds - not too long, so job doesn't hang, but needs this time for setup
static final int TESTMAXTIME = 40; // seconds - not too long, so job doesn't hang, but needs this time for setup

@Rule
public TemporaryFolder folder = new TemporaryFolder();
@@ -46,16 +46,16 @@
/**
* Run one application.
*
* @param profileName Name of the Profile to copy from files in
* java/test/apps/PanelPro/profiles/
* @param frameName Application (frame) title
* @param startMessageStart Start of the "we're up!" message
* @param profileName Name of the Profile to copy from files in
* java/test/apps/PanelPro/profiles/
* @param frameName Application (frame) title
* @param startMessageStart Start of the "we're up!" message as seen in System Console
*/
protected void runOne(String profileName, String frameName, String startMessageStart) throws IOException {
Assume.assumeFalse(GraphicsEnvironment.isHeadless());

try {
JUnitUtil.resetInstanceManager();
// JUnitUtil.resetInstanceManager(); // reset between calls
// create a custom profile
folder.create();
File tempFolder = folder.newFolder();
@@ -70,11 +70,11 @@ protected void runOne(String profileName, String frameName, String startMessageS

JUnitUtil.waitFor(() -> {
return JmriJFrame.getFrame(frameName) != null;
}, "window up");
}, "the application window is up");

JUnitUtil.waitFor(() -> {
return JUnitAppender.checkForMessageStartingWith(startMessageStart) != null;
}, "first Info line seen");
}, "first Info line seen in Console after startup");

extraChecks();

@@ -9,10 +9,17 @@
import org.junit.Test;

/**
* This is more of an acceptance test than a unit test. It confirms that the entire
* application can start up and configure itself.
* This is more of an acceptance test than a unit test, loading a series
* of connection user profiles in PanelPro.
* <p>
* It confirms that the entire application can start up and configure itself.
* <p>
* When format of user configuration (profile) files is changed, update the
* sets in java/test/apps/PanelPro/profiles/ to match.
* Also check the required TESTMAXTIME in {@link apps.LaunchJmriAppBase} to
* prevent timeouts on app startup tests if structure of data develops.
*
* @author Paul Bender Copyright (C) 2017
* @author Paul Bender Copyright (C) 2017, 2019
* @author Bob Jacobsen Copyright (C) 2017
*/
public class PanelProTest extends apps.LaunchJmriAppBase {
@@ -27,7 +34,7 @@ protected void extraChecks() {

@Test
public void testLaunchLocoNet() throws IOException {
runOne("LocoNet_Simulator", "PanelPro", "PanelPro version");
runOne("LocoNet_Simulator", "PanelPro", "PanelPro version"); // param 2 and 3 must match Console output
}

@Test
@@ -56,4 +63,5 @@ public void testLaunchSprog() throws IOException {
public void testLaunchInitLoop() throws IOException {
runOne("Prevent_Init_Loop", "PanelPro", "PanelPro version");
}

}
@@ -1,27 +1,28 @@
#JMRI Preferences version 4.9.6ish+me+20171108T1748Z+Rebfe011413
#Wed Nov 08 18:49:34 CET 2017
#JMRI Preferences version 4.15.8ish+eb+20190601T1750Z+R4a42228136
#Sat Jun 01 19:56:37 CEST 2019
apps-gui.editorUseOldLocSize=false
apps-gui.fontSize=0
apps-gui.graphicTableState=true
apps-gui.graphicTableState=false
apps-gui.locale=en-US
apps-gui.lookAndFeel=com.apple.laf.AquaLookAndFeel
apps-gui.lookAndFeel=Mac OS X
apps-gui.nonstandardMouseEvent=false
apps-gui.showToolTipDismissDelay=4000
apps-gui.verticalToolBar=false
apps-systemconsole.fontFamily=Monospaced
apps-systemconsole.fontSize=12
apps-systemconsole.fontStyle=0
apps-systemconsole.scheme=7
apps-systemconsole.scheme=0
apps-systemconsole.wrapStyle=2
jmri-implementation.scripts=program\:jython/
jmri-implementation.user-files=profile\:
jmri-jmris-json.heartbeatInterval=15000
jmri-jmris-json.port=2056
jmri-jmris-json.validateClientMessages=false
jmri-jmris-json.validateServerMessages=false
jmri-jmris-simpleserver.port=2048
jmri-jmris-srcp.port=4303
jmri-jmrit-roster.defaultOwner=
jmri-jmrit-roster.directory=preference\:
jmri-jmrit-symbolicprog.canCacheDefault=false
jmri-jmrit-symbolicprog.defaultFile=Comprehensive
jmri-jmrit-symbolicprog.doConfirmRead=false
jmri-jmrit-symbolicprog.showCvNumbers=false
jmri-jmrit-symbolicprog.showEmptyPanes=true
@@ -35,20 +36,21 @@ jmri-managers.defaults.jmri-PowerManager=EasyDCC Simulator
jmri-managers.defaults.jmri-ThrottleManager=EasyDCC Simulator
jmri-web-server.allowRemoteConfig=false
jmri-web-server.clickDelay=1
jmri-web-server.disableFrames=false
jmri-web-server.disableFrames=true
jmri-web-server.disallowedFrames.0=DecoderPro
jmri-web-server.disallowedFrames.1=PanelPro
jmri-web-server.disallowedFrames.2=LocoNet Simulator
jmri-web-server.disallowedFrames.2=EasyDCC Simulator
jmri-web-server.disallowedFrames.3=Preferences
jmri-web-server.disallowedFrames.4=WiThrottle
jmri-web-server.disallowedFrames.5=Change Signal Head Icons
jmri-web-server.disallowedFrames.6=Item Palette
jmri-web-server.port=12080
jmri-web-server.railRoadName=Test Ops Entry
jmri-web-server.readonlyPower=false
jmri-web-server.railroadName=Test Ops Entry
jmri-web-server.readonlyPower=true
jmri-web-server.redirectFramesToPanels=true
jmri-web-server.refreshDelay=5
jmri-web-server.simple=false
jmri-web-server.useAjax=true
profile.id=EasyDcc_Simulator.3f033c2b
jmri-web-server.useZeroConf=true
profile.id=EasyDcc__Simulator.3f1121a3
profile.name=EasyDCC Simulator
@@ -2,9 +2,12 @@
<auxiliary-configuration xmlns="http://www.netbeans.org/ns/auxiliary-configuration/1">
<connections xmlns="http://jmri.org/xml/schema/auxiliary-configuration/connections-2-9-6.xsd">
<connection xmlns="" class="jmri.jmrix.easydcc.simulator.configurexml.ConnectionConfigXml" disabled="no" manufacturer="Easy DCC" port="(none selected)" speed="" systemPrefix="E" userName="EasyDCC Simulator">
<options/>
<options>
<option>
<name>SensorDefaultState</name>
<value>Unknown</value>
</option>
</options>
</connection>
</connections>
<startup xmlns="http://jmri.org/xml/schema/auxiliary-configuration/startup-4-3-5.xsd">
</startup>
</auxiliary-configuration>
@@ -1,4 +1,4 @@
#JMRI Preferences version 4.15.8ish+eb+20190601T1750Z+R4a42228136
#Sat Jun 01 19:56:37 CEST 2019
jmri-implementation.scripts=preference\:jython/
jmri-implementation.scripts=program\:jython/
jmri-implementation.user-files=profile\:
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<auxiliary-configuration xmlns="http://www.netbeans.org/ns/auxiliary-configuration/1">
<connections xmlns="http://jmri.org/xml/schema/auxiliary-configuration/connections-2-9-6.xsd">
<connection xmlns="" class="jmri.jmrix.easydcc.simulator.configurexml.ConnectionConfigXml" disabled="no" manufacturer="Easy DCC" port="(none selected)" speed="" systemPrefix="E" userName="EasyDCC Simulator">
<options>
<option>
<name>SensorDefaultState</name>
<value>Unknown</value>
</option>
</options>
</connection>
</connections>
</auxiliary-configuration>
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<auxiliary-configuration xmlns="http://www.netbeans.org/ns/auxiliary-configuration/1">
<classPreferences xmlns="http://jmri.org/xml/schema/auxiliary-configuration/class-preferences-4-3-5.xsd">
<preferences xmlns="" class="jmri.jmrit.beantable.SignalMastTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.LogixTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.TurnoutTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.LRouteTableAction"/>
<preferences xmlns="" class="jmri.managers.JmriUserPreferencesManager"/>
<preferences xmlns="" class="jmri.jmrit.beantable.SensorTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.SignalHeadTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.BlockTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.AudioTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.SignalGroupTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.LightTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.TransitTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.ReporterTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.RouteTableAction"/>
<preferences xmlns="" class="jmri.jmrit.beantable.MemoryTableAction"/>
</classPreferences>
<settings xmlns="http://jmri.org/xml/schema/auxiliary-configuration/settings-4-3-5.xsd">
<setting xmlns="">apps.gui3.dp3.DecoderPro3Window.hideGroups</setting>
</settings>
<tableDetails xmlns="http://jmri.org/xml/schema/auxiliary-configuration/table-details-4-3-5.xsd">
<table xmlns="" name="apps.gui3.dp3.DecoderPro3Window:DecoderPro:roster">
<columns/>
</table>
</tableDetails>
<windowDetails xmlns="http://jmri.org/xml/schema/auxiliary-configuration/window-details-4-3-5.xsd">
<window xmlns="" class="apps.gui3.dp3.DecoderPro3Window:DecoderPro" height="600.0" locX="683.0" locY="298.0" width="1024.0">
<properties>
<property>
<key>selectedProgrammer</key>
<value class="java.lang.String">service</value>
</property>
</properties>
</window>
<window xmlns="" class="apps.gui3.tabbedpreferences.TabbedPreferencesFrame:Preferences" height="461.0" locX="797.0" locY="404.0" width="900.0"/>
<window xmlns="" class="jmri.jmrit.roster.Roster"/>
<window xmlns="" class="Local JMRI throttles" height="222.0" locX="22.0" locY="24.0" width="320.0"/>
</windowDetails>
</auxiliary-configuration>
@@ -1,9 +1,10 @@
#JMRI Preferences version 4.11.4ish+eb+20180303T0747Z+R584d4fc769
#Sat Mar 03 10:54:51 CET 2018
#JMRI Preferences version 4.15.8ish+eb+20190601T1750Z+R4a42228136
#Sat Jun 01 19:56:37 CEST 2019
apps-gui.editorUseOldLocSize=false
apps-gui.fontSize=0
apps-gui.graphicTableState=true
apps-gui.locale=en
apps-gui.lookAndFeel=com.apple.laf.AquaLookAndFeel
apps-gui.graphicTableState=false
apps-gui.locale=en-US
apps-gui.lookAndFeel=Mac OS X
apps-gui.nonstandardMouseEvent=false
apps-gui.showToolTipDismissDelay=4000
apps-systemconsole.fontFamily=Monospaced
@@ -15,6 +16,8 @@ jmri-implementation.scripts=program\:jython/
jmri-implementation.user-files=profile\:
jmri-jmris-json.heartbeatInterval=15000
jmri-jmris-json.port=2056
jmri-jmris-json.validateClientMessages=false
jmri-jmris-json.validateServerMessages=false
jmri-jmris-simpleserver.port=2048
jmri-jmris-srcp.port=4303
jmri-jmrit-roster.defaultOwner=
@@ -36,17 +39,12 @@ jmri-web-server.clickDelay=1
jmri-web-server.disableFrames=true
jmri-web-server.disallowedFrames.0=DecoderPro
jmri-web-server.disallowedFrames.1=PanelPro
jmri-web-server.disallowedFrames.2=LocoNet Simulator
jmri-web-server.disallowedFrames.2=EasyDCC Simulator
jmri-web-server.disallowedFrames.3=Preferences
jmri-web-server.disallowedFrames.4=WiThrottle
jmri-web-server.disallowedFrames.5=Change Signal Head Icons
jmri-web-server.disallowedFrames.6=Item Palette
jmri-web-server.port=12080
jmri-web-server.railroadName=My JMRI Railroad
jmri-web-server.readonlyPower=true
jmri-web-server.redirectFramesToPanels=true
jmri-web-server.refreshDelay=5
jmri-web-server.simple=false
jmri-web-server.useAjax=true
jmri-web-server.railroadName=Test Ops Entry
profile.id=grapevinesim.3f339028
profile.name=grapevinesim
@@ -0,0 +1,4 @@
#JMRI Preferences version 4.15.8ish+eb+20190601T1750Z+R4a42228136
#Sat Jun 01 19:56:37 CEST 2019
jmri-implementation.scripts=program\:jython/
jmri-implementation.user-files=profile\:

0 comments on commit 4e36ef2

Please sign in to comment.
You can’t perform that action at this time.