Changeset 3283 in josm for trunk/test


Ignore:
Timestamp:
2010-05-29T09:06:16+02:00 (10 years ago)
Author:
jttt
Message:

Fix tests

Location:
trunk/test/unit/org/openstreetmap/josm/data/osm
Files:
3 edited

Legend:

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

    r3053 r3283  
    1616import org.junit.Before;
    1717import org.junit.Test;
     18import org.openstreetmap.josm.Main;
    1819import org.openstreetmap.josm.data.coor.LatLon;
     20import org.openstreetmap.josm.data.projection.Mercator;
    1921
    2022public class DataSetMergerTest {
     
    6769        their = new DataSet();
    6870        their.setVersion("0.6");
     71        Main.proj = new Mercator();
    6972    }
    7073
     
    292295    /**
    293296     * My and their node are new but semantically equal. My node is deleted.
    294      * 
     297     *
    295298     * => Ignore my node, no conflict
    296299     */
     
    923926    /**
    924927     * Merge an incomplete way with two incomplete nodes into an empty dataset.
    925      * 
     928     *
    926929     * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456
    927930     */
     
    966969    /**
    967970     * Merge an incomplete way with two incomplete nodes into a dataset where the way already exists as complete way.
    968      * 
     971     *
    969972     * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456 after a "Update selection " of this way
    970973     */
  • trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

    r3282 r3283  
    66
    77import org.junit.Assert;
     8import org.junit.BeforeClass;
    89import org.junit.Test;
     10import org.openstreetmap.josm.Main;
    911import org.openstreetmap.josm.data.coor.LatLon;
     12import org.openstreetmap.josm.data.projection.Mercator;
    1013
    1114public class OsmPrimitiveTest {
     
    1720
    1821    private DataSet dataSet = new DataSet();
     22
     23    @BeforeClass
     24    public static void setUp() {
     25        Main.proj = new Mercator();
     26    }
    1927
    2028    @Test
  • trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

    r3107 r3283  
    55
    66import org.junit.Assert;
     7import org.junit.BeforeClass;
    78import org.junit.Test;
     9import org.openstreetmap.josm.Main;
    810import org.openstreetmap.josm.data.coor.LatLon;
     11import org.openstreetmap.josm.data.projection.Mercator;
    912
    1013public class RelationTest {
     14
     15    @BeforeClass
     16    public static void setUp() {
     17        Main.proj = new Mercator();
     18    }
    1119
    1220    @Test(expected=NullPointerException.class)
Note: See TracChangeset for help on using the changeset viewer.