Changeset 9546 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2016-01-20T01:10:10+01:00 (9 years ago)
- Location:
- trunk/test/functional/org/openstreetmap/josm/gui/conflict
- Files:
-
- 1 deleted
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java
r9543 r9546 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore;9 8 import org.openstreetmap.josm.data.conflict.Conflict; 10 9 import org.openstreetmap.josm.data.osm.Node; … … 12 11 import org.openstreetmap.josm.data.osm.Way; 13 12 14 @Ignore 15 public class NodeListMergerTest extends JFrame { 16 13 public class NodeListMergerTestFT extends JFrame { 17 14 18 15 private NodeListMerger nodeListMerger; … … 65 62 * Constructs a new {@code NodeListMergerTest}. 66 63 */ 67 public NodeListMergerTest() { 64 public NodeListMergerTestFT() { 68 65 build(); 69 66 populate(); … … 71 68 72 69 public static void main(String[] args) { 73 NodeListMergerTest test = new NodeListMergerTest(); 70 NodeListMergerTestFT test = new NodeListMergerTestFT(); 74 71 test.setSize(600, 600); 75 72 test.setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java
r9543 r9546 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore;9 8 import org.openstreetmap.josm.Main; 10 9 import org.openstreetmap.josm.data.conflict.Conflict; … … 14 13 import org.openstreetmap.josm.data.projection.Projections; 15 14 16 @Ignore 17 public class PropertiesMergerTest extends JFrame { 15 public class PropertiesMergerTestFT extends JFrame { 18 16 19 17 private PropertiesMerger merger; … … 40 38 * Constructs a new {@code PropertiesMergerTest}. 41 39 */ 42 public PropertiesMergerTest() { 40 public PropertiesMergerTestFT() { 43 41 build(); 44 42 populate(); … … 46 44 47 45 public static void main(String[] args) { 48 PropertiesMergerTest app = new PropertiesMergerTest(); 46 PropertiesMergerTestFT app = new PropertiesMergerTestFT(); 49 47 app.setSize(600, 400); 50 48 app.setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java
r9543 r9546 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore;9 8 import org.openstreetmap.josm.data.conflict.Conflict; 10 9 import org.openstreetmap.josm.data.osm.Node; … … 14 13 import org.openstreetmap.josm.data.osm.Way; 15 14 16 @Ignore 17 public class RelationMemberMergerTest extends JFrame { 15 public class RelationMemberMergerTestFT extends JFrame { 18 16 19 17 private RelationMemberMerger merger; … … 44 42 * Constructs a new {@code RelationMemberMergerTest}. 45 43 */ 46 public RelationMemberMergerTest() { 44 public RelationMemberMergerTestFT() { 47 45 build(); 48 46 populate(); … … 50 48 51 49 public static void main(String[] args) { 52 RelationMemberMergerTest test = new RelationMemberMergerTest(); 50 RelationMemberMergerTestFT test = new RelationMemberMergerTestFT(); 53 51 test.setSize(600, 600); 54 52 test.setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java
r9543 r9546 6 6 import javax.swing.JFrame; 7 7 8 import org.junit.Ignore; 9 10 @Ignore 11 public class TagMergerTest extends JFrame { 8 public class TagMergerTestFT extends JFrame { 12 9 13 10 private TagMerger tagMerger; … … 22 19 * Constructs a new {@code TagMergerTest}. 23 20 */ 24 public TagMergerTest() { 21 public TagMergerTestFT() { 25 22 build(); 26 23 tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); … … 35 32 36 33 public static void main(String[] args) { 37 TagMergerTest test = new TagMergerTest(); 34 TagMergerTestFT test = new TagMergerTestFT(); 38 35 test.setSize(600, 600); 39 36 test.setVisible(true);
Note:
See TracChangeset
for help on using the changeset viewer.