Ignore:
Timestamp:
2016-06-21T00:47:41+02:00 (9 years ago)
Author:
donvip
Message:

fix some unit tests

Location:
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java

    r30573 r32351  
    1313import javax.xml.stream.XMLStreamException;
    1414
    15 import org.junit.BeforeClass;
     15import org.junit.Rule;
    1616import org.junit.Test;
    17 import org.openstreetmap.josm.JOSMFixture;
    1817import org.openstreetmap.josm.Main;
    1918import org.openstreetmap.josm.data.osm.DataSet;
    2019import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
     20import org.openstreetmap.josm.testutils.JOSMTestRules;
    2121
    2222/**
     
    2828     * Setup test.
    2929     */
    30     @BeforeClass
    31     public static void setUp() {
    32         JOSMFixture.createUnitTestFixture().init();
    33     }
     30    @Rule
     31    public JOSMTestRules rules = new JOSMTestRules();
    3432
    3533    /**
  • applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

    r32130 r32351  
    1111import javax.xml.stream.XMLStreamException;
    1212
    13 import org.junit.BeforeClass;
     13import org.junit.Rule;
    1414import org.junit.Test;
    15 import org.openstreetmap.josm.JOSMFixture;
    1615import org.openstreetmap.josm.TestUtils;
    1716import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
     17import org.openstreetmap.josm.testutils.JOSMTestRules;
    1818
    1919/**
     
    2525     * Setup test.
    2626     */
    27     @BeforeClass
    28     public static void setUp() {
    29         JOSMFixture.createUnitTestFixture().init();
    30     }
     27    @Rule
     28    public JOSMTestRules rules = new JOSMTestRules();
    3129
    3230    /**
  • applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java

    r30583 r32351  
    77import java.io.InputStream;
    88
    9 import org.junit.BeforeClass;
     9import org.junit.Rule;
    1010import org.junit.Test;
    11 import org.openstreetmap.josm.JOSMFixture;
    1211import org.openstreetmap.josm.TestUtils;
    1312import org.openstreetmap.josm.data.osm.DataSet;
     
    1514import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    1615import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
     16import org.openstreetmap.josm.testutils.JOSMTestRules;
    1717
    1818/**
     
    2424     * Setup test.
    2525     */
    26     @BeforeClass
    27     public static void setUp() {
    28         JOSMFixture.createUnitTestFixture().init();
    29     }
     26    @Rule
     27    public JOSMTestRules rules = new JOSMTestRules();
    3028   
    3129    private static AbstractDataSetHandler newHandler(final String epsgCode) {
  • applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java

    r32139 r32351  
    1212import javax.xml.stream.XMLStreamException;
    1313
    14 import org.junit.BeforeClass;
     14import org.junit.Rule;
    1515import org.junit.Test;
    16 import org.openstreetmap.josm.JOSMFixture;
    1716import org.openstreetmap.josm.TestUtils;
    1817import org.openstreetmap.josm.data.osm.Node;
    1918import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
     19import org.openstreetmap.josm.testutils.JOSMTestRules;
    2020
    2121/**
     
    2727     * Setup test.
    2828     */
    29     @BeforeClass
    30     public static void setUp() {
    31         JOSMFixture.createUnitTestFixture().init();
    32     }
     29    @Rule
     30    public JOSMTestRules rules = new JOSMTestRules();
    3331
    3432    /**
  • applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java

    r31990 r32351  
    22package org.openstreetmap.josm.plugins.opendata.core.io.tabular;
    33
    4 import java.io.File;
    5 import java.io.FileInputStream;
    64import java.io.IOException;
    75import java.io.InputStream;
     
    108import javax.xml.stream.XMLStreamException;
    119
    12 import org.junit.BeforeClass;
     10import org.junit.Rule;
    1311import org.junit.Test;
    14 import org.openstreetmap.josm.JOSMFixture;
    1512import org.openstreetmap.josm.TestUtils;
    1613import org.openstreetmap.josm.data.coor.EastNorth;
     
    2017import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    2118import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
     19import org.openstreetmap.josm.testutils.JOSMTestRules;
    2220
    2321/**
     
    2927     * Setup test.
    3028     */
    31     @BeforeClass
    32     public static void setUp() {
    33         JOSMFixture.createUnitTestFixture().init();
    34     }
     29    @Rule
     30    public JOSMTestRules rules = new JOSMTestRules();
    3531   
    3632    private static AbstractDataSetHandler newHandler(final String epsgCode) {
Note: See TracChangeset for help on using the changeset viewer.