Changeset 2292 in josm for trunk/test/unit


Ignore:
Timestamp:
2009-10-15T22:24:12+02:00 (10 years ago)
Author:
Gubaer
Message:

Updated test case

File:
1 edited

Legend:

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

    r2252 r2292  
    382382        n.setCoor(new LatLon(0,0));
    383383        n.put("key1", "value1");
    384         n.user = myUser;
     384        n.setUser(myUser);
    385385        n.setTimestamp(cal.getTime());
    386386
     
    395395        Date timestamp = cal.getTime();
    396396        n1.setTimestamp(timestamp);
    397         n1.user = theirUser;
     397        n1.setUser(theirUser);
    398398        their.addPrimitive(n1);
    399399
     
    406406        assertEquals("value1",n2.get("key1"));
    407407        assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp()));
    408         assertEquals(theirUser,n2.user);
     408        assertEquals(theirUser,n2.getUser());
    409409    }
    410410
     
    740740        theirWay.addNode(n3);
    741741        theirWay.addNode(n4);
    742         theirWay.user = User.createOsmUser(1111, "their");
     742        theirWay.setUser(User.createOsmUser(1111, "their"));
    743743        theirWay.setTimestamp(new Date());
    744744        their.addPrimitive(theirWay);
     
    748748
    749749        assertEquals(0,visitor.getConflicts().size());
    750         assertEquals("their", myWay.user.getName());
    751         assertEquals(1111, myWay.user.getId());
    752         assertEquals(1111, myWay.user.getId());
     750        assertEquals("their", myWay.getUser().getName());
     751        assertEquals(1111, myWay.getUser().getId());
     752        assertEquals(1111, myWay.getUser().getId());
    753753        assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());
    754754    }
     
    789789        theirWay.addNode(n3);
    790790        theirWay.addNode(n4);
    791         theirWay.user = User.createOsmUser(1111, "their");
     791        theirWay.setUser(User.createOsmUser(1111, "their"));
    792792        theirWay.setTimestamp(new Date());
    793793        their.addPrimitive(theirWay);
     
    797797
    798798        assertEquals(0,visitor.getConflicts().size());
    799         assertEquals("their", myWay.user.getName());
    800         assertEquals(1111, myWay.user.getId());
    801         assertEquals(1111, myWay.user.getId());
     799        assertEquals("their", myWay.getUser().getName());
     800        assertEquals(1111, myWay.getUser().getId());
     801        assertEquals(1111, myWay.getUser().getId());
    802802        assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());
    803803    }
     
    844844        theirWay.addNode(n4);
    845845        theirWay.addNode(n5);
    846         theirWay.user = User.createOsmUser(1111, "their");
     846        theirWay.setUser(User.createOsmUser(1111, "their"));
    847847        theirWay.setTimestamp(new Date());
    848848        their.addPrimitive(theirWay);
Note: See TracChangeset for help on using the changeset viewer.