Changeset 9546 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags

Timestamp:

2016-01-20T01:10:10+01:00 (10 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/tags/TagMergerTestFT.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java ) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
-
-@Ignore
-public class TagMergerTest extends JFrame {
+public class TagMergerTestFT extends JFrame {
 
     private TagMerger tagMerger;
@@ -22 +19 @@
      * Constructs a new {@code TagMergerTest}.
      */
-    public TagMergerTest() {
+    public TagMergerTestFT() {
         build();
         tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue"));
@@ -35 +32 @@
 
     public static void main(String[] args) {
-        TagMergerTest test  = new TagMergerTest();
+        TagMergerTestFT test  = new TagMergerTestFT();
         test.setSize(600, 600);
         test.setVisible(true);