Changeset 285 in josm

Timestamp:

2007-07-11T21:41:12+02:00 (17 years ago)

Author:

imi

Message:

• fixed test dependencies
• added more functional tests

Location:

test

Files:

• functional/DeleteTest.java (added)
• functional/SelectionTest.java (added)
• functional/WayTest.java (modified) (1 diff)
• functional/framework/FunctionalTestCase.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/testframework/MotherObject.java (modified) (1 diff)

test/functional/WayTest.java

@@ -7 +7 @@
 
         public void test() throws Exception {
-            key("ctrl-n", "n");
-            click(100,400);
-            click(150,400);
-            click(200,400);
-            key("g");
-            drag(200,400,150,400);
-            drag(150,400,100,400);
-            key("s", "ctrl-a", "w");
-            assertPopup();
-            assertEquals(1, Main.ds.ways.size());
-            
-            key("ctrl-a", "s");
-            click(125,400,"ctrl");
-            key("w");
-            assertPopup();
-            assertEquals(2, Main.ds.ways.size());
-            
-            key("ctrl-z", "ctrl-z", "ctrl-shift-a");
-            click(125,400);
-            assertEquals(1, Main.ds.ways.size());
-            click(175,400);
-            assertEquals(1, Main.ds.ways.size());
-    }
+                key("ctrl-n", "n");
+                click(100,400);
+                click(150,400);
+                click(200,400);
+                key("g");
+                drag(200,400,150,400);
+                drag(150,400,100,400);
+                key("s", "ctrl-a", "w");
+                assertPopup();
+                assertEquals(1, Main.ds.ways.size());
+
+                key("ctrl-a", "s");
+                click(125,400,"ctrl");
+                key("w");
+                assertPopup();
+                assertEquals(2, Main.ds.ways.size());
+
+                key("ctrl-z", "ctrl-z", "ctrl-shift-a");
+                click(125,400);
+                assertEquals(1, Main.ds.ways.size());
+                click(175,400);
+                assertEquals(1, Main.ds.ways.size());
+        }
 }

test/functional/framework/FunctionalTestCase.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 
-public class FunctionalTestCase extends JFCTestCase {
+abstract public class FunctionalTestCase extends JFCTestCase {
 
         private KeyStroke getKey(String s) {
@@ -65 +67 @@
                 super.setUp();
                 setHelper(new RobotTestHelper());
+                
+                Main.ds = new DataSet();
+                Main.pref = new Preferences();
+                if (Main.map != null)
+                        Main.main.setMapFrame(null);
+                
                 MainApplication.main(new String[]{});
+        }
+        
+        @Override protected void tearDown() throws Exception {
+                Main.parent.setVisible(false);
+                super.tearDown();
         }
 

test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -350 +350 @@
                 assertEquals(23, ds.segments.iterator().next().id);
         }
-        
-        public void testDoNotMergeEqualObjectsWithDifferentNonZeroId() throws Exception {
-                DataSet ds = new DataSet();
-                Segment s1 = createSegment(ds, false, false, 23);
-                Segment s2 = new Segment(s1);
-                s2.id = 42;
-                MergeVisitor v = new MergeVisitor(ds, null);
-                v.visit(s2);
-                assertEquals(2, ds.segments.size());
-        }
 }

test/unit/org/openstreetmap/josm/testframework/MotherObject.java

@@ -23 +23 @@
             super.setUp();
             Main.proj = new Epsg4326();
+            Main.ds = new DataSet();
     }