Changeset 9546 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java

Timestamp:

2016-01-20T01:10:10+01:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests, fix packages, rename manual functional unit tests (with a main() method) to *TestFT.java

File:

• trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java ) (4 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -14 +13 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-@Ignore
-public class RelationMemberMergerTest extends JFrame {
+public class RelationMemberMergerTestFT extends JFrame {
 
     private RelationMemberMerger merger;
@@ -44 +42 @@
      * Constructs a new {@code RelationMemberMergerTest}.
      */
-    public RelationMemberMergerTest() {
+    public RelationMemberMergerTestFT() {
         build();
         populate();
@@ -50 +48 @@
 
     public static void main(String[] args) {
-        RelationMemberMergerTest test = new RelationMemberMergerTest();
+        RelationMemberMergerTestFT test = new RelationMemberMergerTestFT();
         test.setSize(600, 600);
         test.setVisible(true);