Changeset 9973 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2016-03-12T23:58:33+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - JUnit4 tests should use @Test annotation

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• cache/JCSCachedTileLoaderJobTest.java (modified) (2 diffs)
• imagery/WMTSTileSourceTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java

@@ -72 +72 @@
     @Test
     public void testStatusCodes() throws Exception {
-        testStatusCode(200);
+        doTestStatusCode(200);
         // can't test for 3xx, as httpstat.us redirects finally to 200 page
-        testStatusCode(401);
-        testStatusCode(402);
-        testStatusCode(403);
-        testStatusCode(404);
-        testStatusCode(405);
-        testStatusCode(500);
-        testStatusCode(501);
-        testStatusCode(502);
+        doTestStatusCode(401);
+        doTestStatusCode(402);
+        doTestStatusCode(403);
+        doTestStatusCode(404);
+        doTestStatusCode(405);
+        doTestStatusCode(500);
+        doTestStatusCode(501);
+        doTestStatusCode(502);
     }
 
     @Test
-    public void testUnkownHost() throws Exception {
+    public void testUnknownHost() throws Exception {
         TestCachedTileLoaderJob job = new TestCachedTileLoaderJob("http://unkownhost.unkownhost/unkown");
         Listener listener = new Listener();
@@ -97 +97 @@
     }
 
-    public void testStatusCode(int responseCode) throws Exception {
+    private void doTestStatusCode(int responseCode) throws Exception {
         TestCachedTileLoaderJob job = getStatusLoaderJob(responseCode);
         Listener listener = new Listener();

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

@@ -10 +10 @@
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
@@ -84 +85 @@
         assertEquals("TileXMax", 4, testSource.getTileXMax(2));
         assertEquals("TileYMax", 4, testSource.getTileYMax(2));
-
     }
 
@@ -106 +106 @@
     }
 
-    // XXX - disable this test, needs further working
-    // @Test
+    @Test
+    @Ignore("disable this test, needs further working") // XXX
     public void testWALLONIENoMatrixDimension() throws MalformedURLException, IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
@@ -224 +224 @@
     }
 
-
-    // XXX: disabled as this needs user action
-    //@Test
+    @Test
+    @Ignore("disabled as this needs user action") // XXX
     public void testTwoTileSetsForOneProjection() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
@@ -236 +235 @@
     }
 
-    // XXX: disabled as this needs user action
-    // @Test
+    @Test
+    @Ignore("disabled as this needs user action") // XXX
     public void testManyLayersScrollbars() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
@@ -246 +245 @@
 
     @Test
-    public void testPraserForDuplicateTags() throws Exception {
+    public void testParserForDuplicateTags() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testDuplicateTags);
@@ -258 +257 @@
 
     @Test
-    public void testPraserForMissingStyleIdentifier() throws Exception {
+    public void testParserForMissingStyleIdentifier() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testMissingStyleIdentifer);
@@ -268 +267 @@
         assertEquals("Latitude", expected.lat(), ll.lat(), 1e-05);
         assertEquals("Longitude", expected.lon(), ll.lon(), 1e-05);
-
     }