Changeset 7087 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2014-05-09T11:42:57+02:00 (10 years ago)
- Location:
- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
r6881 r7087 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore; 8 9 import org.openstreetmap.josm.data.conflict.Conflict; 9 10 import org.openstreetmap.josm.data.osm.Node; … … 11 12 import org.openstreetmap.josm.data.osm.Way; 12 13 14 @Ignore 13 15 public class NodeListMergerTest extends JFrame { 14 16 -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
r6881 r7087 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore; 8 9 import org.openstreetmap.josm.Main; 9 10 import org.openstreetmap.josm.data.conflict.Conflict; … … 13 14 import org.openstreetmap.josm.data.projection.Projections; 14 15 16 @Ignore 15 17 public class PropertiesMergerTest extends JFrame{ 16 18 -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
r6881 r7087 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore; 8 9 import org.openstreetmap.josm.data.conflict.Conflict; 9 10 import org.openstreetmap.josm.data.osm.Node; … … 13 14 import org.openstreetmap.josm.data.osm.Way; 14 15 16 @Ignore 15 17 public class RelationMemberMergerTest extends JFrame { 16 18 -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
r6881 r7087 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.gui.conflict.pair.tags; 3 4 import org.junit.Ignore; 3 5 4 6 import java.awt.BorderLayout; … … 6 8 import javax.swing.JFrame; 7 9 10 @Ignore 8 11 public class TagMergerTest extends JFrame { 9 12
Note:
See TracChangeset
for help on using the changeset viewer.