Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 1622) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 1631) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.gui.conflict.nodes; +import static org.fest.reflect.core.Reflection.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,5 +9,4 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -17,23 +17,19 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; -import static org.fest.reflect.core.Reflection.field; public class NodeListMergeModelTest { - - protected List inspectNodeList(NodeListMergeModel model, String name) throws NoSuchFieldException, IllegalAccessException{ - Field f = NodeListMergeModel.class.getDeclaredField(name); - f.setAccessible(true); - Object o = f.get(model); - return (List)o; - } - + + protected List inspectNodeList(NodeListMergeModel model, String name) { + return field(name).ofType(ArrayList.class) + .in(model) + .get(); + } + protected DefaultListSelectionModel inspectListSelectionModel(NodeListMergeModel model, String name) throws NoSuchFieldException, IllegalAccessException { - Field f = NodeListMergeModel.class.getDeclaredField(name); - f.setAccessible(true); - Object o = f.get(model); - return (DefaultListSelectionModel)o; - - } - + return field(name).ofType(DefaultListSelectionModel.class) + .in(model) + .get(); + } + protected void ensureSelected(DefaultListSelectionModel model, Object... idx) { if (idx == null) return; @@ -43,107 +39,107 @@ assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); break; - } + } try { - int rows[] = (int[])idx[i]; - if (rows == null || rows.length != 2) { - fail("illegal selection range. Either null or not length 2: " + rows); - } - if (rows[0] > rows[1]) { - fail("illegal selection range. lower bound > upper bound "); - } - for (int j = rows[0]; j <= rows[1]; j++) { - assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); - } + int rows[] = (int[])idx[i]; + if (rows == null || rows.length != 2) { + fail("illegal selection range. Either null or not length 2: " + rows); + } + if (rows[0] > rows[1]) { + fail("illegal selection range. lower bound > upper bound "); + } + for (int j = rows[0]; j <= rows[1]; j++) { + assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); + } } catch(ClassCastException e) { fail("illegal selection range:" + idx[i]); - } + } } } - + @Test public void test_copyMyNodesToTop_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - model.copyMyNodesToTop(new int[]{0}); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + model.copyMyToTop(new int[]{0}); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); + assertEquals(1, mergedNodes.size()); assertEquals(2, mergedNodes.get(0).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0); - - } - - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0); + + } + + @Test public void test_copyMyNodesToTop_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToTop(new int[]{0}); - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToTop(new int[]{0}); + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(2, mergedNodes.size()); assertEquals(2, mergedNodes.get(0).id); assertEquals(1, mergedNodes.get(1).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0); - - } - - - - - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0); + + } + + + + + @Test public void test_copyMyNodesToTop_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToTop(new int[]{1}); // copy node 3 - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToTop(new int[]{1}); // copy node 3 + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(2, mergedNodes.size()); assertEquals(3, mergedNodes.get(0).id); // my node 3 at position 0 assertEquals(1, mergedNodes.get(1).id); // already merged node 1 at position 1 - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0); - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0); + } + @Test public void test_copyMyNodesToTop_4() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - + Way myWay = new Way(1); myWay.nodes.add(new Node(2)); @@ -154,98 +150,98 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToTop(new int[]{1,2}); // copy node 3 and 4 - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToTop(new int[]{1,2}); // copy node 3 and 4 + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(3, mergedNodes.size()); assertEquals(3, mergedNodes.get(0).id); // my node 3 at position 0 assertEquals(4, mergedNodes.get(1).id); // my node 4 at position 1 assertEquals(1, mergedNodes.get(2).id); // already merged node 1 at position 2 - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0,1); // first two rows selected - } - - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0,1); // first two rows selected + } + + @Test public void test_copyMyNodesToEnd_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - model.copyMyNodesToEnd(new int[]{0}); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + model.copyMyToEnd(new int[]{0}); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); + assertEquals(1, mergedNodes.size()); assertEquals(2, mergedNodes.get(0).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0); - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0); + } + @Test public void test_copyMyNodesToEnd_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToEnd(new int[]{0}); - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToEnd(new int[]{0}); + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(2, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 assertEquals(2, mergedNodes.get(1).id); // copied node 2 at position 1 - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 1); - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 1); + } + @Test public void test_copyMyNodesToEnd_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToEnd(new int[]{1}); // copy node 3 - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToEnd(new int[]{1}); // copy node 3 + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(2, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 assertEquals(3, mergedNodes.get(1).id); // my node 3 at position 1 - - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 1); - } - + + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 1); + } + @Test public void test_copyMyNodesToEnd_4() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - + Way myWay = new Way(1); myWay.nodes.add(new Node(2)); @@ -256,10 +252,10 @@ model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(1)); - model.copyMyNodesToEnd(new int[]{1,2}); // copy node 3 and 4 - - mergedNodes = inspectNodeList(model, "mergedNodes"); + model.copyMyToEnd(new int[]{1,2}); // copy node 3 and 4 + + mergedNodes = inspectNodeList(model, "mergedEntries"); assertEquals(3, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // already merged node 1 at position 0 @@ -267,99 +263,99 @@ assertEquals(4, mergedNodes.get(2).id); // my node 4 at position 2 - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 1,2); // last two rows selected - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 1,2); // last two rows selected + } + /* ----------------------------------------------------------------------------- */ /* copyMyNodesBeforeCurrent */ /* ----------------------------------------------------------------------------- */ - + @Test public void test_copyMyNodesBeforeCurrent_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.copyMyNodesBeforeCurrent(new int[]{0}, 1); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.copyMyBeforeCurrent(new int[]{0}, 1); + assertEquals(4, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); // already merged node + assertEquals(10, mergedNodes.get(0).id); // already merged node assertEquals(1, mergedNodes.get(1).id); // copied node 1 at position 1 - assertEquals(11, mergedNodes.get(2).id); // already merged node - assertEquals(12, mergedNodes.get(3).id); // already merged node - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 1); // position 1 selected - } - - + assertEquals(11, mergedNodes.get(2).id); // already merged node + assertEquals(12, mergedNodes.get(3).id); // already merged node + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 1); // position 1 selected + } + + @Test public void test_copyMyNodesBeforeCurrent_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.copyMyNodesBeforeCurrent(new int[]{0,1}, 0); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.copyMyBeforeCurrent(new int[]{0,1}, 0); + assertEquals(5, mergedNodes.size()); assertEquals(1, mergedNodes.get(0).id); // copied node 1 at position 0 assertEquals(2, mergedNodes.get(1).id); // copied node 2 at position 1 - assertEquals(10, mergedNodes.get(2).id); // already merged node - assertEquals(11, mergedNodes.get(3).id); // already merged node - assertEquals(12, mergedNodes.get(4).id); // already merged node - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0,1); // position 0 and 1 selected - } - + assertEquals(10, mergedNodes.get(2).id); // already merged node + assertEquals(11, mergedNodes.get(3).id); // already merged node + assertEquals(12, mergedNodes.get(4).id); // already merged node + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0,1); // position 0 and 1 selected + } + @Test public void test_copyMyNodesBeforeCurrent_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - try { - model.copyMyNodesBeforeCurrent(new int[]{0,1}, -1); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + try { + model.copyMyBeforeCurrent(new int[]{0,1}, -1); fail("expected IllegalArgumentException"); } catch(IllegalArgumentException e) { // OK } - - try { - model.copyMyNodesBeforeCurrent(new int[]{0,1}, 3); + + try { + model.copyMyBeforeCurrent(new int[]{0,1}, 3); fail("expected IllegalArgumentException"); } catch(IllegalArgumentException e) { // OK - } - } - + } + } + /* ----------------------------------------------------------------------------- */ /* copyMyNodesAfterCurrent */ @@ -368,118 +364,118 @@ public void test_copyMyNodesAfterCurrent_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.copyMyNodesAfterCurrent(new int[]{0}, 1); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.copyMyAfterCurrent(new int[]{0}, 1); + assertEquals(4, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); // already merged node - assertEquals(11, mergedNodes.get(1).id); // already merged node + assertEquals(10, mergedNodes.get(0).id); // already merged node + assertEquals(11, mergedNodes.get(1).id); // already merged node assertEquals(1, mergedNodes.get(2).id); // copied node 1 at position 2 - assertEquals(12, mergedNodes.get(3).id); // already merged node - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 2); // position 1 selected - } - - + assertEquals(12, mergedNodes.get(3).id); // already merged node + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 2); // position 1 selected + } + + @Test public void test_copyMyNodesAfterCurrent_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.copyMyNodesAfterCurrent(new int[]{0,1}, 2); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.copyMyAfterCurrent(new int[]{0,1}, 2); + assertEquals(5, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); // already merged node + assertEquals(10, mergedNodes.get(0).id); // already merged node assertEquals(11, mergedNodes.get(1).id); // already merged node assertEquals(12, mergedNodes.get(2).id); // already merged node assertEquals(1, mergedNodes.get(3).id); // copied node 1 at position 3 assertEquals(2, mergedNodes.get(4).id); // copied node 2 at position 4 - - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 3,4); // position 3,4 selected - } - + + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 3,4); // position 3,4 selected + } + @Test public void test_copyMyNodesAfterCurrent_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - myWay.nodes.add(new Node(3)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.copyMyNodesAfterCurrent(new int[]{0,2}, 0); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + myWay.nodes.add(new Node(3)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.copyMyAfterCurrent(new int[]{0,2}, 0); + assertEquals(5, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); // already merged node + assertEquals(10, mergedNodes.get(0).id); // already merged node assertEquals(1, mergedNodes.get(1).id); // copied node 1 at position 1 assertEquals(3, mergedNodes.get(2).id); // copied node 3 at position 2 assertEquals(11, mergedNodes.get(3).id); // already merged node assertEquals(12, mergedNodes.get(4).id); // already merged node - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 1,2); // position 1,2 selected - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 1,2); // position 1,2 selected + } + @Test public void test_copyMyNodesAfterCurrent_4() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - try { - model.copyMyNodesAfterCurrent(new int[]{0,1}, -1); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + try { + model.copyMyAfterCurrent(new int[]{0,1}, -1); fail("expected IllegalArgumentException"); } catch(IllegalArgumentException e) { // OK } - - try { - model.copyMyNodesAfterCurrent(new int[]{0,1}, 3); + + try { + model.copyMyAfterCurrent(new int[]{0,1}, 3); fail("expected IllegalArgumentException"); } catch(IllegalArgumentException e) { // OK - } - } - + } + } + /* ----------------------------------------------------------------------------- */ /* moveUpMergedNodes */ @@ -488,38 +484,38 @@ public void test_moveUpMergedNodes_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.moveUpMergedNodes(new int[]{1}); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.moveUpMerged(new int[]{1}); + assertEquals(3, mergedNodes.size()); - assertEquals(11, mergedNodes.get(0).id); - assertEquals(10, mergedNodes.get(1).id); - assertEquals(12, mergedNodes.get(2).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0); // position 1 selecte0 - } - + assertEquals(11, mergedNodes.get(0).id); + assertEquals(10, mergedNodes.get(1).id); + assertEquals(12, mergedNodes.get(2).id); + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0); // position 1 selecte0 + } + @Test public void test_moveUpMergedNodes_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -527,29 +523,29 @@ mergedNodes.add(new Node(13)); mergedNodes.add(new Node(14)); - - model.moveUpMergedNodes(new int[]{1,4}); - + + model.moveUpMerged(new int[]{1,4}); + assertEquals(5, mergedNodes.size()); - assertEquals(11, mergedNodes.get(0).id); - assertEquals(10, mergedNodes.get(1).id); - assertEquals(12, mergedNodes.get(2).id); + assertEquals(11, mergedNodes.get(0).id); + assertEquals(10, mergedNodes.get(1).id); + assertEquals(12, mergedNodes.get(2).id); assertEquals(14, mergedNodes.get(3).id); assertEquals(13, mergedNodes.get(4).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0,3); // position 0 and 3 selecte0 - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0,3); // position 0 and 3 selecte0 + } + @Test public void test_moveUpMergedNodes_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -557,18 +553,18 @@ mergedNodes.add(new Node(13)); mergedNodes.add(new Node(14)); - - model.moveUpMergedNodes(new int[]{1,2,3,4}); - + + model.moveUpMerged(new int[]{1,2,3,4}); + assertEquals(5, mergedNodes.size()); - assertEquals(11, mergedNodes.get(0).id); - assertEquals(12, mergedNodes.get(1).id); + assertEquals(11, mergedNodes.get(0).id); + assertEquals(12, mergedNodes.get(1).id); assertEquals(13, mergedNodes.get(2).id); assertEquals(14, mergedNodes.get(3).id); - assertEquals(10, mergedNodes.get(4).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 0,1,2,3); - } - + assertEquals(10, mergedNodes.get(4).id); + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 0,1,2,3); + } + /* ----------------------------------------------------------------------------- */ /* moveDownMergedNodes */ @@ -577,38 +573,38 @@ public void test_moveDownMergedNodes_1() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); - mergedNodes.add(new Node(10)); - mergedNodes.add(new Node(11)); - mergedNodes.add(new Node(12)); - - model.moveDownMergedNodes(new int[]{1}); - + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); + mergedNodes.add(new Node(10)); + mergedNodes.add(new Node(11)); + mergedNodes.add(new Node(12)); + + model.moveDownMerged(new int[]{1}); + assertEquals(3, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); - assertEquals(12, mergedNodes.get(1).id); - assertEquals(11, mergedNodes.get(2).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 2); - } - + assertEquals(10, mergedNodes.get(0).id); + assertEquals(12, mergedNodes.get(1).id); + assertEquals(11, mergedNodes.get(2).id); + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 2); + } + @Test public void test_moveDownMergedNodes_2() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -616,29 +612,29 @@ mergedNodes.add(new Node(13)); mergedNodes.add(new Node(14)); - - model.moveDownMergedNodes(new int[]{1,3}); - + + model.moveDownMerged(new int[]{1,3}); + assertEquals(5, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); - assertEquals(12, mergedNodes.get(1).id); - assertEquals(11, mergedNodes.get(2).id); + assertEquals(10, mergedNodes.get(0).id); + assertEquals(12, mergedNodes.get(1).id); + assertEquals(11, mergedNodes.get(2).id); assertEquals(14, mergedNodes.get(3).id); assertEquals(13, mergedNodes.get(4).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 2,4); - } - + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 2,4); + } + @Test public void test_moveDownMergedNodes_3() throws IllegalAccessException, NoSuchFieldException { NodeListMergeModel model = new NodeListMergeModel(); - - Way myWay = new Way(1); - myWay.nodes.add(new Node(1)); - myWay.nodes.add(new Node(2)); - Way theirWay = new Way(1); - - model.populate(myWay, theirWay); - List mergedNodes = inspectNodeList(model, "mergedNodes"); + + Way myWay = new Way(1); + myWay.nodes.add(new Node(1)); + myWay.nodes.add(new Node(2)); + Way theirWay = new Way(1); + + model.populate(myWay, theirWay); + List mergedNodes = inspectNodeList(model, "mergedEntries"); mergedNodes.add(new Node(10)); mergedNodes.add(new Node(11)); @@ -646,18 +642,18 @@ mergedNodes.add(new Node(13)); mergedNodes.add(new Node(14)); - - model.moveDownMergedNodes(new int[]{1,2,3}); - + + model.moveDownMerged(new int[]{1,2,3}); + assertEquals(5, mergedNodes.size()); - assertEquals(10, mergedNodes.get(0).id); - assertEquals(14, mergedNodes.get(1).id); + assertEquals(10, mergedNodes.get(0).id); + assertEquals(14, mergedNodes.get(1).id); assertEquals(11, mergedNodes.get(2).id); assertEquals(12, mergedNodes.get(3).id); - assertEquals(13, mergedNodes.get(4).id); - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedNodesSelectionModel"); - ensureSelected(mergedSelection, 2,3,4); - } - + assertEquals(13, mergedNodes.get(4).id); + + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 2,3,4); + } + /* ----------------------------------------------------------------------------- */ /* PropertyChangeListener */ @@ -666,43 +662,43 @@ public void addPropertyChangeListener() { NodeListMergeModel model = new NodeListMergeModel(); - + PropertyChangeListener listener = new PropertyChangeListener() { - @Override + public void propertyChange(PropertyChangeEvent evt) { } }; - + model.addPropertyChangeListener(listener); - + ArrayList listeners = field("listeners") - .ofType(ArrayList.class) - .in(model) - .get(); - + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(1, listeners.size()); assertEquals(listener, listeners.get(0)); } - + @Test public void removePropertyChangeListener() { NodeListMergeModel model = new NodeListMergeModel(); - + PropertyChangeListener listener = new PropertyChangeListener() { - @Override + public void propertyChange(PropertyChangeEvent evt) { } }; - + model.addPropertyChangeListener(listener); model.removePropertyChangeListener(listener); - + ArrayList listeners = field("listeners") - .ofType(ArrayList.class) - .in(model) - .get(); - + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(0, listeners.size()); } - + /* ----------------------------------------------------------------------------- */ /* property frozen */ @@ -721,8 +717,8 @@ public void setFrozenWithPropertyChangeNotification() { NodeListMergeModel model = new NodeListMergeModel(); - + class MyListener implements PropertyChangeListener { public ArrayList events = new ArrayList(); - @Override + public void propertyChange(PropertyChangeEvent evt) { events.add(evt); @@ -734,5 +730,5 @@ model.setFrozen(!oldValue); assertEquals(!oldValue, model.isFrozen()); - + assertEquals(1, listener.events.size()); assertEquals(oldValue, listener.events.get(0).getOldValue()); Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (revision 1622) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (revision 1631) @@ -19,28 +19,28 @@ TagMergeModel model = new TagMergeModel(); } - + @Test public void addPropertyChangeListener() { TagMergeModel model = new TagMergeModel(); PropertyChangeListener listener = new PropertyChangeListener() { - @Override + public void propertyChange(PropertyChangeEvent evt) { } }; model.addPropertyChangeListener(listener); - + ArrayList list = field("listeners").ofType(ArrayList.class) - .in(model) - .get(); - - assertEquals(1, list.size()); - assertEquals(listener, list.get(0)); - } - + .in(model) + .get(); + + assertEquals(1, list.size()); + assertEquals(listener, list.get(0)); + } + @Test public void removePropertyChangeListener() { TagMergeModel model = new TagMergeModel(); PropertyChangeListener listener = new PropertyChangeListener() { - @Override + public void propertyChange(PropertyChangeEvent evt) { } @@ -48,13 +48,13 @@ model.addPropertyChangeListener(listener); model.removePropertyChangeListener(listener); - + ArrayList list = field("listeners") - .ofType(ArrayList.class) - .in(model) - .get(); - - assertEquals(0, list.size()); - } - + .ofType(ArrayList.class) + .in(model) + .get(); + + assertEquals(0, list.size()); + } + @Test public void populateNoConflichts() { @@ -63,13 +63,13 @@ TagMergeModel model = new TagMergeModel(); model.populate(my, their); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(0, list.size()); } - + @Test public void populateNoConflicts1() { @@ -80,13 +80,13 @@ TagMergeModel model = new TagMergeModel(); model.populate(my, their); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(0, list.size()); } - + @Test public void populateMissingKeyMine() { @@ -96,10 +96,10 @@ TagMergeModel model = new TagMergeModel(); model.populate(my, their); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(1, list.size()); TagMergeItem item = list.get(0); @@ -109,18 +109,18 @@ assertEquals("value", item.getTheirTagValue()); } - + @Test public void populateMissingKeyTheir() { Node my = new Node(1); my.put("key", "value"); - Node their = new Node(1); - TagMergeModel model = new TagMergeModel(); - model.populate(my, their); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + Node their = new Node(1); + TagMergeModel model = new TagMergeModel(); + model.populate(my, their); + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(1, list.size()); TagMergeItem item = list.get(0); @@ -130,5 +130,5 @@ assertEquals("value", item.getMyTagValue()); } - + @Test public void populateConflictingValues() { @@ -139,10 +139,10 @@ TagMergeModel model = new TagMergeModel(); model.populate(my, their); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(1, list.size()); TagMergeItem item = list.get(0); @@ -152,5 +152,5 @@ assertEquals("theirvalue", item.getTheirTagValue()); } - + @Test public void addItem() { @@ -158,10 +158,10 @@ TagMergeModel model = new TagMergeModel(); model.addItem(item); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(1, list.size()); item = list.get(0); @@ -171,5 +171,5 @@ assertEquals("theirvalue", item.getTheirTagValue()); } - + @Test public void decide() { @@ -177,29 +177,29 @@ TagMergeModel model = new TagMergeModel(); model.addItem(item); - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - - model.decide(0, MergeDecisionType.KEEP_MINE); + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + + model.decide(0, MergeDecisionType.KEEP_MINE); assertEquals(1, list.size()); item = list.get(0); assertEquals(MergeDecisionType.KEEP_MINE, item.getMergeDecision()); - - model.decide(0, MergeDecisionType.KEEP_THEIR); + + model.decide(0, MergeDecisionType.KEEP_THEIR); assertEquals(1, list.size()); item = list.get(0); assertEquals(MergeDecisionType.KEEP_THEIR, item.getMergeDecision()); - - model.decide(0, MergeDecisionType.UNDECIDED); - assertEquals(1, list.size()); - item = list.get(0); - assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); - } - + + model.decide(0, MergeDecisionType.UNDECIDED); + assertEquals(1, list.size()); + item = list.get(0); + assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); + } + @Test public void decideMultiple() { - + TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); TagMergeModel model = new TagMergeModel(); @@ -207,13 +207,13 @@ model.addItem(new TagMergeItem("key-" + i, "myvalue-" + i, "theirvalue-" +i)); } - - ArrayList list = field("tagMergeItems") - .ofType(ArrayList.class) - .in(model) - .get(); - + + ArrayList list = field("tagMergeItems") + .ofType(ArrayList.class) + .in(model) + .get(); + assertEquals(10, list.size()); - - model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); + + model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); for (int i = 0; i< 10; i++) { item = list.get(i);