Changeset 159 in josm for test/org/openstreetmap


Ignore:
Timestamp:
2006-10-13T13:02:57+02:00 (15 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:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

    r143 r159  
    265265       
    266266        /**
    267          * Deleted segments should be deleted when merged over unchanged segments.
    268          */
    269         public void testMergeDeletedOverUnchangedDeletes() {
    270                 DataSet ds = new DataSet();
    271                 Segment oldSegment = createSegment(ds, false, false, 23);
    272                 Segment s = createSegment(null, false, true, 23);
    273                
    274                 MergeVisitor v = new MergeVisitor(ds);
    275                 v.visit(s);
    276                 v.fixReferences();
    277                
    278                 assertEquals(true, oldSegment.deleted);
    279         }
    280        
    281 
    282         /**
    283267         * Deleted segments should raise an conflict when merged over changed segments.
    284268         */
     
    287271                createSegment(ds, false, false, 23).modified = true;
    288272                Segment s = createSegment(null, false, true, 23);
     273                s.timestamp = new Date(new Date().getTime()+1);
    289274               
    290275                MergeVisitor v = new MergeVisitor(ds);
     
    303288                s.id = id;
    304289                s.deleted = deleted;
     290                s.timestamp = new Date();
    305291                return s;
    306292        }
  • test/org/openstreetmap/josm/testframework/DataSetTestCaseHelper.java

    r143 r159  
    4242
    4343        public static Way createWay(DataSet ds, Segment... segments) {
    44                 Way t = new Way();
    45                 t.segments.addAll(Arrays.asList(segments));
     44                Way w = new Way();
     45                w.segments.addAll(Arrays.asList(segments));
    4646                if (ds != null)
    47                         ds.ways.add(t);
    48                 return t;
     47                        ds.ways.add(w);
     48                return w;
    4949        }
    5050       
Note: See TracChangeset for help on using the changeset viewer.