Changeset 159 in josm for test/org/openstreetmap/josm

Timestamp:

2006-10-13T13:02:57+02:00 (18 years ago)

Author:

imi

Message:

• moved translations into plugins
• added main menu control to main
• added ImageProvider access to plugins

Location:

test/org/openstreetmap/josm

Files:

• data/conflict (added)
• data/conflict/MergerTest.java (added)
• data/osm/visitor/MergeVisitorTest.java (modified) (3 diffs)
• testframework/DataSetTestCaseHelper.java (modified) (1 diff)

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

@@ -265 +265 @@
         
         /**
-         * Deleted segments should be deleted when merged over unchanged segments.
-         */
-        public void testMergeDeletedOverUnchangedDeletes() {
-                DataSet ds = new DataSet();
-                Segment oldSegment = createSegment(ds, false, false, 23);
-                Segment s = createSegment(null, false, true, 23);
-                
-                MergeVisitor v = new MergeVisitor(ds);
-                v.visit(s);
-                v.fixReferences();
-                
-                assertEquals(true, oldSegment.deleted);
-        }
-        
-
-        /**
          * Deleted segments should raise an conflict when merged over changed segments. 
          */
@@ -287 +271 @@
                 createSegment(ds, false, false, 23).modified = true;
                 Segment s = createSegment(null, false, true, 23);
+                s.timestamp = new Date(new Date().getTime()+1);
                 
                 MergeVisitor v = new MergeVisitor(ds);
@@ -303 +288 @@
                 s.id = id;
                 s.deleted = deleted;
+                s.timestamp = new Date();
                 return s;
         }

test/org/openstreetmap/josm/testframework/DataSetTestCaseHelper.java

@@ -42 +42 @@
 
         public static Way createWay(DataSet ds, Segment... segments) {
-                Way t = new Way();
-                t.segments.addAll(Arrays.asList(segments));
+                Way w = new Way();
+                w.segments.addAll(Arrays.asList(segments));
                 if (ds != null)
-                        ds.ways.add(t);
-                return t;
+                        ds.ways.add(w);
+                return w;
         }