Changeset 12564 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java

Timestamp:

2017-08-03T23:24:56+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -17 +18 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog.ConflictPainter;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -31 +33 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().commands();
+    public JOSMTestRules test = new JOSMTestRules().mainMenu().platform().projection();
 
     /**
@@ -54 +56 @@
     @Test
     public void testConflictPainter() {
+        Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
         ConflictPainter cp = new ConflictPainter(Main.map.mapView, new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics());
         Node n1 = new Node(1, 1);