Changeset 11726 in josm for trunk/test

Timestamp:

2017-03-13T18:54:20+01:00 (7 years ago)

Author:

michael2402

Message:

Don't use null to indicate a rotation of 0 degrees, simply set the rotation to 0.

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -98 +98 @@
                 new TestConfig("area-fill-image", AREA_DEFAULT),
 
+                /** Tests area label drawing/placement */
+                new TestConfig("area-text", AREA_DEFAULT),
+
                 /** Tests if all styles are sorted correctly. Tests {@link StyleRecord#compareTo(StyleRecord)} */
                 new TestConfig("order", AREA_DEFAULT)

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -48 +48 @@
             Layer layer = new OsmDataLayer(ds, null, null);
             Main.getLayerManager().addLayer(layer);
-            // FIXME enable this test after we fix the bug. Test disabled for now
-            // try {
-            //     new JoinAreasAction().join(ds.getWays());
-            // } finally {
-            // Ensure we clean the place before leaving, even if test fails.
-            Main.getLayerManager().removeLayer(layer);
-            // }
+            try {
+                new JoinAreasAction().join(ds.getWays());
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                Main.getLayerManager().removeLayer(layer);
+            }
         }
     }
@@ -77 +76 @@
                 Main.main.menu.joinAreas.join(Utils.filteredCollection(found, Way.class));
 
-                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
+                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:relation ref="+ref, SearchAction.SearchMode.replace);
                 assertEquals(1, found2.size());
                 System.out.println(" ==> OK");