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

Timestamp:

2015-09-29T18:56:18+02:00 (9 years ago)

Author:

simon04

Message:

fix #9114 - Store imagery offset in session

Location:

trunk/test/unit/org/openstreetmap/josm/io/session

Files:

• SessionReaderTest.java (modified) (3 diffs)
• SessionWriterTest.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io.session;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -16 +18 @@
 import org.openstreetmap.josm.TestUtils;
 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.OsmDataLayer;
@@ -112 +115 @@
         assertEquals(marker.getName(), "Marker layer name");
     }
+
+    @Test
+    public void testReadImage() throws IOException, IllegalDataException {
+        final List<Layer> layers = testRead("bing.jos");
+        assertSame(layers.size(), 1);
+        assertTrue(layers.get(0) instanceof ImageryLayer);
+        final ImageryLayer image = (ImageryLayer) layers.get(0);
+        assertThat(image.getName(), is("Bing aerial imagery"));
+        assertEquals(image.getDx(), 12.34, 1e-9);
+        assertEquals(image.getDy(), -56.78, 1e-9);
+    }
 }

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -15 +16 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
 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.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -124 +127 @@
     }
 
+    private ImageryLayer createImageryLayer() {
+        ImageryLayer layer = new TMSLayer(new ImageryInfo("the name", "http://www.url.com/"));
+        layer.setOffset(12, 34);
+        return layer;
+    }
+
     /**
      * Tests to write an empty .jos file.
@@ -185 +194 @@
     public void testWriteGpxAndMarkerJoz() throws IOException {
         GpxLayer gpx = createGpxLayer();
-        testWrite(Pair.toList(new Pair<Layer, Layer>(gpx, createMarkerLayer(gpx))), true);
+        testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
+    }
+
+    @Test
+    public void testWriteImageryLayer() throws IOException {
+        final Layer layer = createImageryLayer();
+        testWrite(Collections.singletonList(layer), true);
     }
 }