Changeset 8917 in josm for trunk/test

Timestamp:

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

Author:

Don-vip

Message:

fix unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/command/conflict

Files:

• ConflictAddCommandTest.java (modified) (4 diffs)
• CoordinateConflictResolveCommandTest.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24 +25 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
+        Main.map.mapView.addLayer(new OsmDataLayer(new DataSet(), null, null));
     }
 
@@ -32 +34 @@
     @Test
     public void testExecuteUndoCommand() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         ConflictAddCommand cmd = new ConflictAddCommand(layer, conflict);
@@ -48 +50 @@
     @Test
     public void testGetDescriptionIcon() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());

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
     }