Changeset 14338 in josm for trunk/test/unit/org
- Timestamp:
- 2018-10-16T00:32:46+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
r14120 r14338 8 8 import static org.junit.Assert.assertTrue; 9 9 10 import java.io.IOException; 10 11 import java.util.ArrayList; 11 12 import java.util.Arrays; … … 28 29 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; 29 30 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 31 import org.openstreetmap.josm.io.GpxReaderTest; 30 32 import org.openstreetmap.josm.testutils.JOSMTestRules; 31 33 import org.openstreetmap.josm.tools.ListenerList; 34 import org.xml.sax.SAXException; 32 35 33 36 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 55 58 data = new GpxData(); 56 59 } 57 58 60 59 61 /** … … 83 85 assertTrue(data.getWaypoints().contains(newWP)); 84 86 assertTrue(data.getWaypoints().contains(existingWP)); 87 } 88 89 /** 90 * Test method for {@link GpxData#mergeFrom(GpxData, boolean, boolean)} including cutting/connecting tracks using actual files. 91 * @throws Exception if the track cannot be parsed 92 */ 93 @Test 94 public void testMergeFromFiles() throws Exception { 95 testMerge(false, false, "Merged-all"); // regular merging 96 testMerge(true, false, "Merged-cut"); // cut overlapping tracks, but do not connect them 97 testMerge(true, true, "Merged-cut-connect"); // cut overlapping tracks and connect them 98 } 99 100 private static void testMerge(boolean cut, boolean connect, String exp) throws IOException, SAXException { 101 final GpxData own = getGpx("Layer1"); 102 final GpxData other = getGpx("Layer2"); 103 final GpxData expected = getGpx(exp); 104 own.mergeFrom(other, cut, connect); 105 assertEquals(expected, own); 106 } 107 108 private static GpxData getGpx(String file) throws IOException, SAXException { 109 return GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "mergelayers/" + file + ".gpx"); 85 110 } 86 111 … … 449 474 TestUtils.assumeWorkingEqualsVerifier(); 450 475 EqualsVerifier.forClass(GpxData.class).usingGetClass() 451 .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy" )476 .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans") 452 477 .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE)) 453 478 .withPrefabValues(ListenerList.class, ListenerList.create(), ListenerList.create())
Note:
See TracChangeset
for help on using the changeset viewer.