Changeset 2396 in josm for trunk/test/unit/org
- Timestamp:
- 2009-11-07T07:26:15+01:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r2381 r2396 79 79 public void nodeSimple_IdenticalNoConflict() { 80 80 DataSet my = new DataSet(); 81 my. version = "0.6";81 my.setVersion("0.6"); 82 82 Node n = new Node(new LatLon(0,0)); 83 83 n.setOsmId(1,1); … … 87 87 88 88 DataSet their = new DataSet(); 89 their. version = "0.6";89 their.setVersion("0.6"); 90 90 Node n1 = new Node(new LatLon(0,0)); 91 91 n1.setOsmId(1,1); … … 114 114 public void nodeSimple_locallyUnmodifiedNoConflict() { 115 115 DataSet my = new DataSet(); 116 my. version = "0.6";116 my.setVersion("0.6"); 117 117 Node n = new Node(new LatLon(0,0)); 118 118 n.setOsmId(1,1); … … 122 122 123 123 DataSet their = new DataSet(); 124 their. version = "0.6";124 their.setVersion("0.6"); 125 125 Node n1 = new Node(new LatLon(0,0)); 126 126 n1.setOsmId(1,2); … … 153 153 public void nodeSimple_TagConflict() { 154 154 DataSet my = new DataSet(); 155 my. version = "0.6";155 my.setVersion("0.6"); 156 156 Node n = new Node(new LatLon(0,0)); 157 157 n.setOsmId(1,1); … … 162 162 163 163 DataSet their = new DataSet(); 164 their. version = "0.6";164 their.setVersion("0.6"); 165 165 Node n1 = new Node(new LatLon(0,0)); 166 166 n1.setOsmId(1,2); … … 189 189 public void nodeSimple_DeleteConflict() { 190 190 DataSet my = new DataSet(); 191 my. version = "0.6";191 my.setVersion("0.6"); 192 192 Node n = new Node(1); 193 193 n.setCoor(new LatLon(0,0)); … … 198 198 199 199 DataSet their = new DataSet(); 200 their. version = "0.6";200 their.setVersion("0.6"); 201 201 Node n1 = new Node(new LatLon(0,0)); 202 202 n1.setOsmId(1,1); … … 223 223 public void nodeSimple_VisibleConflict() { 224 224 DataSet my = new DataSet(); 225 my. version = "0.6";225 my.setVersion("0.6"); 226 226 Node n = new Node(new LatLon(0,0)); 227 227 n.setOsmId(1,1); … … 231 231 232 232 DataSet their = new DataSet(); 233 their. version = "0.6";233 their.setVersion("0.6"); 234 234 Node n1 = new Node(new LatLon(0,0)); 235 235 n1.setOsmId(1,2); … … 256 256 public void nodeSimple_DeleteConflict_2() { 257 257 DataSet my = new DataSet(); 258 my. version = "0.6";258 my.setVersion("0.6"); 259 259 Node n = new Node(new LatLon(0,0)); 260 260 n.setOsmId(1,1); … … 263 263 264 264 DataSet their = new DataSet(); 265 their. version = "0.6";265 their.setVersion("0.6"); 266 266 Node n1 = new Node(new LatLon(0,0)); 267 267 n1.setOsmId(1,1); … … 286 286 public void nodeSimple_DeleteConflict_3() { 287 287 DataSet my = new DataSet(); 288 my. version = "0.6";288 my.setVersion("0.6"); 289 289 Node n = new Node(new LatLon(1,1)); 290 290 n.setDeleted(true); … … 292 292 293 293 DataSet their = new DataSet(); 294 their. version = "0.6";294 their.setVersion("0.6"); 295 295 Node n1 = new Node(new LatLon(1,1)); 296 296 their.addPrimitive(n1); … … 312 312 public void nodeSimple_DeleteConflict_4() { 313 313 DataSet my = new DataSet(); 314 my. version = "0.6";314 my.setVersion("0.6"); 315 315 Node n = new Node(new LatLon(1,1)); 316 316 n.setDeleted(true); … … 318 318 319 319 DataSet their = new DataSet(); 320 their. version = "0.6";320 their.setVersion("0.6"); 321 321 Node n1 = new Node(new LatLon(1,1)); 322 322 n1.setDeleted(true); … … 338 338 public void nodeSimple_InvisibleNodeInTheirDataset() { 339 339 DataSet my = new DataSet(); 340 my. version = "0.6";340 my.setVersion("0.6"); 341 341 Node n = new Node(new LatLon(0,0)); 342 342 n.setOsmId(1,1); … … 345 345 346 346 DataSet their = new DataSet(); 347 their. version = "0.6";347 their.setVersion("0.6"); 348 348 Node n1 = new Node(new LatLon(0,0)); 349 349 n1.setOsmId(2,1); … … 377 377 378 378 DataSet my = new DataSet(); 379 my. version = "0.6";379 my.setVersion("0.6"); 380 380 Node n = new Node(); 381 381 n.setCoor(new LatLon(0,0)); … … 387 387 388 388 DataSet their = new DataSet(); 389 their. version = "0.6";389 their.setVersion("0.6"); 390 390 Node n1 = new Node(); 391 391 n1.setCoor(new LatLon(0,0)); … … 418 418 419 419 DataSet my = new DataSet(); 420 my. version = "0.6";420 my.setVersion("0.6"); 421 421 Node n = new Node(); 422 422 n.setCoor(new LatLon(0,0)); … … 426 426 427 427 DataSet their = new DataSet(); 428 their. version = "0.6";428 their.setVersion("0.6"); 429 429 Node n1 = new Node(); 430 430 n1.setCoor(new LatLon(0,0)); … … 458 458 459 459 DataSet my = new DataSet(); 460 my. version = "0.6";460 my.setVersion("0.6"); 461 461 462 462 Node n1 = new Node(); … … 480 480 481 481 DataSet their = new DataSet(); 482 their. version = "0.6";482 their.setVersion("0.6"); 483 483 484 484 Node n3 = new Node(new LatLon(0,0)); … … 525 525 526 526 DataSet my = new DataSet(); 527 my. version = "0.6";527 my.setVersion("0.6"); 528 528 529 529 Node n1 = new Node(new LatLon(0,0)); … … 542 542 543 543 DataSet their = new DataSet(); 544 their. version = "0.6";544 their.setVersion("0.6"); 545 545 546 546 Node n3 = new Node(new LatLon(0,0)); … … 593 593 594 594 DataSet my = new DataSet(); 595 my. version = "0.6";595 my.setVersion("0.6"); 596 596 597 597 Node n1 = new Node(new LatLon(0,0)); … … 613 613 614 614 DataSet their = new DataSet(); 615 their. version = "0.6";615 their.setVersion("0.6"); 616 616 617 617 Node n3 = new Node(new LatLon(0,0)); … … 664 664 665 665 DataSet my = new DataSet(); 666 my. version = "0.6";666 my.setVersion("0.6"); 667 667 668 668 Node n1 = new Node(new LatLon(0,0)); … … 681 681 682 682 DataSet their = new DataSet(); 683 their. version = "0.6";683 their.setVersion("0.6"); 684 684 685 685 Way theirWay = new Way(); … … 710 710 711 711 DataSet my = new DataSet(); 712 my. version = "0.6";712 my.setVersion("0.6"); 713 713 714 714 Node n1 = new Node(new LatLon(0,0)); … … 726 726 727 727 DataSet their = new DataSet(); 728 their. version = "0.6";728 their.setVersion("0.6"); 729 729 730 730 Node n3 = new Node(new LatLon(0,0)); … … 763 763 764 764 DataSet my = new DataSet(); 765 my. version = "0.6";765 my.setVersion("0.6"); 766 766 767 767 Node n1 = new Node(new LatLon(0,0)); … … 777 777 778 778 DataSet their = new DataSet(); 779 their. version = "0.6";779 their.setVersion("0.6"); 780 780 781 781 Node n3 = new Node(new LatLon(0,0)); … … 815 815 816 816 DataSet my = new DataSet(); 817 my. version = "0.6";817 my.setVersion("0.6"); 818 818 819 819 Node n1 = new Node(new LatLon(0,0)); … … 823 823 824 824 DataSet their = new DataSet(); 825 their. version = "0.6";825 their.setVersion("0.6"); 826 826 827 827 Node n3 = new Node(new LatLon(0,0)); … … 871 871 872 872 DataSet my = new DataSet(); 873 my. version = "0.6";873 my.setVersion("0.6"); 874 874 875 875 Node n1 = new Node(new LatLon(0,0)); … … 879 879 880 880 DataSet their = new DataSet(); 881 their. version = "0.6";881 their.setVersion("0.6"); 882 882 883 883 Node n3 = new Node(new LatLon(0,0)); … … 922 922 public void newIncompleteWay() { 923 923 DataSet their = new DataSet(); 924 their. version = "0.6";924 their.setVersion("0.6"); 925 925 926 926 Node n1 = new Node(1); … … 936 936 937 937 DataSet my = new DataSet(); 938 their. version = "0.6";938 their.setVersion("0.6"); 939 939 940 940 MergeVisitor visitor = new MergeVisitor(my,their); … … 969 969 public void incompleteWayOntoCompleteWay() { 970 970 DataSet their = new DataSet(); 971 their. version = "0.6";971 their.setVersion("0.6"); 972 972 973 973 // an incomplete node … … 986 986 987 987 DataSet my = new DataSet(); 988 their. version = "0.6";988 their.setVersion("0.6"); 989 989 990 990 Node n4 = new Node(new LatLon(0,0));
Note:
See TracChangeset
for help on using the changeset viewer.