Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 9429)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 9430)
@@ -89,5 +89,5 @@
  * Base abstract class that supports displaying images provided by TileSource. It might be TMS source, WMS or WMTS
  *
- * It implements all standard functions of tilesource based layers: autozoom,  tile reloads, layer saving, loading,etc.
+ * It implements all standard functions of tilesource based layers: autozoom, tile reloads, layer saving, loading,etc.
  *
  * @author Upliner
@@ -97,5 +97,5 @@
  */
 public abstract class AbstractTileSourceLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
-    private static final String PREFERENCE_PREFIX   = "imagery.generic";
+    private static final String PREFERENCE_PREFIX = "imagery.generic";
 
     /** maximum zoom level supported */
Index: /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 9429)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 9430)
@@ -52,5 +52,4 @@
     }
 
-
     /**
      * Creates and returns a new TileSource instance depending on the {@link ImageryType}
@@ -76,8 +75,4 @@
         });
     }
-
-    /**
-     * Adds a context menu to the mapView.
-     */
 
     @Override
@@ -126,7 +121,7 @@
             info.setAttribution(t);
             return t;
-        } else if (info.getImageryType() == ImageryType.BING)
+        } else if (info.getImageryType() == ImageryType.BING) {
             return new CachedAttributionBingAerialTileSource(info, attributionLoadedTask);
-        else if (info.getImageryType() == ImageryType.SCANEX) {
+        } else if (info.getImageryType() == ImageryType.SCANEX) {
             return new ScanexTileSource(info);
         }
@@ -150,4 +145,3 @@
         return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
     }
-
 }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 9429)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 9430)
@@ -61,5 +61,4 @@
         this.supportedProjections = new TreeSet<>(info.getServerProjections());
         this.autoZoom = PROP_DEFAULT_AUTOZOOM.get();
-
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java	(revision 9429)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java	(revision 9430)
@@ -37,5 +37,4 @@
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wmts.default_autozoom", true);
     private static final String CACHE_REGION_NAME = "WMTS";
-
 
     /**
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 9430)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 9430)
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+
+/**
+ * Unit tests of {@link TMSLayer} class.
+ */
+public class TMSLayerTest {
+
+    /**
+     * Setup tests
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link TMSLayer#TMSLayer}.
+     */
+    @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());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java	(revision 9430)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java	(revision 9430)
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+
+/**
+ * Unit tests of {@link WMSLayer} class.
+ */
+public class WMSLayerTest {
+
+    /**
+     * Setup tests
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link WMSLayer#WMSLayer}.
+     */
+    @Test
+    public void testWMSLayer() {
+        WMSLayer wms = new WMSLayer(new ImageryInfo("test wms", "http://localhost"));
+        assertEquals(ImageryType.WMS, wms.getInfo().getImageryType());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMTSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMTSLayerTest.java	(revision 9430)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMTSLayerTest.java	(revision 9430)
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+
+/**
+ * Unit tests of {@link WMTSLayer} class.
+ */
+public class WMTSLayerTest {
+
+    /**
+     * Setup tests
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link WMTSLayer#WMTSLayer}.
+     */
+    @Test
+    public void testTMSLayer() {
+        WMTSLayer wmts = new WMTSLayer(new ImageryInfo("test wmts", "http://localhost", "wmts", null, null));
+        assertEquals(ImageryType.WMTS, wmts.getInfo().getImageryType());
+    }
+}