Skip to content
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

Add jmri.display load&store tests #7539

Merged
merged 2 commits into from Oct 30, 2019

Conversation

bobjacobsen
Copy link
Member

See Issue #7528 and PR #7537

Although we had XML files in the test tree that contained Portal elements, they were only being verified. There was no load-store-compare test.

This PR provides that by adding a LoadAndStore implementation to jmri.jmrit.display, along with load/ and loadref/ directories for two test files.

This was branched from v4.17.3, to be earlier than the recent portal changes: It's meant to catch anything those broke. By itself it passes all tests, but it might highlight problems in a merge. We'll see what CI does.

@bobjacobsen bobjacobsen self-assigned this Oct 23, 2019
@bobjacobsen
Copy link
Member Author

The changes in Portal load/store since 4.17.4 are being tagged as errors by this PR:

[ERROR] Failures: 
1261[ERROR] jmri.jmrit.display.LoadAndStoreTest.loadLoadStoreFileCheck[java/test/jmri/jmrit/display/load/PanelEditorTest1.xml (pass=true)](jmri.jmrit.display.LoadAndStoreTest)
1262[ERROR]   Run 1: LoadAndStoreTest>LoadAndStoreTestBase.loadLoadStoreFileCheck:293->LoadAndStoreTestBase.checkFile:212 expected:<  <signalmast[s class="jmri.managers.configurexml.DefaultSignalMastManagerXml" /]>> but was:<  <signalmast[logics class="jmri.managers.configurexml.DefaultSignalMastLogicManagerXml"]>>
1263[ERROR]   Run 2: LoadAndStoreTest>LoadAndStoreTestBase.tearDown:312 Unexpected ERROR or higher messages emitted:          to file2:"/home/travis/build/JMRI/JMRI/temp/temp/PanelEditorTest1.xml"
1264[INFO] 
1265[ERROR] jmri.jmrit.display.LoadAndStoreTest.loadLoadStoreFileCheck[java/test/jmri/jmrit/display/load/PortalCheck.xml (pass=true)](jmri.jmrit.display.LoadAndStoreTest)
1266[ERROR]   Run 1: LoadAndStoreTest>LoadAndStoreTestBase.loadLoadStoreFileCheck:293->LoadAndStoreTestBase.checkFile:212 expected:<  <[signalgroups class="jmri.managers.configurexml.DefaultSignalGroupManagerXml" /]>> but was:<  <[oblocks class="jmri.jmrit.logix.configurexml.OBlockManagerXml"]>>
1267[ERROR]   Run 2: LoadAndStoreTest>LoadAndStoreTestBase.tearDown:312 Unexpected ERROR or higher messages emitted:          to file2:"/home/travis/build/JMRI/JMRI/temp/temp/PortalCheck.xml"

@bobjacobsen bobjacobsen mentioned this pull request Oct 29, 2019
@bobjacobsen bobjacobsen merged commit 74a8820 into JMRI:master Oct 30, 2019
@bobjacobsen bobjacobsen deleted the jmrit-display-load-tests branch October 30, 2019 05:58
@bobjacobsen
Copy link
Member Author

These changes were merged as part of #7552

@bobjacobsen bobjacobsen added this to the 4.17.5 milestone Nov 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant