Changeset 18466 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2022-06-06T19:07:05+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #21813: Improve marker handling in sessions and #21923: Improve session workflow/Add "save session" (patch by Bjoeni)

• Allow saving a previously saved session
• Add "File" -> "Save Session"
• Add shortcuts for saving sessions
• Add warning if a layer in a session is being removed when saving over the session
• Improve GPX marker handling

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/SessionSaveActionTest.java (added)
• actions/SessionSaveAsActionTest.java (modified) (2 diffs)
• io/session/SessionWriterTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/SessionSaveAsActionTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -20 +20 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().main();
 
     /**

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

@@ -51 +51 @@
  * Unit tests for Session writing.
  */
-class SessionWriterTest {
+public class SessionWriterTest {
 
     protected static final class OsmHeadlessJosExporter extends OsmDataSessionExporter {
@@ -123 +123 @@
         for (final Layer l : layers) {
             SessionLayerExporter s = SessionWriter.getSessionLayerExporter(l);
+            s.getExportPanel();
             exporters.put(l, s);
             if (s instanceof GpxTracksSessionExporter) {
@@ -154 +155 @@
     }
 
-    private OsmDataLayer createOsmLayer() {
+    /**
+     * Creates an OSM layer
+     * @return OSM layer
+     * @since 18466
+     */
+    public static OsmDataLayer createOsmLayer() {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "OSM layer name", null);
         layer.setAssociatedFile(new File("data.osm"));
@@ -160 +166 @@
     }
 
-    private GpxLayer createGpxLayer() {
+    /**
+     * Creates a GPX layer
+     * @return GPX layer
+     * @since 18466
+     */
+    public static GpxLayer createGpxLayer() {
         GpxData data = new GpxData();
         WayPoint wp = new WayPoint(new LatLon(42.72665, -0.00747));
@@ -171 +182 @@
     }
 
-    private MarkerLayer createMarkerLayer(GpxLayer gpx) {
+    /**
+     * Creates a MarkerLayer
+     * @param gpx linked GPX layer
+     * @return MarkerLayer
+     * @since 18466
+     */
+    public static MarkerLayer createMarkerLayer(GpxLayer gpx) {
         MarkerLayer layer = new MarkerLayer(gpx.data, "Marker layer name", gpx.getAssociatedFile(), gpx);
         layer.setOpacity(0.5);
         layer.setColor(new Color(0x12345678, true));
+        gpx.setLinkedMarkerLayer(layer);
         return layer;
     }
 
-    private ImageryLayer createImageryLayer() {
+    /**
+     * Creates an ImageryLayer
+     * @return ImageryLayer
+     * @since 18466
+     */
+    public static ImageryLayer createImageryLayer() {
         TMSLayer layer = new TMSLayer(new ImageryInfo("the name", "http://www.url.com/"));
         layer.getDisplaySettings().setOffsetBookmark(
@@ -185 +208 @@
     }
 
-    private NoteLayer createNoteLayer() {
+    /**
+     * Creates a NoteLayer
+     * @return NoteLayer
+     * @since 18466
+     */
+    public static NoteLayer createNoteLayer() {
         return new NoteLayer(Arrays.asList(new Note(LatLon.ZERO)), "layer name");
     }
@@ -250 +278 @@
     void testWriteGpxAndMarkerJoz() throws IOException {
         GpxLayer gpx = createGpxLayer();
-        Map<String, byte[]> bytes = testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
-
-        Path path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers.jos");
+        MarkerLayer markers = createMarkerLayer(gpx);
+        Map<String, byte[]> bytes = testWrite(Arrays.asList(gpx, markers), true);
+
+        Path path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers_combined.jos");
         String expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
         String actual = new String(bytes.get("session.jos"), StandardCharsets.UTF_8).replace("\r", "");
@@ -262 +291 @@
         assertEquals(expected, actual);
 
+        //Test writing when the marker layer has no corresponding GPX layer:
+        gpx.setLinkedMarkerLayer(null);
+        markers.fromLayer = null;
+        markers.data.transferLayerPrefs(gpx.data.getLayerPrefs());
+        bytes = testWrite(Arrays.asList(gpx, markers), true);
+
+        path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers.jos");
+        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        actual = new String(bytes.get("session.jos"), StandardCharsets.UTF_8).replace("\r", "");
+        assertEquals(expected, actual);
+
+        path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/data_export.gpx");
+        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        actual = new String(bytes.get("layers/01/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
+        assertEquals(expected, actual);
+
         path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/markers.gpx");
         expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
         actual = new String(bytes.get("layers/02/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
+
     }