Changeset 1912 in josm for trunk/test


Ignore:
Timestamp:
2009-08-05T10:25:23+02:00 (10 years ago)
Author:
Gubaer
Message:

Updated w.getNodes().contains(..) to w.containsNode(...)

Location:
trunk/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

    r1910 r1912  
    2020    protected void populate() {
    2121        Way w1 = new Way(1);
    22           w1.addNode(new Node(10));
    23           w1.addNode(new Node(11));
     22        w1.addNode(new Node(10));
     23        w1.addNode(new Node(11));
    2424
    2525        Way w2 = new Way(1);
    26           w2.addNode(new Node(10));
    27           w2.addNode(new Node(11));
     26        w2.addNode(new Node(10));
     27        w2.addNode(new Node(11));
    2828
    29        dialog.getConflictResolver().populate(w1, w2);
     29        dialog.getConflictResolver().populate(w1, w2);
    3030    }
    3131
  • trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

    r1910 r1912  
    22package org.openstreetmap.josm.data.osm.visitor;
    33
    4 import static org.junit.Assert.assertEquals;
    5 import static org.junit.Assert.assertNotNull;
    6 import static org.junit.Assert.assertNull;
    7 import static org.junit.Assert.assertTrue;
    8 
    94import java.util.Collection;
    105
     6import org.junit.Ignore;
    117import org.junit.Test;
    128import org.openstreetmap.josm.data.coor.LatLon;
     
    1713import org.openstreetmap.josm.data.osm.RelationMember;
    1814import org.openstreetmap.josm.data.osm.Way;
     15
     16import static org.junit.Assert.*;
    1917
    2018public class MergeSourceBuildingVisitorTest {
     
    186184        Node n = (Node)hull.getPrimitiveById(21);
    187185        assertNotNull(n);
    188         assertTrue(w.getNodes().contains(n));
     186        assertTrue(w.containsNode(n));
    189187
    190188        n = (Node)hull.getPrimitiveById(22);
    191189        assertNotNull(n);
    192         assertTrue(w.getNodes().contains(n));
     190        assertTrue(w.containsNode(n));
    193191
    194192        Relation r = (Relation)hull.getPrimitiveById(40);
     
    310308        Node n = (Node)lookupByName(hull.nodes, "n21");
    311309        assertNotNull(n);
    312         assertTrue(w.getNodes().contains(n));
     310        assertTrue(w.containsNode(n));
    313311
    314312        n = (Node)lookupByName(hull.nodes, "n22");
    315313        assertNotNull(n);
    316         assertTrue(w.getNodes().contains(n));
     314        assertTrue(w.containsNode(n));
    317315
    318316        Relation r = (Relation)lookupByName(hull.relations, "r40");
Note: See TracChangeset for help on using the changeset viewer.