Ignore:
Timestamp:
2017-08-03T23:24:56+02:00 (7 years ago)
Author:
Don-vip
Message:

fix unit tests

Location:
trunk/test/unit/org/openstreetmap/josm/command/conflict
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

    r10758 r12564  
    66import static org.junit.Assert.assertTrue;
    77
    8 import org.junit.AfterClass;
    9 import org.junit.BeforeClass;
     8import org.junit.After;
     9import org.junit.Before;
     10import org.junit.Rule;
    1011import org.junit.Test;
    11 import org.openstreetmap.josm.JOSMFixture;
    1212import org.openstreetmap.josm.Main;
    1313import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    1717import org.openstreetmap.josm.data.osm.Way;
    1818import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     19import org.openstreetmap.josm.testutils.JOSMTestRules;
    1920
     21import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    2022import nl.jqno.equalsverifier.EqualsVerifier;
    2123import nl.jqno.equalsverifier.Warning;
    … …  
    2628public class ConflictAddCommandTest {
    2729
    28     private static OsmDataLayer layer;
     30    private OsmDataLayer layer;
    2931
    3032    /**
    3133     * Setup test.
    3234     */
    33     @BeforeClass
    34     public static void setUpBeforeClass() {
    35         JOSMFixture.createUnitTestFixture().init(true);
     35    @Rule
     36    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     37    public JOSMTestRules test = new JOSMTestRules().platform();
     38
     39    /**
     40     * Setup test.
     41     */
     42    @Before
     43    public void setUp() {
    3644        layer = new OsmDataLayer(new DataSet(), null, null);
    3745        Main.getLayerManager().addLayer(layer);
    … …  
    4149     * Cleanup test resources.
    4250     */
    43     @AfterClass
    44     public static void tearDownAfterClass() {
     51    @After
     52    public void tearDown() {
    4553        Main.getLayerManager().removeLayer(layer);
    4654    }

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

    r10758 r12564  
    66import static org.junit.Assert.assertTrue;
    77
    8 import org.junit.AfterClass;
    9 import org.junit.BeforeClass;
     8import org.junit.After;
     9import org.junit.Before;
     10import org.junit.Rule;
    1011import org.junit.Test;
    11 import org.openstreetmap.josm.JOSMFixture;
    1212import org.openstreetmap.josm.Main;
    1313import org.openstreetmap.josm.data.conflict.Conflict;
    … …  
    1919import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    2020import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     21import org.openstreetmap.josm.testutils.JOSMTestRules;
    2122
     23import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    2224import nl.jqno.equalsverifier.EqualsVerifier;
    2325import nl.jqno.equalsverifier.Warning;
    … …  
    2830public class CoordinateConflictResolveCommandTest {
    2931
    30     private static OsmDataLayer layer;
     32    private OsmDataLayer layer;
    3133
    3234    /**
    3335     * Setup test.
    3436     */
    35     @BeforeClass
    36     public static void setUpBeforeClass() {
    37         JOSMFixture.createUnitTestFixture().init(true);
     37    @Rule
     38    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     39    public JOSMTestRules test = new JOSMTestRules().platform();
     40
     41    /**
     42     * Setup test.
     43     */
     44    @Before
     45    public void setUp() {
    3846        layer = new OsmDataLayer(new DataSet(), null, null);
    3947        Main.getLayerManager().addLayer(layer);
    … …  
    4351     * Cleanup test resources.
    4452     */
    45     @AfterClass
    46     public static void tearDownAfterClass() {
     53    @After
     54    public void tearDown() {
    4755        Main.getLayerManager().removeLayer(layer);
    4856    }
Note: See TracChangeset for help on using the changeset viewer.