Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1912)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1926)
@@ -2,7 +2,11 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -13,6 +17,4 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-
-import static org.junit.Assert.*;
 
 public class MergeSourceBuildingVisitorTest {
@@ -195,5 +197,5 @@
         r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
         assertTrue(r.members.contains(m));
@@ -254,5 +256,5 @@
         r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
         assertTrue(r.members.contains(m));
@@ -319,5 +321,5 @@
         r = (Relation)lookupByName(hull.relations, "r1");
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20"));
         assertTrue(r.members.contains(m));
@@ -343,5 +345,5 @@
         Relation r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(1, r.members.size());
+        assertEquals(1, r.getMembersCount());
         assertTrue(r.members.contains(new RelationMember("relation-1",r)));
     }
@@ -363,5 +365,5 @@
         Relation r = (Relation)lookupByName(hull.relations, "r1");
         assertNotNull(r);
-        assertEquals(1, r.members.size());
+        assertEquals(1, r.getMembersCount());
         assertTrue(r.members.contains(new RelationMember("relation-1",r)));
     }
@@ -387,7 +389,7 @@
         r2 = (Relation)hull.getPrimitiveById(2);
         assertNotNull(r2);
-        assertEquals(1, r1.members.size());
+        assertEquals(1, r1.getMembersCount());
         assertTrue(r1.members.contains(new RelationMember("relation-2",r2)));
-        assertEquals(1, r2.members.size());
+        assertEquals(1, r2.getMembersCount());
         assertTrue(r2.members.contains(new RelationMember("relation-1",r1)));
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1912)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1926)
@@ -972,5 +972,5 @@
 
         Relation r = (Relation)my.getPrimitiveById(4);
-        assertEquals(2, r.members.size());
+        assertEquals(2, r.getMembersCount());
 
         Node n = (Node)my.getPrimitiveById(1);