Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 1631) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 1650) @@ -3,4 +3,5 @@ import static org.fest.reflect.core.Reflection.field; +import static org.fest.reflect.core.Reflection.method; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -21,7 +22,8 @@ protected List inspectNodeList(NodeListMergeModel model, String name) { - return field(name).ofType(ArrayList.class) + return method("get" + name + "Entries") + .withReturnType(List.class) .in(model) - .get(); + .invoke(); } @@ -69,5 +71,5 @@ model.copyMyToTop(new int[]{0}); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); assertEquals(1, mergedNodes.size()); @@ -92,10 +94,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToTop(new int[]{0}); - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(2, mergedNodes.size()); assertEquals(2, mergedNodes.get(0).id); @@ -123,10 +125,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToTop(new int[]{1}); // copy node 3 - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(2, mergedNodes.size()); assertEquals(3, mergedNodes.get(0).id); // my node 3 at position 0 @@ -150,10 +152,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToTop(new int[]{1,2}); // copy node 3 and 4 - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(3, mergedNodes.size()); assertEquals(3, mergedNodes.get(0).id); // my node 3 at position 0 @@ -178,5 +180,5 @@ model.copyMyToEnd(new int[]{0}); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); assertEquals(1, mergedNodes.size()); @@ -198,10 +200,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToEnd(new int[]{0}); - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(2, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 @@ -224,10 +226,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToEnd(new int[]{1}); // copy node 3 - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(2, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 @@ -252,10 +254,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(1)); model.copyMyToEnd(new int[]{1,2}); // copy node 3 and 4 - mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes = inspectNodeList(model, "Merged"); assertEquals(3, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 @@ -282,5 +284,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -310,5 +312,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -338,5 +340,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -371,5 +373,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -400,5 +402,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -430,5 +432,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -458,5 +460,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -491,5 +493,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -517,5 +519,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -547,5 +549,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -580,5 +582,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -606,5 +608,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -636,5 +638,5 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedEntries"); + List mergedNodes = inspectNodeList(model, "Merged"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11));