Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 15496) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 15497) @@ -480,5 +480,6 @@ EqualsVerifier.forClass(GpxData.class).usingGetClass() .suppress(Warning.NONFINAL_FIELDS) - .withIgnoredFields("creator", "fromServer", "storageFile", "initializing", "updating", "suppressedInvalidate", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans", "modified") + .withIgnoredFields("creator", "fromServer", "storageFile", "initializing", "updating", + "suppressedInvalidate", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans", "modified") .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE)) .withPrefabValues(ListenerList.class, ListenerList.create(), ListenerList.create()) Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 15496) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 15497) @@ -45,5 +45,6 @@ "Select all tracks that you want to be displayed. " + "You can drag select a range of tracks or use CTRL+Click to select specific ones. " + - "The map is updated live in the background. Open the URLs by double clicking them, edit name and description by double clicking the cell.", + "The map is updated live in the background. "+ + "Open the URLs by double clicking them, edit name and description by double clicking the cell.", "Show all" ); Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 15496) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 15497) @@ -141,10 +141,12 @@ List ways = osm.getWays().stream() - .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString()) + .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream() + .sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString()) .sorted() .collect(Collectors.toList()); List waysExpected = osmExpected.getWays().stream() - .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString()) + .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream() + .sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString()) .sorted() .collect(Collectors.toList()); @@ -152,5 +154,6 @@ assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", waysExpected, ways); - assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", osmExpected.allPrimitives().size(), osm.allPrimitives().size()); + assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", osmExpected.allPrimitives().size(), + osm.allPrimitives().size()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 15496) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 15497) @@ -72,5 +72,6 @@ @Test public void testVelocity() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); + final List colors = calculateColors("data_nodist/2094047.gpx", + ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString()); } @@ -99,5 +100,6 @@ @Test public void testDirection() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10); + final List colors = calculateColors("data_nodist/2094047.gpx", + ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10); assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString()); } @@ -111,5 +113,6 @@ @Test public void testTime() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10); + final List colors = calculateColors("data_nodist/2094047.gpx", + ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10); assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString()); } Index: trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java (revision 15496) +++ trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java (revision 15497) @@ -103,7 +103,10 @@ public void testExtensions() throws IOException { GpxData data = new GpxData(); - data.getNamespaces().add(new XMLNamespace("test", "http://example.com/testURI")); //only namespace, no location printed - data.getNamespaces().add(new XMLNamespace("knownprefix", "http://example.com/URI", "http://example.com/location.xsd")); //printed - data.getNamespaces().add(new XMLNamespace("notpresent", "http://example.com/notpresent", "http://example.com/notpresent.xsd")); //NOT printed + // only namespace, no location printed + data.getNamespaces().add(new XMLNamespace("test", "http://example.com/testURI")); + // printed + data.getNamespaces().add(new XMLNamespace("knownprefix", "http://example.com/URI", "http://example.com/location.xsd")); + // NOT printed + data.getNamespaces().add(new XMLNamespace("notpresent", "http://example.com/notpresent", "http://example.com/notpresent.xsd")); GpxExtensionCollection exts = data.getExtensions(); @@ -128,4 +131,6 @@ GpxWriter writer = new GpxWriter(baos); + // CHECKSTYLE.OFF: LineLength + writer.write(data); assertEquals("\n" + @@ -275,4 +280,6 @@ "", baos.toString()); + // CHECKSTYLE.ON: LineLength + writer.close(); }