Changeset 11726 in josm for trunk/test


Ignore:
Timestamp:
2017-03-13T18:54:20+01:00 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

    r11714 r11726  
    9898                new TestConfig("area-fill-image", AREA_DEFAULT),
    9999
     100                /** Tests area label drawing/placement */
     101                new TestConfig("area-text", AREA_DEFAULT),
     102
    100103                /** Tests if all styles are sorted correctly. Tests {@link StyleRecord#compareTo(StyleRecord)} */
    101104                new TestConfig("order", AREA_DEFAULT)
  • trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

    r10945 r11726  
    4848            Layer layer = new OsmDataLayer(ds, null, null);
    4949            Main.getLayerManager().addLayer(layer);
    50             // FIXME enable this test after we fix the bug. Test disabled for now
    51             // try {
    52             //     new JoinAreasAction().join(ds.getWays());
    53             // } finally {
    54             // Ensure we clean the place before leaving, even if test fails.
    55             Main.getLayerManager().removeLayer(layer);
    56             // }
     50            try {
     51                new JoinAreasAction().join(ds.getWays());
     52            } finally {
     53                // Ensure we clean the place before leaving, even if test fails.
     54                Main.getLayerManager().removeLayer(layer);
     55            }
    5756        }
    5857    }
     
    7776                Main.main.menu.joinAreas.join(Utils.filteredCollection(found, Way.class));
    7877
    79                 Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
     78                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:relation ref="+ref, SearchAction.SearchMode.replace);
    8079                assertEquals(1, found2.size());
    8180                System.out.println(" ==> OK");
Note: See TracChangeset for help on using the changeset viewer.