Changeset 11838 in josm for trunk/test

Timestamp:

2017-04-04T16:50:06+02:00 (8 years ago)

Author:

bastiK

Message:

see #7427 - fix unit tests

Location:

trunk/test

Files:

• data/renderer/area-fill-color/reference.png (modified) ( previous)
• data/renderer/area-fill-image/reference.png (modified) ( previous)
• data/renderer/area-icon/reference.png (modified) ( previous)
• data/renderer/area-text/reference.png (modified) ( previous)
• data/renderer/node-shapes/reference.png (modified) ( previous)
• data/renderer/node-text/reference.png (modified) ( previous)
• data/renderer/order/reference.png (modified) ( previous)
• data/renderer/way-color/reference.png (modified) ( previous)
• data/renderer/way-dashes/reference.png (modified) ( previous)
• data/renderer/way-width/reference.png (modified) ( previous)
• unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java

@@ -112 +112 @@
         component.zoomTo(new LatLon(10, 10));
         Point2D shouldBeCenter = component.getPoint2D(new LatLon(10, 10));
-        assertThat(shouldBeCenter, CustomMatchers.is(new Point2D.Double(WIDTH / 2, HEIGHT / 2)));
+        // center may move 0.5 pixels for alignment, see {@link NavigatableComponent#zoomTo(EastNorth, double, boolean)}
+        assertEquals(shouldBeCenter.getX(), WIDTH / 2., 0.5);
+        assertEquals(shouldBeCenter.getY(), HEIGHT / 2., 0.5);
     }
 
@@ -126 +128 @@
         component.zoomToFactor(0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertEquals(center, component.getCenter());
+        assertThat(component.getCenter(), CustomMatchers.is(center));
         component.zoomToFactor(2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertEquals(center, component.getCenter());
+        assertThat(component.getCenter(), CustomMatchers.is(center));
 
         // zoomToFactor(EastNorth, double)