Changeset 10571 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

2016-07-20T19:34:37+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13172 - Move ImageryLayer.d[xy] to the settings (patch by michael2402) - gsoc-core

Location:

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

Files:

• SessionReaderTest.java (modified) (2 diffs)
• SessionWriterTest.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -125 +126 @@
         assertEquals(layers.size(), 1);
         assertTrue(layers.get(0) instanceof ImageryLayer);
-        final ImageryLayer image = (ImageryLayer) layers.get(0);
+        final AbstractTileSourceLayer<?> image = (AbstractTileSourceLayer<?>) layers.get(0);
         assertEquals("Bing aerial imagery", image.getName());
-        assertEquals(image.getDx(), 12.34, 1e-9);
-        assertEquals(image.getDy(), -56.78, 1e-9);
+        assertEquals(image.getDisplaySettings().getDx(), 12.34, 1e-9);
+        assertEquals(image.getDisplaySettings().getDy(), -56.78, 1e-9);
     }
 

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

@@ -15 +15 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -136 +137 @@
 
     private ImageryLayer createImageryLayer() {
-        ImageryLayer layer = new TMSLayer(new ImageryInfo("the name", "http://www.url.com/"));
-        layer.setOffset(12, 34);
+        TMSLayer layer = new TMSLayer(new ImageryInfo("the name", "http://www.url.com/"));
+        layer.getDisplaySettings().setDisplacement(new EastNorth(12, 34));
         return layer;
     }