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

Timestamp:

2017-04-09T12:22:30+02:00 (8 years ago)

Author:

bastiK

Message:

see #7427 - fix test-compile

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (modified) (10 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.CustomProjection;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -25 +26 @@
 public class TemplatedWMSTileSourceTest {
 
-    private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
-    private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
+    private final ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
+    private final ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
 
     /**
@@ -40 +41 @@
     @Test
     public void testEPSG3857() {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
-        TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS);
+        Projection projection = Projections.getProjectionByCode("EPSG:3857");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS, projection);
         verifyMercatorTile(source, 0, 0, 1);
         verifyMercatorTile(source, 0, 0, 2);
@@ -64 +66 @@
     @Test
     public void testEPSG4326() {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
-        TemplatedWMSTileSource source = getSource();
+        Projection projection = Projections.getProjectionByCode("EPSG:4326");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
@@ -79 +82 @@
     @Test
     public void testEPSG4326widebounds() {
-        Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54"));
-        TemplatedWMSTileSource source = getSource();
+        Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
@@ -91 +95 @@
     @Test
     public void testEPSG4326narrowbounds() {
-        Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90"));
-        TemplatedWMSTileSource source = getSource();
+        Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
@@ -103 +108 @@
     @Test
     public void testEPSG2180() {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:2180"));
-        TemplatedWMSTileSource source = getSource();
+        Projection projection = Projections.getProjectionByCode("EPSG:2180");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
@@ -119 +125 @@
     @Test
     public void testEPSG3006withbounds() {
-        Main.setProjection(
+        Projection projection =
                 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
-                        + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006 +bounds=10.5700,55.2000,24.1800,69.1000 "));
-        TemplatedWMSTileSource source = getSource();
+                        + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006 +bounds=10.5700,55.2000,24.1800,69.1000 ");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyTileSquarness(source, 0, 1, 4);
@@ -134 +141 @@
     @Test
     public void testEPSG3006withoutbounds() {
-        Main.setProjection(
+        Projection projection =
                 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
-                        + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006"));
-        TemplatedWMSTileSource source = getSource();
+                        + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006");
+        Main.setProjection(projection);
+        TemplatedWMSTileSource source = getSource(projection);
 
         verifyTileSquarness(source, 0, 1, 4);
@@ -236 +244 @@
     }
 
-    private TemplatedWMSTileSource getSource() {
-        return new TemplatedWMSTileSource(testImageryWMS);
+    private TemplatedWMSTileSource getSource(Projection projection) {
+        return new TemplatedWMSTileSource(testImageryWMS, projection);
     }
 }