Changeset 8917 in josm for trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

Timestamp:

2015-10-20T16:05:10+02:00 (9 years ago)

Author:

Don-vip

Message:

fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command.conflict;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -42 +43 @@
         CoordinateConflictResolveCommand cmd = new CoordinateConflictResolveCommand(conflict, MergeDecisionType.KEEP_MINE);
         assertTrue(cmd.executeCommand());
-        assertTrue(LatLon.ZERO.equals(conflict.getMy().getCoor()));
+        assertEquals(LatLon.ZERO, conflict.getMy().getCoor());
         cmd.undoCommand();
-        assertTrue(LatLon.ZERO.equals(conflict.getMy().getCoor()));
+        assertEquals(LatLon.ZERO, conflict.getMy().getCoor());
     }
 
@@ -55 +56 @@
         CoordinateConflictResolveCommand cmd = new CoordinateConflictResolveCommand(conflict, MergeDecisionType.KEEP_THEIR);
         assertTrue(cmd.executeCommand());
-        assertTrue(conflict.getTheir().getCoor().equals(conflict.getMy().getCoor()));
+        assertEquals(conflict.getTheir().getCoor(), conflict.getMy().getCoor());
         cmd.undoCommand();
-        //assertTrue(LatLon.ZERO.equals(conflict.getMy().getCoor())); // FIXME it does not work
+        //assertEquals(LatLon.ZERO, conflict.getMy().getCoor()); // FIXME it does not work
     }