Changeset 11867 in josm for trunk

Timestamp:

2017-04-09T16:00:43+02:00 (8 years ago)

Author:

bastiK

Message:

see #7427 - fix some unit tests

Location:

trunk/test

Files:

• data/renderer/area-icon/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)
• unit/org/CustomMatchers.java (modified) (4 diffs)
• unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java (modified) (6 diffs)

trunk/test/unit/org/CustomMatchers.java

@@ -4 +4 @@
 import java.awt.geom.Point2D;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.function.Predicate;
 
@@ -88 +89 @@
      */
     public static Matcher<? super Point2D> is(final Point2D expected) {
-        return new CustomTypeSafeMatcher<Point2D>("the same Point2D") {
+        return new CustomTypeSafeMatcher<Point2D>(Objects.toString(expected)) {
             @Override
             protected boolean matchesSafely(Point2D actual) {
@@ -102 +103 @@
      */
     public static Matcher<? super LatLon> is(final LatLon expected) {
-        return new CustomTypeSafeMatcher<LatLon>("the same LatLon") {
+        return new CustomTypeSafeMatcher<LatLon>(Objects.toString(expected)) {
             @Override
             protected boolean matchesSafely(LatLon actual) {
@@ -117 +118 @@
      */
     public static Matcher<? super EastNorth> is(final EastNorth expected) {
-        return new CustomTypeSafeMatcher<EastNorth>("the same EastNorth") {
+        return new CustomTypeSafeMatcher<EastNorth>(Objects.toString(expected)) {
             @Override
             protected boolean matchesSafely(EastNorth actual) {

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

@@ -8 +8 @@
 import java.awt.Rectangle;
 import java.awt.geom.Point2D;
+import java.util.Objects;
 
 import javax.swing.JPanel;
 
 import org.CustomMatchers;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Rule;
@@ -112 +115 @@
         component.zoomTo(new LatLon(10, 10));
         Point2D shouldBeCenter = component.getPoint2D(new LatLon(10, 10));
-        // center may move 0.5 pixels for alignment, see {@link NavigatableComponent#zoomTo(EastNorth, double, boolean)}
+        // 0.5 pixel tolerance, see isAfterZoom
         assertEquals(shouldBeCenter.getX(), WIDTH / 2., 0.5);
         assertEquals(shouldBeCenter.getY(), HEIGHT / 2., 0.5);
@@ -128 +131 @@
         component.zoomToFactor(0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), CustomMatchers.is(center));
+        assertThat(component.getCenter(), isAfterZoom(center, component.getScale()));
         component.zoomToFactor(2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), CustomMatchers.is(center));
+        assertThat(component.getCenter(), isAfterZoom(center, component.getScale()));
 
         // zoomToFactor(EastNorth, double)
@@ -137 +140 @@
         component.zoomToFactor(newCenter, 0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertEquals(newCenter, component.getCenter());
+        assertThat(component.getCenter(), isAfterZoom(newCenter, component.getScale()));
         component.zoomToFactor(newCenter, 2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertEquals(newCenter, component.getCenter());
+        assertThat(component.getCenter(), isAfterZoom(newCenter, component.getScale()));
     }
 
@@ -168 +171 @@
         component.zoomToFactor(0, 0, 0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertThat(component.getEastNorth(0, 0), CustomMatchers.is(testPoint1));
+        assertThat(component.getEastNorth(0, 0), isAfterZoom(testPoint1, component.getScale()));
         component.zoomToFactor(0, 0, 2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertThat(component.getEastNorth(0, 0), CustomMatchers.is(testPoint1));
+        assertThat(component.getEastNorth(0, 0), isAfterZoom(testPoint1, component.getScale()));
 
         component.zoomToFactor(200, 150, 0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertThat(component.getEastNorth(200, 150), CustomMatchers.is(testPoint2));
+        assertThat(component.getEastNorth(200, 150), isAfterZoom(testPoint2, component.getScale()));
         component.zoomToFactor(200, 150, 2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertThat(component.getEastNorth(200, 150), CustomMatchers.is(testPoint2));
+        assertThat(component.getEastNorth(200, 150), isAfterZoom(testPoint2, component.getScale()));
 
     }
@@ -206 +209 @@
     }
 
+    /**
+     * Check that EastNorth is the same as expected after zooming the NavigatableComponent.
+     *
+     * Adds tolerance of 0.5 pixel for pixel grid alignment, see
+     * {@link NavigatableComponent#zoomTo(EastNorth, double, boolean)}
+     * @param expected expected
+     * @param scale current scale
+     * @return Matcher object
+     */
+    private Matcher<EastNorth> isAfterZoom(EastNorth expected, double scale) {
+        return new CustomTypeSafeMatcher<EastNorth>(Objects.toString(expected)) {
+            @Override
+            protected boolean matchesSafely(EastNorth actual) {
+                // compare pixels (east/north divided by scale)
+                return Math.abs((expected.getX() - actual.getX()) / scale) <= 0.5
+                        && Math.abs((expected.getY() - actual.getY()) / scale) <= 0.5;
+            }
+        };
+    }
+
 }