Changeset 1898 in josm for trunk/test/functional


Ignore:
Timestamp:
2009-08-03T21:18:50+02:00 (10 years ago)
Author:
jttt
Message:

Way refactoring - rewritten another parts of code to the new nodes api

Location:
trunk/test/functional/org/openstreetmap/josm/io
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r1814 r1898  
    3333import org.openstreetmap.josm.data.projection.Mercator;
    3434import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    35 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
    3635import org.xml.sax.SAXException;
    3736
     
    275274            Way w2 = (Way)ds.getPrimitiveById(w1.id);
    276275            assertNotNull(w2);
    277             assertEquals(w2.nodes.size(), w1.nodes.size());
     276            assertEquals(w2.getNodesCount(), w1.getNodesCount());
    278277            assertEquals(w2.get("name"),w1.get("name"));
    279278        }
     
    340339        assertFalse(reader.getMissingPrimitives().isEmpty());
    341340        assertEquals(1, reader.getMissingPrimitives().size());
    342         assertEquals(9999999, reader.getMissingPrimitives().iterator().next());
     341        assertEquals(9999999, (long)reader.getMissingPrimitives().iterator().next());
    343342    }
    344343}
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r1814 r1898  
    3232import org.openstreetmap.josm.data.projection.Mercator;
    3333import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    34 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
    3534import org.xml.sax.SAXException;
    3635
     
    280279            assertEquals(w.id, way.id);
    281280            assertEquals(false, way.incomplete);
    282             assertEquals(10, w.nodes.size());
     281            assertEquals(10, w.getNodesCount());
    283282        }
    284283    }
     
    326325        for (Way way: referers.ways) {
    327326            Way orig = (Way)ds.getPrimitiveById(way.id);
    328             for(Node n: orig.nodes) {
     327            for(Node n: orig.getNodes()) {
    329328                expectedNodeIds.add(n.id);
    330329            }
     
    417416        HashSet<Long> ret = new HashSet<Long>();
    418417        if (way == null)return ret;
    419         for (Node n: way.nodes) {
     418        for (Node n: way.getNodes()) {
    420419            ret.add(n.id);
    421420        }
Note: See TracChangeset for help on using the changeset viewer.