Changeset 3025 in josm for trunk/test/unit/org/openstreetmap/josm/gui
- Timestamp:
- 2010-02-19T21:43:42+01:00 (14 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui/conflict
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
r2990 r3025 17 17 18 18 import org.junit.Test; 19 import org.openstreetmap.josm.data.osm.DatasetFactory; 19 20 import org.openstreetmap.josm.data.osm.Node; 20 21 import org.openstreetmap.josm.data.osm.Way; … … 23 24 public class NodeListMergeModelTest { 24 25 26 private DatasetFactory my = new DatasetFactory(); 27 private DatasetFactory their = new DatasetFactory(); 28 29 @SuppressWarnings("unchecked") 25 30 protected List<Node> inspectNodeList(NodeListMergeModel model, String name) { 26 31 return method("get" + name + "Entries") … … 46 51 try { 47 52 int rows[] = (int[])idx[i]; 48 if (rows == null || rows.length != 2) {53 if (rows.length != 2) { 49 54 fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows)); 50 55 } … … 65 70 NodeListMergeModel model = new NodeListMergeModel(); 66 71 67 Way myWay = new Way(1, 1); 68 myWay.addNode(new Node(2)); 69 myWay.addNode(new Node(3)); 70 Way theirWay = new Way(1); 72 Way myWay = my.addWay(1, 1); 73 myWay.addNode(my.addNode(2)); 74 myWay.addNode(my.addNode(3)); 75 76 Way theirWay = their.addWay(1); 71 77 72 78 model.populate(myWay, theirWay); … … 88 94 NodeListMergeModel model = new NodeListMergeModel(); 89 95 90 91 Way myWay = new Way(1, 1);92 myWay.addNode( new Node(2));93 myWay.addNode(new Node(3)); 94 Way theirWay = newWay(1);96 Way myWay = my.addWay(1, 1); 97 myWay.addNode(my.addNode(2)); 98 myWay.addNode(my.addNode(3)); 99 100 Way theirWay = their.addWay(1); 95 101 96 102 model.populate(myWay, theirWay); … … 111 117 } 112 118 113 114 115 116 117 119 @Test 118 120 public void test_copyMyNodesToTop_3() { 119 121 NodeListMergeModel model = new NodeListMergeModel(); 120 122 121 122 Way myWay = new Way(1, 1); 123 myWay.addNode(new Node(2)); 124 myWay.addNode(new Node(3)); 125 Way theirWay = new Way(1); 123 Way myWay = my.addWay(1, 1); 124 myWay.addNode(my.addNode(2)); 125 myWay.addNode(my.addNode(3)); 126 Way theirWay = their.addWay(1); 126 127 127 128 … … 146 147 NodeListMergeModel model = new NodeListMergeModel(); 147 148 148 149 Way myWay = new Way(1, 1); 150 myWay.addNode(new Node(2)); 151 myWay.addNode(new Node(3)); 152 myWay.addNode(new Node(4)); 153 Way theirWay = new Way(1); 149 Way myWay = my.addWay(1, 1); 150 myWay.addNode(my.addNode(2)); 151 myWay.addNode(my.addNode(3)); 152 myWay.addNode(my.addNode(4)); 153 Way theirWay = their.addWay(1); 154 154 155 155 model.populate(myWay, theirWay); … … 175 175 NodeListMergeModel model = new NodeListMergeModel(); 176 176 177 Way myWay = newWay(1, 1);178 myWay.addNode( newNode(2));179 myWay.addNode( newNode(3));180 Way theirWay = newWay(1);177 Way myWay = my.addWay(1, 1); 178 myWay.addNode(my.addNode(2)); 179 myWay.addNode(my.addNode(3)); 180 Way theirWay = their.addWay(1); 181 181 182 182 model.populate(myWay, theirWay); … … 196 196 NodeListMergeModel model = new NodeListMergeModel(); 197 197 198 Way myWay = newWay(1, 1);199 myWay.addNode( newNode(2));200 myWay.addNode( newNode(3));201 Way theirWay = newWay(1);198 Way myWay = my.addWay(1, 1); 199 myWay.addNode(my.addNode(2)); 200 myWay.addNode(my.addNode(3)); 201 Way theirWay = their.addWay(1); 202 202 203 203 model.populate(myWay, theirWay); … … 222 222 223 223 224 Way myWay = newWay(1, 1);225 myWay.addNode( newNode(2));226 myWay.addNode( newNode(3));227 Way theirWay = newWay(1);224 Way myWay = my.addWay(1, 1); 225 myWay.addNode(my.addNode(2)); 226 myWay.addNode(my.addNode(3)); 227 Way theirWay = their.addWay(1); 228 228 229 229 model.populate(myWay, theirWay); … … 249 249 250 250 251 Way myWay = newWay(1, 1);252 myWay.addNode( newNode(2));253 myWay.addNode( newNode(3));254 myWay.addNode( newNode(4));255 Way theirWay = newWay(1);251 Way myWay = my.addWay(1, 1); 252 myWay.addNode(my.addNode(2)); 253 myWay.addNode(my.addNode(3)); 254 myWay.addNode(my.addNode(4)); 255 Way theirWay = their.addWay(1); 256 256 257 257 model.populate(myWay, theirWay); … … 281 281 NodeListMergeModel model = new NodeListMergeModel(); 282 282 283 Way myWay = newWay(1, 1);284 myWay.addNode( newNode(1));285 myWay.addNode( newNode(2));286 Way theirWay = newWay(1);283 Way myWay = my.addWay(1, 1); 284 myWay.addNode(my.addNode(1)); 285 myWay.addNode(my.addNode(2)); 286 Way theirWay = their.addWay(1); 287 287 288 288 model.populate(myWay, theirWay); … … 309 309 NodeListMergeModel model = new NodeListMergeModel(); 310 310 311 Way myWay = newWay(1, 1);312 myWay.addNode( newNode(1));313 myWay.addNode( newNode(2));314 Way theirWay = newWay(1);311 Way myWay = my.addWay(1, 1); 312 myWay.addNode(my.addNode(1)); 313 myWay.addNode(my.addNode(2)); 314 Way theirWay = their.addWay(1); 315 315 316 316 model.populate(myWay, theirWay); … … 337 337 NodeListMergeModel model = new NodeListMergeModel(); 338 338 339 Way myWay = newWay(1, 1);340 myWay.addNode( newNode(1));341 myWay.addNode( newNode(2));342 Way theirWay = newWay(1);339 Way myWay = my.addWay(1, 1); 340 myWay.addNode(my.addNode(1)); 341 myWay.addNode(my.addNode(2)); 342 Way theirWay = their.addWay(1); 343 343 344 344 model.populate(myWay, theirWay); … … 356 356 357 357 try { 358 model.copyMyBeforeCurrent(new int[]{0,1}, 3);358 model.copyMyBeforeCurrent(new int[]{0,1}, 4); 359 359 fail("expected IllegalArgumentException"); 360 360 } catch(IllegalArgumentException e) { … … 370 370 NodeListMergeModel model = new NodeListMergeModel(); 371 371 372 Way myWay = newWay(1, 1);373 myWay.addNode( newNode(1));374 myWay.addNode( newNode(2));375 Way theirWay = newWay(1);372 Way myWay = my.addWay(1, 1); 373 myWay.addNode(my.addNode(1)); 374 myWay.addNode(my.addNode(2)); 375 Way theirWay = their.addWay(1); 376 376 377 377 model.populate(myWay, theirWay); … … 398 398 NodeListMergeModel model = new NodeListMergeModel(); 399 399 400 Way myWay = newWay(1, 1);401 myWay.addNode( newNode(1));402 myWay.addNode( newNode(2));403 myWay.addNode( newNode(3));404 Way theirWay = newWay(1);400 Way myWay = my.addWay(1, 1); 401 myWay.addNode(my.addNode(1)); 402 myWay.addNode(my.addNode(2)); 403 myWay.addNode(my.addNode(3)); 404 Way theirWay = their.addWay(1); 405 405 406 406 model.populate(myWay, theirWay); … … 428 428 NodeListMergeModel model = new NodeListMergeModel(); 429 429 430 Way myWay = newWay(1, 1);431 myWay.addNode( newNode(1));432 myWay.addNode( newNode(2));433 myWay.addNode( newNode(3));434 Way theirWay = newWay(1);430 Way myWay = my.addWay(1, 1); 431 myWay.addNode(my.addNode(1)); 432 myWay.addNode(my.addNode(2)); 433 myWay.addNode(my.addNode(3)); 434 Way theirWay = their.addWay(1); 435 435 436 436 model.populate(myWay, theirWay); … … 453 453 } 454 454 455 @Test456 public void test_copyMyNodesAfterCurrent_4() {457 NodeListMergeModel model = new NodeListMergeModel();458 459 Way myWay = new Way(1, 1);460 myWay.addNode(new Node(1));461 myWay.addNode(new Node(2));462 Way theirWay = new Way(1);463 464 model.populate(myWay, theirWay);465 List<Node> mergedNodes = inspectNodeList(model, "Merged");466 mergedNodes.add(new Node(10));467 mergedNodes.add(new Node(11));468 mergedNodes.add(new Node(12));469 470 try {471 model.copyMyAfterCurrent(new int[]{0,1}, -1);472 fail("expected IllegalArgumentException");473 } catch(IllegalArgumentException e) {474 // OK475 }476 477 try {478 model.copyMyAfterCurrent(new int[]{0,1}, 3);479 fail("expected IllegalArgumentException");480 } catch(IllegalArgumentException e) {481 // OK482 }483 }484 455 485 456 /* ----------------------------------------------------------------------------- */ … … 664 635 /* PropertyChangeListener */ 665 636 /* ----------------------------------------------------------------------------- */ 637 @SuppressWarnings("unchecked") 666 638 @Test 667 639 public void addPropertyChangeListener() { … … 676 648 model.addPropertyChangeListener(listener); 677 649 678 ArrayList<PropertyChangeListener> listeners = field("listeners")679 .ofType( ArrayList.class)650 List<PropertyChangeListener> listeners = field("listeners") 651 .ofType(List.class) 680 652 .in(model) 681 653 .get(); … … 685 657 } 686 658 659 @SuppressWarnings("unchecked") 687 660 @Test 688 661 public void removePropertyChangeListener() { … … 698 671 model.removePropertyChangeListener(listener); 699 672 700 ArrayList<PropertyChangeListener> listeners = field("listeners")701 .ofType( ArrayList.class)673 List<PropertyChangeListener> listeners = field("listeners") 674 .ofType(List.class) 702 675 .in(model) 703 676 .get(); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
r1954 r3025 2 2 package org.openstreetmap.josm.gui.conflict.properties; 3 3 4 import static org.junit.Assert.assertEquals; 4 5 import static org.junit.Assert.assertFalse; 5 6 import static org.junit.Assert.assertTrue; 6 import static org.junit.Assert.*;7 7 8 8 import java.util.Observable; … … 13 13 import org.openstreetmap.josm.Main; 14 14 import org.openstreetmap.josm.data.coor.LatLon; 15 import org.openstreetmap.josm.data.osm.DataSet; 15 16 import org.openstreetmap.josm.data.osm.Node; 16 17 import org.openstreetmap.josm.data.osm.Relation; … … 48 49 @Test 49 50 public void populate() { 51 DataSet d1 = new DataSet(); 52 DataSet d2 = new DataSet(); 50 53 Node n1 = new Node(1); 51 54 Node n2 = new Node(1); 55 d1.addPrimitive(n1); 56 d2.addPrimitive(n2); 52 57 model.populate(n1, n2); 53 58 54 59 Way w1 = new Way(1); 55 60 Way w2 = new Way(1); 61 d1.addPrimitive(w1); 62 d2.addPrimitive(w2); 56 63 model.populate(w2, w2); 57 64 58 65 Relation r1 = new Relation(1); 59 66 Relation r2 = new Relation(1); 67 d1.addPrimitive(r1); 68 d2.addPrimitive(r2); 60 69 model.populate(r1, r2); 61 70 } … … 63 72 @Test 64 73 public void decidingAboutCoords() { 74 DataSet d1 = new DataSet(); 75 DataSet d2 = new DataSet(); 76 65 77 Node n1 = new Node(1); 66 78 Node n2 = new Node(1); 79 d1.addPrimitive(n1); 80 d2.addPrimitive(n2); 67 81 model.populate(n1, n2); 68 82 assertFalse(model.hasCoordConflict()); … … 73 87 74 88 75 n1 = new Node(1);89 n1.cloneFrom(new Node(1)); 76 90 n2.setCoor(new LatLon(2,2)); 77 91 model.populate(n1, n2); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
r2990 r3025 8 8 import java.beans.PropertyChangeEvent; 9 9 import java.beans.PropertyChangeListener; 10 import java.util. ArrayList;10 import java.util.List; 11 11 12 12 import org.junit.Test; … … 29 29 model.addPropertyChangeListener(listener); 30 30 31 ArrayList<?> list = field("listeners").ofType(ArrayList.class)31 List<?> list = field("listeners").ofType(List.class) 32 32 .in(model) 33 33 .get(); … … 48 48 model.removePropertyChangeListener(listener); 49 49 50 ArrayList<?> list = field("listeners")51 .ofType( ArrayList.class)50 List<?> list = field("listeners") 51 .ofType(List.class) 52 52 .in(model) 53 53 .get(); … … 63 63 model.populate(my, their); 64 64 65 ArrayList<TagMergeItem> list = field("tagMergeItems")66 .ofType( ArrayList.class)65 List<TagMergeItem> list = field("tagMergeItems") 66 .ofType(List.class) 67 67 .in(model) 68 68 .get(); … … 80 80 model.populate(my, their); 81 81 82 ArrayList<TagMergeItem> list = field("tagMergeItems")83 .ofType( ArrayList.class)82 List<TagMergeItem> list = field("tagMergeItems") 83 .ofType(List.class) 84 84 .in(model) 85 85 .get(); … … 96 96 model.populate(my, their); 97 97 98 ArrayList<TagMergeItem> list = field("tagMergeItems")99 .ofType( ArrayList.class)98 List<TagMergeItem> list = field("tagMergeItems") 99 .ofType(List.class) 100 100 .in(model) 101 101 .get(); … … 117 117 model.populate(my, their); 118 118 119 ArrayList<TagMergeItem> list = field("tagMergeItems")120 .ofType( ArrayList.class)119 List<TagMergeItem> list = field("tagMergeItems") 120 .ofType(List.class) 121 121 .in(model) 122 122 .get(); … … 139 139 model.populate(my, their); 140 140 141 ArrayList<TagMergeItem> list = field("tagMergeItems")142 .ofType( ArrayList.class)141 List<TagMergeItem> list = field("tagMergeItems") 142 .ofType(List.class) 143 143 .in(model) 144 144 .get(); … … 158 158 model.addItem(item); 159 159 160 ArrayList<TagMergeItem> list = field("tagMergeItems")161 .ofType( ArrayList.class)160 List<TagMergeItem> list = field("tagMergeItems") 161 .ofType(List.class) 162 162 .in(model) 163 163 .get(); … … 177 177 model.addItem(item); 178 178 179 ArrayList<TagMergeItem> list = field("tagMergeItems")180 .ofType( ArrayList.class)179 List<TagMergeItem> list = field("tagMergeItems") 180 .ofType(List.class) 181 181 .in(model) 182 182 .get(); … … 207 207 } 208 208 209 ArrayList<TagMergeItem> list = field("tagMergeItems")210 .ofType( ArrayList.class)209 List<TagMergeItem> list = field("tagMergeItems") 210 .ofType(List.class) 211 211 .in(model) 212 212 .get();
Note:
See TracChangeset
for help on using the changeset viewer.