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

Timestamp:

2016-01-13T23:58:45+01:00 (9 years ago)

Author:

Don-vip

Message:

increase test coverage

Location:

trunk/test/unit/org/openstreetmap/josm/gui/layer

Files:

• TMSLayerTest.java (modified) (3 diffs)
• WMSLayerTest.java (modified) (3 diffs)
• WMTSLayerTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java

@@ -7 +7 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -20 +21 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
+    }
+
+    /**
+     * Creates a new TMS layer.
+     * @return a new TMS layer
+     */
+    public static TMSLayer createTmsLayer() {
+        return new TMSLayer(new ImageryInfo("test tms", "http://localhost", "tms", null, null));
+    }
+
+    /**
+     * Creates a new Bing layer.
+     * @return a new Bing layer
+     */
+    public static TMSLayer createBingLayer() {
+        return new TMSLayer(new ImageryInfo("test bing", "http://localhost", "bing", null, null));
+    }
+
+    /**
+     * Creates a new Scanex layer.
+     * @return a new Scanex layer
+     */
+    public static TMSLayer createScanexLayer() {
+        return new TMSLayer(new ImageryInfo("test scanex", "http://localhost", "scanex", null, null));
+    }
+
+    private static void test(ImageryType expected, TMSLayer layer) {
+        Main.main.addLayer(layer);
+        assertEquals(expected, layer.getInfo().getImageryType());
     }
 
@@ -28 +58 @@
     @Test
     public void testTMSLayer() {
-        TMSLayer tms = new TMSLayer(new ImageryInfo("test tms", "http://localhost", "tms", null, null));
-        assertEquals(ImageryType.TMS, tms.getInfo().getImageryType());
-
-        TMSLayer bing = new TMSLayer(new ImageryInfo("test bing", "http://localhost", "bing", null, null));
-        assertEquals(ImageryType.BING, bing.getInfo().getImageryType());
-
-        TMSLayer scanex = new TMSLayer(new ImageryInfo("test scanex", "http://localhost", "scanex", null, null));
-        assertEquals(ImageryType.SCANEX, scanex.getInfo().getImageryType());
+        test(ImageryType.TMS, createTmsLayer());
+        test(ImageryType.BING, createBingLayer());
+        test(ImageryType.SCANEX, createScanexLayer());
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java

@@ -7 +7 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -20 +21 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
     }
 
@@ -29 +30 @@
     public void testWMSLayer() {
         WMSLayer wms = new WMSLayer(new ImageryInfo("test wms", "http://localhost"));
+        Main.main.addLayer(wms);
         assertEquals(ImageryType.WMS, wms.getInfo().getImageryType());
     }

trunk/test/unit/org/openstreetmap/josm/gui/layer/WMTSLayerTest.java

@@ -27 +27 @@
      */
     @Test
-    public void testTMSLayer() {
+    public void testWMTSLayer() {
         WMTSLayer wmts = new WMTSLayer(new ImageryInfo("test wmts", "http://localhost", "wmts", null, null));
         assertEquals(ImageryType.WMTS, wmts.getInfo().getImageryType());