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

New USB library. #3679

Merged
merged 7 commits into from Jul 15, 2017

Conversation

Projects
None yet
2 participants
@rhwood
Contributor

rhwood commented Jun 25, 2017

Replace the existing USB library with usb4java and implement a USB browser. This addresses #1473.

rhwood added some commits Jun 23, 2017

Initial update to JMRI USB handling. This update migrates from using …
…libusbJava to usb4java with JMRI specific code using the javax.usb (JSR 80) API so that any underlying JSR 80 implementation can be used if usb4java is found wanting.
Merge branch 'master' of https://github.com/JMRI/JMRI
* 'master' of https://github.com/JMRI/JMRI:
  Test for Java 9 on macOS correctly
  Ignore the ProcessSerialNumber argument
  use correct path
  new tests
  don't send function momentary/continuous related requests to the Roco Z21.
  Add route id
  Show route ids in train build report
  Ensure a Profile is in place for tests
  Log debugging statements to a log file
  Improve GUI with regards to route status changes
  Fix bug causing Z21 throttles to not work reliably. Format monitor strings using bundle messages (before we get a large number of them to translate).
  Don't allow user to edit route for a built train
  Fix Single CV Programmer error with LocoNet Simulator.
  several small Z21 improvements.
  fix spelling error in comment.
  make sure serial number, software version, and hardware version display correctly in the configuration tool.
  translate keys into proper names instead of using the keys for labels.
Merge branch 'master' of https://github.com/JMRI/JMRI
* 'master' of https://github.com/JMRI/JMRI:
  Reuse code from build.xml
  Specify files to compile in java-compile macro

@rhwood rhwood added this to the 4.9.1 milestone Jun 25, 2017

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Jun 25, 2017

Member

Travis headless failed with:

[INFO] Running jmri.configurexml.LoadAndStoreTest
ERROR - match failed in testLoadStoreCurrent line 25 [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -    inLine = "      <systemName>ISCLOCKRUNNING</systemName>" [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -   outLine = "      <systemName>IS2</systemName>" [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -      comparing "LoadFileTest.xml" and "LoadFileTest.xml" [main] jmri.configurexml.LoadAndStoreTest.?()
[ERROR] Tests run: 22, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 7.276 s <<< FAILURE! - in jmri.configurexml.LoadAndStoreTest
[ERROR] loadLoadStoreFileCheck[java/test/jmri/configurexml/load/LoadFileTest.xml (pass=true)](jmri.configurexml.LoadAndStoreTest)  Time elapsed: 0.385 s  <<< FAILURE!
org.junit.ComparisonFailure: expected:<      <systemName>IS[CLOCKRUNNING]</systemName>> but was:<      <systemName>IS[2]</systemName>>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at jmri.configurexml.LoadAndStoreTestBase.checkFile(LoadAndStoreTestBase.java:139)
	at jmri.configurexml.LoadAndStoreTestBase.loadLoadStoreFileCheck(LoadAndStoreTestBase.java:180)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

It's unexpected that only one of the LoadAndStore tests would fail, so this is a bit of a mystery. Restarted.

Member

bobjacobsen commented Jun 25, 2017

Travis headless failed with:

[INFO] Running jmri.configurexml.LoadAndStoreTest
ERROR - match failed in testLoadStoreCurrent line 25 [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -    inLine = "      <systemName>ISCLOCKRUNNING</systemName>" [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -   outLine = "      <systemName>IS2</systemName>" [main] jmri.configurexml.LoadAndStoreTest.?()
ERROR -      comparing "LoadFileTest.xml" and "LoadFileTest.xml" [main] jmri.configurexml.LoadAndStoreTest.?()
[ERROR] Tests run: 22, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 7.276 s <<< FAILURE! - in jmri.configurexml.LoadAndStoreTest
[ERROR] loadLoadStoreFileCheck[java/test/jmri/configurexml/load/LoadFileTest.xml (pass=true)](jmri.configurexml.LoadAndStoreTest)  Time elapsed: 0.385 s  <<< FAILURE!
org.junit.ComparisonFailure: expected:<      <systemName>IS[CLOCKRUNNING]</systemName>> but was:<      <systemName>IS[2]</systemName>>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at jmri.configurexml.LoadAndStoreTestBase.checkFile(LoadAndStoreTestBase.java:139)
	at jmri.configurexml.LoadAndStoreTestBase.loadLoadStoreFileCheck(LoadAndStoreTestBase.java:180)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

It's unexpected that only one of the LoadAndStore tests would fail, so this is a bit of a mystery. Restarted.

rhwood added some commits Jul 15, 2017

Merge branch 'master' of https://github.com/JMRI/JMRI
* 'master' of https://github.com/JMRI/JMRI: (291 commits)
  DCC4PC - Child Board
  Fix DCC4PC Multiboard issue
  Ecos loco Description
  ECOS delete Object
  ECOS - Reorder Manager Preferences
  new test
  new tests
  new tests
  new tests
  4.7.8
  new constructor tests
  new test
  missed graphics check
  new test
  correct spelling error
  new constructor tests
  new constructor tests
  fix findbugs (use short-circuit logic)
  new constructor tests
  jmrix.ecos i18n complete using Bundles, Javadoc styling, code spacing catch npe when no ECoS connected (ECoS Info and Add Loco tools) consistent spelling of ECoS move shared items to jmrix and NNBundle, share with BeanTable add jmrix.sprog Javadoc param description add missing Ecos LocoTable help page
  ...

# Conflicts:
#	scripts/WinInstallFiles/InstallJMRI.nsi

@rhwood rhwood merged commit f639a58 into JMRI:master Jul 15, 2017

1 check passed

VersionEye All software dependencies are fine. You are awesome!
Details

rhwood added a commit to JMRI/website that referenced this pull request Jul 15, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment