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

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/properties/PropertiesMergerTestFT.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java ) (4 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -14 +13 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
-@Ignore
-public class PropertiesMergerTest extends JFrame {
+public class PropertiesMergerTestFT extends JFrame {
 
     private PropertiesMerger merger;
@@ -40 +38 @@
      * Constructs a new {@code PropertiesMergerTest}.
      */
-    public PropertiesMergerTest() {
+    public PropertiesMergerTestFT() {
         build();
         populate();
@@ -46 +44 @@
 
     public static void main(String[] args) {
-        PropertiesMergerTest app = new PropertiesMergerTest();
+        PropertiesMergerTestFT app = new PropertiesMergerTestFT();
         app.setSize(600, 400);
         app.setVisible(true);