Changeset 7326 in josm for trunk/test

Timestamp:

2014-07-22T00:17:42+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10292 - allow to load a session with NMEA file + enhance reading/writing unit tests for sessions

Location:

trunk/test

Files:

• config/performance-josm.home (modified) (1 prop)
• data/sessions (added)
• data/sessions/data.gpx (added)
• data/sessions/data.nmea (added)
• data/sessions/data.osm (added)
• data/sessions/empty.jos (added)
• data/sessions/empty.joz (added)
• data/sessions/gpx.jos (added)
• data/sessions/gpx.joz (added)
• data/sessions/gpx_markers.joz (added)
• data/sessions/nmea.jos (added)
• data/sessions/osm.jos (added)
• data/sessions/osm.joz (added)
• unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (added)
• unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (5 diffs)

trunk/test/config/performance-josm.home

@@ -2 +2 @@
 preferences.xml_backup
 preferences.xml_tmp
+cache
+validator

@@ -2 +2 @@
 preferences.xml_backup
 preferences.xml_tmp
+cache
+validator

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -19 +21 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -106 +110 @@
 
     private OsmDataLayer createOsmLayer() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "OSM layer name", null);
         layer.setAssociatedFile(new File("data.osm"));
         return layer;
@@ -112 +116 @@
 
     private GpxLayer createGpxLayer() {
-        GpxLayer layer = new GpxLayer(new GpxData());
+        GpxData data = new GpxData();
+        data.waypoints.add(new WayPoint(new LatLon(42.72665, -0.00747)));
+        data.waypoints.add(new WayPoint(new LatLon(42.72659, -0.00749)));
+        GpxLayer layer = new GpxLayer(data, "GPX layer name");
         layer.setAssociatedFile(new File("data.gpx"));
         return layer;
+    }
+
+    private MarkerLayer createMarkerLayer(GpxLayer gpx) {
+        return new MarkerLayer(gpx.data, "Marker layer name", gpx.getAssociatedFile(), gpx);
     }
 
@@ -170 +181 @@
         testWrite(Collections.<Layer>singletonList(createGpxLayer()), true);
     }
+
+    /**
+     * Tests to write a .joz file containing GPX and marker data.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testWriteGpxAndMarkerJoz() throws IOException {
+        GpxLayer gpx = createGpxLayer();
+        testWrite(Pair.toArrayList(new Pair<Layer, Layer>(gpx, createMarkerLayer(gpx))), true);
+    }
 }

@@ -2 +2 @@
 preferences.xml_backup
 preferences.xml_tmp
+cache
+validator