Changeset 9546 in josm for trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.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/dialogs/ConflictResolutionDialogTestFT.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java ) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java

@@ -4 +4 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -10 +9 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-@Ignore
-public class ConflictResolutionDialogTest extends JFrame {
+public class ConflictResolutionDialogTestFT extends JFrame {
 
     private ConflictResolutionDialog dialog;
@@ -40 +38 @@
      * Constructs a new {@code ConflictResolutionDialogTest}.
      */
-    public ConflictResolutionDialogTest() {
+    public ConflictResolutionDialogTestFT() {
         build();
     }
 
     public static void main(String[] args) {
-        ConflictResolutionDialogTest test = new ConflictResolutionDialogTest();
+        ConflictResolutionDialogTestFT test = new ConflictResolutionDialogTestFT();
         test.setVisible(true);
         test.populate();