Changeset 9753 in josm

Timestamp:

2016-02-07T18:08:55+01:00 (8 years ago)

Author:

Don-vip

Message:

add unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/session/GenericSessionExporter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/io/SaveLayerInfoTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (3 diffs)

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

@@ -208 +208 @@
         } else {
             try {
-                file.appendChild(support.createTextNode(layer.getAssociatedFile().toURI().toURL().toString()));
+                File f = layer.getAssociatedFile();
+                if (f != null) {
+                    file.appendChild(support.createTextNode(f.toURI().toURL().toString()));
+                }
             } catch (MalformedURLException e) {
                 throw new IOException(e);

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java

@@ -77 +77 @@
     }
 
+    /**
+     * Unit test of {@link CorrelateGpxWithImages.Timezone#formatTimezone}.
+     */
     @Test
-    public void testFormatTimezone() throws Exception {
+    public void testFormatTimezone() {
         assertEquals("+1:00", new CorrelateGpxWithImages.Timezone(1).formatTimezone());
         assertEquals("+6:30", new CorrelateGpxWithImages.Timezone(6.5).formatTimezone());
@@ -86 +89 @@
     }
 
+    /**
+     * Unit test of {@link CorrelateGpxWithImages.Timezone#parseTimezone}.
+     * @throws ParseException in case of parsing error
+     */
     @Test
     public void testParseTimezone() throws ParseException {
@@ -94 +101 @@
     }
 
+    /**
+     * Unit test of {@link CorrelateGpxWithImages.Offset#formatOffset}.
+     */
     @Test
-    public void testFormatOffest() throws ParseException {
+    public void testFormatOffset() {
         assertEquals("0", CorrelateGpxWithImages.Offset.seconds(0).formatOffset());
         assertEquals("123", CorrelateGpxWithImages.Offset.seconds(123).formatOffset());
@@ -106 +116 @@
     }
 
+    /**
+     * Unit test of {@link CorrelateGpxWithImages.Offset#parseOffset}.
+     * @throws ParseException in case of parsing error
+     */
     @Test
     public void testParseOffest() throws ParseException {
@@ -117 +131 @@
     }
 
+    /**
+     * Unit test of {@link CorrelateGpxWithImages.Offset#splitOutTimezone}.
+     */
     @Test
-    public void testSplitOutTimezone() throws Exception {
+    public void testSplitOutTimezone() {
         assertEquals("+1:00", CorrelateGpxWithImages.Offset.seconds(3602).splitOutTimezone().a.formatTimezone());
         assertEquals("2", CorrelateGpxWithImages.Offset.seconds(3602).splitOutTimezone().b.formatOffset());

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -129 +130 @@
         assertEquals(image.getDy(), -56.78, 1e-9);
     }
+
+    /**
+     * Tests to read a .joz file containing notes.
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException is the test file is considered as invalid
+     */
+    @Test
+    public void testReadNotes() throws IOException, IllegalDataException {
+        final List<Layer> layers = testRead("notes.joz");
+        assertSame(layers.size(), 1);
+        assertTrue(layers.get(0) instanceof NoteLayer);
+        final NoteLayer layer = (NoteLayer) layers.get(0);
+        assertEquals("Notes", layer.getName());
+        assertEquals(174, layer.getNoteData().getNotes().size());
+    }
 }

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
@@ -139 +141 @@
     }
 
+    private NoteLayer createNoteLayer() {
+        return new NoteLayer(Arrays.asList(new Note(LatLon.ZERO)), "layer name");
+    }
+
     /**
      * Tests to write an empty .jos file.
@@ -204 +210 @@
         testWrite(Collections.singletonList(layer), true);
     }
+
+    /**
+     * Tests to write a .joz file containing a note layer.
+     */
+    @Test
+    public void testWriteNoteLayer() {
+        final Layer layer = createNoteLayer();
+        testWrite(Collections.singletonList(layer), true);
+    }
 }