Changeset 10966 in josm


Ignore:
Timestamp:
2016-09-06T00:16:07+02:00 (20 months ago)
Author:
Don-vip
Message:

fix unit tests hanging on Jenkins

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

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/MainTest.java

    r10962 r10966  
    1111import javax.swing.UIManager;
    1212
    13 import org.junit.BeforeClass;
     13import org.junit.Rule;
    1414import org.junit.Test;
    1515import org.openstreetmap.josm.Main.DownloadParamType;
     16import org.openstreetmap.josm.testutils.JOSMTestRules;
    1617
    1718import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     
    2526     * Setup test.
    2627     */
    27     @BeforeClass
    28     public static void setUp() {
    29         JOSMFixture.createUnitTestFixture().init();
    30     }
     28    @Rule
     29    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     30    public JOSMTestRules test = new JOSMTestRules().platform();
    3131
    3232    /**
  • trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy

    r10657 r10966  
    1212import org.openstreetmap.josm.tools.SubclassFilteredCollection
    1313
    14 class CreateMultipolygonActionTest {
     14public class CreateMultipolygonActionTest {
    1515
    1616    @BeforeClass
  • trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

    r10945 r10966  
    3232    @Rule
    3333    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    34     public JOSMTestRules test = new JOSMTestRules().platform();
     34    public JOSMTestRules test = new JOSMTestRules().platform().commands();
    3535
    3636    /**
Note: See TracChangeset for help on using the changeset viewer.