Changeset 14274 in josm for trunk

Timestamp:

2018-09-26T20:21:06+02:00 (6 years ago)

Author:

Don-vip

Message:

fix bug when writing a locked OSM layer

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmWriterTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -121 +121 @@
         }
         if (locked) {
-            out.print("' locked=true");
+            out.print("' locked='true");
         }
         out.println("' generator='JOSM'>");

trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java

@@ -16 +16 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.NodeData;
@@ -69 +70 @@
                 baos.toString("UTF-8").replaceAll("\r", "").replaceAll("\n", ""));
     }
+
+    /**
+     * Unit test of {@link OsmWriter#write} with dataset locked.
+     * @throws IOException if an I/O error occurs
+     */
+    @Test
+    public void testWriteLock() throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (PrintWriter out = new PrintWriter(new OutputStreamWriter(baos, StandardCharsets.UTF_8));
+             OsmWriter writer = OsmWriterFactory.createOsmWriter(out, true, OsmWriter.DEFAULT_API_VERSION)) {
+            DataSet ds = new DataSet();
+            ds.lock();
+            writer.write(ds);
+        }
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?><osm version='0.6' locked='true' generator='JOSM'></osm>",
+                baos.toString("UTF-8").replaceAll("\r", "").replaceAll("\n", ""));
+    }
 }