Changeset 17658 in josm

Timestamp:

2021-03-24T23:04:25+01:00 (3 years ago)

Author:

simon04

Message:

see #20233 - SessionWriterTest.testWriteGpxAndMarkerJoz

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/session/SessionWriter.java (modified) (2 diffs)
• test/data/sessions/gpx_markers.jos (added)
• test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -12 +12 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -271 +272 @@
         viewportEl.appendChild(scale);
         double dist100px = mapView.getDist100Pixel();
-        scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
+        scale.setAttribute("meter-per-pixel", String.format(Locale.ROOT, "%6f", dist100px / 100));
     }
 

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
@@ -9 +14 @@
 import java.util.List;
 import java.util.Map;
+import java.util.zip.ZipFile;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -35 +42 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Unit tests for Session writing.
@@ -99 +108 @@
     }
 
-    private void testWrite(List<Layer> layers, final boolean zip) throws IOException {
+    private byte[] testWrite(List<Layer> layers, final boolean zip) throws IOException {
         Map<Layer, SessionLayerExporter> exporters = new HashMap<>();
         if (zip) {
@@ -115 +124 @@
         try {
             sw.write(file);
+            if (!zip) {
+                return null;
+            }
+            try (ZipFile zipFile = new ZipFile(file);
+                 InputStream input = zipFile.getInputStream(zipFile.getEntry("session.jos"))) {
+                return Utils.readBytesFromStream(input);
+            }
         } finally {
             if (file.exists()) {
@@ -213 +229 @@
     void testWriteGpxAndMarkerJoz() throws IOException {
         GpxLayer gpx = createGpxLayer();
-        testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
+        byte[] bytes = testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
+        Path path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers.jos");
+        String expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        String actual = new String(bytes, StandardCharsets.UTF_8).replace("\r", "");
+        assertEquals(expected, actual);
     }