Changeset 7087 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties

Timestamp:

2014-05-09T11:42:57+02:00 (11 years ago)

Author:

simon04

Message:

ignore (non-working) functional GUI functional tests without assertions from JUnit, fix another test

File:

• trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+@Ignore
 public class PropertiesMergerTest extends JFrame{