Changeset 9458 in josm for trunk/test/performance/org


Ignore:
Timestamp:
2016-01-15T02:11:39+01:00 (9 years ago)
Author:
Don-vip
Message:

timeouts for unit/performance tests

Location:
trunk/test/performance/org/openstreetmap/josm
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

    r8632 r9458  
    1111import org.junit.Before;
    1212import org.junit.BeforeClass;
     13import org.junit.Rule;
    1314import org.junit.Test;
     15import org.junit.rules.Timeout;
    1416import org.openstreetmap.josm.JOSMFixture;
    1517import org.openstreetmap.josm.PerformanceTestUtils;
    … …  
    3133
    3234    /**
     35     * Global timeout applied to all test methods.
     36     */
     37    @Rule
     38    public Timeout globalTimeout = Timeout.seconds(15*60);
     39
     40    /**
    3341     * Prepare the test.
    3442     */

  • trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java

    r8510 r9458  
    99
    1010import org.junit.BeforeClass;
     11import org.junit.Rule;
    1112import org.junit.Test;
     13import org.junit.rules.Timeout;
    1214import org.openstreetmap.josm.JOSMFixture;
    1315import org.openstreetmap.josm.data.Bounds;
    … …  
    3032    private static DataSet dsMultipolygon;
    3133    private static DataSet dsCity;
     34
     35    /**
     36     * Global timeout applied to all test methods.
     37     */
     38    @Rule
     39    public Timeout globalTimeout = Timeout.seconds(15*60);
    3240
    3341    @BeforeClass

  • trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

    r8836 r9458  
    33
    44import org.junit.BeforeClass;
     5import org.junit.Rule;
    56import org.junit.Test;
     7import org.junit.rules.Timeout;
    68import org.openstreetmap.josm.JOSMFixture;
    79import org.openstreetmap.josm.PerformanceTestUtils;
    … …  
    7880
    7981    /**
     82     * Global timeout applied to all test methods.
     83     */
     84    @Rule
     85    public Timeout globalTimeout = Timeout.seconds(15*60);
     86
     87    /**
    8088     * Prepare the test.
    8189     */
    … …  
    142150        timer.done();
    143151    }
    144 
    145152}

  • trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

    r9457 r9458  
    1111
    1212import org.junit.BeforeClass;
     13import org.junit.Rule;
    1314import org.junit.Test;
     15import org.junit.rules.Timeout;
    1416import org.openstreetmap.josm.JOSMFixture;
    1517import org.openstreetmap.josm.PerformanceTestUtils;
    … …  
    2931    private static final int TIMES = 4;
    3032    private static String DATA_FILE = "data_nodist/neubrandenburg.osm.bz2";
     33
     34    /**
     35     * Global timeout applied to all test methods.
     36     */
     37    @Rule
     38    public Timeout globalTimeout = Timeout.seconds(15*60);
    3139
    3240    /**
Note: See TracChangeset for help on using the changeset viewer.