Changeset 2396 in josm for trunk/test/unit


Ignore:
Timestamp:
2009-11-07T07:26:15+01:00 (10 years ago)
Author:
Gubaer
Message:

Made nodes, ways, and relations in DataSet private. Plugin updates to be checked in shortly.
Also added setter/getter for DataSet version.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

    r2381 r2396  
    7979    public void nodeSimple_IdenticalNoConflict() {
    8080        DataSet my = new DataSet();
    81         my.version = "0.6";
     81        my.setVersion("0.6");
    8282        Node n = new Node(new LatLon(0,0));
    8383        n.setOsmId(1,1);
     
    8787
    8888        DataSet their = new DataSet();
    89         their.version = "0.6";
     89        their.setVersion("0.6");
    9090        Node n1 = new Node(new LatLon(0,0));
    9191        n1.setOsmId(1,1);
     
    114114    public void nodeSimple_locallyUnmodifiedNoConflict() {
    115115        DataSet my = new DataSet();
    116         my.version = "0.6";
     116        my.setVersion("0.6");
    117117        Node n = new Node(new LatLon(0,0));
    118118        n.setOsmId(1,1);
     
    122122
    123123        DataSet their = new DataSet();
    124         their.version = "0.6";
     124        their.setVersion("0.6");
    125125        Node n1 = new Node(new LatLon(0,0));
    126126        n1.setOsmId(1,2);
     
    153153    public void nodeSimple_TagConflict() {
    154154        DataSet my = new DataSet();
    155         my.version = "0.6";
     155        my.setVersion("0.6");
    156156        Node n = new Node(new LatLon(0,0));
    157157        n.setOsmId(1,1);
     
    162162
    163163        DataSet their = new DataSet();
    164         their.version = "0.6";
     164        their.setVersion("0.6");
    165165        Node n1 = new Node(new LatLon(0,0));
    166166        n1.setOsmId(1,2);
     
    189189    public void nodeSimple_DeleteConflict() {
    190190        DataSet my = new DataSet();
    191         my.version = "0.6";
     191        my.setVersion("0.6");
    192192        Node n = new Node(1);
    193193        n.setCoor(new LatLon(0,0));
     
    198198
    199199        DataSet their = new DataSet();
    200         their.version = "0.6";
     200        their.setVersion("0.6");
    201201        Node n1 = new Node(new LatLon(0,0));
    202202        n1.setOsmId(1,1);
     
    223223    public void nodeSimple_VisibleConflict() {
    224224        DataSet my = new DataSet();
    225         my.version = "0.6";
     225        my.setVersion("0.6");
    226226        Node n = new Node(new LatLon(0,0));
    227227        n.setOsmId(1,1);
     
    231231
    232232        DataSet their = new DataSet();
    233         their.version = "0.6";
     233        their.setVersion("0.6");
    234234        Node n1 = new Node(new LatLon(0,0));
    235235        n1.setOsmId(1,2);
     
    256256    public void nodeSimple_DeleteConflict_2() {
    257257        DataSet my = new DataSet();
    258         my.version = "0.6";
     258        my.setVersion("0.6");
    259259        Node n = new Node(new LatLon(0,0));
    260260        n.setOsmId(1,1);
     
    263263
    264264        DataSet their = new DataSet();
    265         their.version = "0.6";
     265        their.setVersion("0.6");
    266266        Node n1 = new Node(new LatLon(0,0));
    267267        n1.setOsmId(1,1);
     
    286286    public void nodeSimple_DeleteConflict_3() {
    287287        DataSet my = new DataSet();
    288         my.version = "0.6";
     288        my.setVersion("0.6");
    289289        Node n = new Node(new LatLon(1,1));
    290290        n.setDeleted(true);
     
    292292
    293293        DataSet their = new DataSet();
    294         their.version = "0.6";
     294        their.setVersion("0.6");
    295295        Node n1 = new Node(new LatLon(1,1));
    296296        their.addPrimitive(n1);
     
    312312    public void nodeSimple_DeleteConflict_4() {
    313313        DataSet my = new DataSet();
    314         my.version = "0.6";
     314        my.setVersion("0.6");
    315315        Node n = new Node(new LatLon(1,1));
    316316        n.setDeleted(true);
     
    318318
    319319        DataSet their = new DataSet();
    320         their.version = "0.6";
     320        their.setVersion("0.6");
    321321        Node n1 = new Node(new LatLon(1,1));
    322322        n1.setDeleted(true);
     
    338338    public void nodeSimple_InvisibleNodeInTheirDataset() {
    339339        DataSet my = new DataSet();
    340         my.version = "0.6";
     340        my.setVersion("0.6");
    341341        Node n = new Node(new LatLon(0,0));
    342342        n.setOsmId(1,1);
     
    345345
    346346        DataSet their = new DataSet();
    347         their.version = "0.6";
     347        their.setVersion("0.6");
    348348        Node n1 = new Node(new LatLon(0,0));
    349349        n1.setOsmId(2,1);
     
    377377
    378378        DataSet my = new DataSet();
    379         my.version = "0.6";
     379        my.setVersion("0.6");
    380380        Node n = new Node();
    381381        n.setCoor(new LatLon(0,0));
     
    387387
    388388        DataSet their = new DataSet();
    389         their.version = "0.6";
     389        their.setVersion("0.6");
    390390        Node n1 = new Node();
    391391        n1.setCoor(new LatLon(0,0));
     
    418418
    419419        DataSet my = new DataSet();
    420         my.version = "0.6";
     420        my.setVersion("0.6");
    421421        Node n = new Node();
    422422        n.setCoor(new LatLon(0,0));
     
    426426
    427427        DataSet their = new DataSet();
    428         their.version = "0.6";
     428        their.setVersion("0.6");
    429429        Node n1 = new Node();
    430430        n1.setCoor(new LatLon(0,0));
     
    458458
    459459        DataSet my = new DataSet();
    460         my.version = "0.6";
     460        my.setVersion("0.6");
    461461
    462462        Node n1 = new Node();
     
    480480
    481481        DataSet their = new DataSet();
    482         their.version = "0.6";
     482        their.setVersion("0.6");
    483483
    484484        Node n3 = new Node(new LatLon(0,0));
     
    525525
    526526        DataSet my = new DataSet();
    527         my.version = "0.6";
     527        my.setVersion("0.6");
    528528
    529529        Node n1 = new Node(new LatLon(0,0));
     
    542542
    543543        DataSet their = new DataSet();
    544         their.version = "0.6";
     544        their.setVersion("0.6");
    545545
    546546        Node n3 = new Node(new LatLon(0,0));
     
    593593
    594594        DataSet my = new DataSet();
    595         my.version = "0.6";
     595        my.setVersion("0.6");
    596596
    597597        Node n1 = new Node(new LatLon(0,0));
     
    613613
    614614        DataSet their = new DataSet();
    615         their.version = "0.6";
     615        their.setVersion("0.6");
    616616
    617617        Node n3 = new Node(new LatLon(0,0));
     
    664664
    665665        DataSet my = new DataSet();
    666         my.version = "0.6";
     666        my.setVersion("0.6");
    667667
    668668        Node n1 = new Node(new LatLon(0,0));
     
    681681
    682682        DataSet their = new DataSet();
    683         their.version = "0.6";
     683        their.setVersion("0.6");
    684684
    685685        Way theirWay = new Way();
     
    710710
    711711        DataSet my = new DataSet();
    712         my.version = "0.6";
     712        my.setVersion("0.6");
    713713
    714714        Node n1 = new Node(new LatLon(0,0));
     
    726726
    727727        DataSet their = new DataSet();
    728         their.version = "0.6";
     728        their.setVersion("0.6");
    729729
    730730        Node n3 = new Node(new LatLon(0,0));
     
    763763
    764764        DataSet my = new DataSet();
    765         my.version = "0.6";
     765        my.setVersion("0.6");
    766766
    767767        Node n1 = new Node(new LatLon(0,0));
     
    777777
    778778        DataSet their = new DataSet();
    779         their.version = "0.6";
     779        their.setVersion("0.6");
    780780
    781781        Node n3 = new Node(new LatLon(0,0));
     
    815815
    816816        DataSet my = new DataSet();
    817         my.version = "0.6";
     817        my.setVersion("0.6");
    818818
    819819        Node n1 = new Node(new LatLon(0,0));
     
    823823
    824824        DataSet their = new DataSet();
    825         their.version = "0.6";
     825        their.setVersion("0.6");
    826826
    827827        Node n3 = new Node(new LatLon(0,0));
     
    871871
    872872        DataSet my = new DataSet();
    873         my.version = "0.6";
     873        my.setVersion("0.6");
    874874
    875875        Node n1 = new Node(new LatLon(0,0));
     
    879879
    880880        DataSet their = new DataSet();
    881         their.version = "0.6";
     881        their.setVersion("0.6");
    882882
    883883        Node n3 = new Node(new LatLon(0,0));
     
    922922    public void newIncompleteWay() {
    923923        DataSet their = new DataSet();
    924         their.version = "0.6";
     924        their.setVersion("0.6");
    925925
    926926        Node n1 = new Node(1);
     
    936936
    937937        DataSet my = new DataSet();
    938         their.version = "0.6";
     938        their.setVersion("0.6");
    939939
    940940        MergeVisitor visitor = new MergeVisitor(my,their);
     
    969969    public void incompleteWayOntoCompleteWay() {
    970970        DataSet their = new DataSet();
    971         their.version = "0.6";
     971        their.setVersion("0.6");
    972972
    973973        // an incomplete node
     
    986986
    987987        DataSet my = new DataSet();
    988         their.version = "0.6";
     988        their.setVersion("0.6");
    989989
    990990        Node n4 = new Node(new LatLon(0,0));
Note: See TracChangeset for help on using the changeset viewer.