New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MERG CBUS Event Table Updates #5753

Merged
merged 5 commits into from Sep 6, 2018

Conversation

Projects
None yet
2 participants
@icklesteve
Contributor

icklesteve commented Sep 5, 2018

Remove duplicate CANID check
Total events In Session Session Column
Total events Out Session Column
Checks moved to hashmaps
Improved table logging
Row filtering + feedback highlighting
Feedback Columns
Import MERG FCU XML file of event names
Cell background colours

icklesteve added some commits Sep 5, 2018

Opscodes
Minor fix
Moved more constants to hashset
CBUS Event Table Main Update
Remove duplicate CANID check
Total events In Session Session Column
Total events Out Session Column
Checks moved to hashmaps
Improved table logging
Row filtering + feedback highlighting
Feedback Columns
Import XML file of event names
Cell background colours

@icklesteve icklesteve changed the title from MERG CBUS Event Table Updates to WIP MERG CBUS Event Table Updates Sep 5, 2018

@icklesteve icklesteve changed the title from WIP MERG CBUS Event Table Updates to MERG CBUS Event Table Updates Sep 5, 2018

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Sep 5, 2018

Member

Travis CI failed with

[ERROR]   LayoutEditorToolsTest.testSetSignalHeadOnPanelAtXYDoubleAndRemove:233 » TimeoutExpired

(This has perhaps been addressed in #5752)

Member

bobjacobsen commented Sep 5, 2018

Travis CI failed with

[ERROR]   LayoutEditorToolsTest.testSetSignalHeadOnPanelAtXYDoubleAndRemove:233 » TimeoutExpired

(This has perhaps been addressed in #5752)

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Sep 5, 2018

Member

AppVeyor restarted after

3078    [junit] Testcase: testLaunchTmcc(apps.DecoderPro.DecoderProTest):	FAILED
3079    [junit] "window up" did not occur in time
3080    [junit] junit.framework.AssertionFailedError: "window up" did not occur in time
3081    [junit] 	at jmri.util.JUnitUtil.waitFor(JUnitUtil.java:334)
3082    [junit] 	at apps.DecoderPro.DecoderProTest.testLaunchTmcc(DecoderProTest.java:123)
3083    [junit] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
3084    [junit] 	at java.lang.Thread.run(Thread.java:748)
Member

bobjacobsen commented Sep 5, 2018

AppVeyor restarted after

3078    [junit] Testcase: testLaunchTmcc(apps.DecoderPro.DecoderProTest):	FAILED
3079    [junit] "window up" did not occur in time
3080    [junit] junit.framework.AssertionFailedError: "window up" did not occur in time
3081    [junit] 	at jmri.util.JUnitUtil.waitFor(JUnitUtil.java:334)
3082    [junit] 	at apps.DecoderPro.DecoderProTest.testLaunchTmcc(DecoderProTest.java:123)
3083    [junit] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
3084    [junit] 	at java.lang.Thread.run(Thread.java:748)
@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Sep 6, 2018

Member

AppVeyor restart after:

3458    [junit] Testcase: jmri.jmrit.entryexit.SourceTest:	Caused an ERROR
3459    [junit] null
3460    [junit] java.util.ConcurrentModificationException
3461    [junit] 	at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:909)
3462    [junit] 	at java.util.ArrayList$Itr.next(ArrayList.java:859)
3463    [junit] 	at java.util.Collections$UnmodifiableCollection$1.next(Collections.java:1042)
3464    [junit] 	at jmri.jmrit.display.layoutEditor.LayoutBlockManager.initializeLayoutBlockPaths(LayoutBlockManager.java:284)
3465    [junit] 	at jmri.jmrit.entryexit.EntryExitTestTools.getPanels(EntryExitTestTools.java:41)
3466    [junit] 	at jmri.jmrit.entryexit.SourceTest.setUp(SourceTest.java:113)

Fix is in #5756

Member

bobjacobsen commented Sep 6, 2018

AppVeyor restart after:

3458    [junit] Testcase: jmri.jmrit.entryexit.SourceTest:	Caused an ERROR
3459    [junit] null
3460    [junit] java.util.ConcurrentModificationException
3461    [junit] 	at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:909)
3462    [junit] 	at java.util.ArrayList$Itr.next(ArrayList.java:859)
3463    [junit] 	at java.util.Collections$UnmodifiableCollection$1.next(Collections.java:1042)
3464    [junit] 	at jmri.jmrit.display.layoutEditor.LayoutBlockManager.initializeLayoutBlockPaths(LayoutBlockManager.java:284)
3465    [junit] 	at jmri.jmrit.entryexit.EntryExitTestTools.getPanels(EntryExitTestTools.java:41)
3466    [junit] 	at jmri.jmrit.entryexit.SourceTest.setUp(SourceTest.java:113)

Fix is in #5756

@bobjacobsen bobjacobsen added this to the 4.13.3 milestone Sep 6, 2018

@bobjacobsen bobjacobsen merged commit 236d623 into JMRI:master Sep 6, 2018

4 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.06%) to 43.016%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment