Index: trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 13441)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 13485)
@@ -3,5 +3,9 @@
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,4 +14,6 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.NodeData;
 
@@ -37,3 +43,27 @@
         }, longIds);
     }
+
+    /**
+     * Unit test of {@link OsmWriter#header(DownloadPolicy, UploadPolicy)}.
+     * @throws IOException if an I/O error occurs
+     */
+    @Test
+    public void testHeader() throws IOException {
+        doTestHeader(null, null,
+                "<osm version='0.6' generator='JOSM'>");
+        doTestHeader(DownloadPolicy.NORMAL, UploadPolicy.NORMAL,
+                "<osm version='0.6' generator='JOSM'>");
+        doTestHeader(DownloadPolicy.BLOCKED, UploadPolicy.BLOCKED,
+                "<osm version='0.6' download='never' upload='never' generator='JOSM'>");
+    }
+
+    private static void doTestHeader(DownloadPolicy download, UploadPolicy upload, String expected) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (PrintWriter out = new PrintWriter(baos);
+             OsmWriter writer = OsmWriterFactory.createOsmWriter(out, true, OsmWriter.DEFAULT_API_VERSION)) {
+            writer.header(download, upload);
+        }
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?>" + expected,
+                baos.toString("UTF-8").replaceAll("\r", "").replaceAll("\n", ""));
+    }
 }