Changeset 12858 in josm for trunk/test


Ignore:
Timestamp:
2017-09-14T20:18:36+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15229 - fix integration tests

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

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java

    r12656 r12858  
    1111import java.util.stream.Collectors;
    1212
     13import org.junit.Rule;
    1314import org.junit.Test;
    1415import org.openstreetmap.josm.data.osm.DataSet;
     
    1617import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    1718import org.openstreetmap.josm.io.OsmReader;
     19import org.openstreetmap.josm.testutils.JOSMTestRules;
     20
     21import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1822
    1923/**
     
    3640            "US-PR", "US-RI", "US-SC", "US-SD", "US-TN", "US-TX", "US-UM", "US-UT", "US-VT", "US-VA", "US-VI", "US-WA", "US-WV", "US-WI",
    3741            "US-WY");
     42
     43    /**
     44     * Setup test.
     45     */
     46    @Rule
     47    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     48    public JOSMTestRules test = new JOSMTestRules().preferences();
    3849
    3950    /**
  • trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java

    r11426 r12858  
    66import java.net.URL;
    77
     8import org.junit.Rule;
    89import org.junit.Test;
     10import org.openstreetmap.josm.testutils.JOSMTestRules;
    911import org.openstreetmap.josm.tools.HttpClient;
     12
     13import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1014
    1115/**
     
    1721    private static String BLACK_PREFIX = "<pre style=\"margin:3px;color:black\">";
    1822    private static String RED_PREFIX = "<pre style=\"margin:3px;color:red\">";
     23
     24    /**
     25     * Setup test.
     26     */
     27    @Rule
     28    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     29    public JOSMTestRules test = new JOSMTestRules().preferences();
    1930
    2031    /**
  • trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

    r12730 r12858  
    1515import javax.json.JsonValue;
    1616
    17 import org.junit.BeforeClass;
     17import org.junit.Rule;
    1818import org.junit.Test;
    19 import org.openstreetmap.josm.JOSMFixture;
    2019import org.openstreetmap.josm.data.coor.LatLon;
    2120import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
     
    2322import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
    2423import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
     24import org.openstreetmap.josm.testutils.JOSMTestRules;
    2525import org.openstreetmap.josm.tools.HttpClient;
    2626import org.xml.sax.SAXException;
     27
     28import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    2729
    2830/**
     
    3436     * Setup test.
    3537     */
    36     @BeforeClass
    37     public static void setUp() {
    38         JOSMFixture.createFunctionalTestFixture().init();
    39     }
     38    @Rule
     39    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     40    public JOSMTestRules test = new JOSMTestRules().preferences();
    4041
    4142    /**
Note: See TracChangeset for help on using the changeset viewer.