- Timestamp:
- 2016-01-15T02:11:39+01:00 (9 years ago)
- Location:
- trunk/test
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
r8632 r9458 11 11 import org.junit.Before; 12 12 import org.junit.BeforeClass; 13 import org.junit.Rule; 13 14 import org.junit.Test; 15 import org.junit.rules.Timeout; 14 16 import org.openstreetmap.josm.JOSMFixture; 15 17 import org.openstreetmap.josm.PerformanceTestUtils; … … 31 33 32 34 /** 35 * Global timeout applied to all test methods. 36 */ 37 @Rule 38 public Timeout globalTimeout = Timeout.seconds(15*60); 39 40 /** 33 41 * Prepare the test. 34 42 */ -
trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java
r8510 r9458 9 9 10 10 import org.junit.BeforeClass; 11 import org.junit.Rule; 11 12 import org.junit.Test; 13 import org.junit.rules.Timeout; 12 14 import org.openstreetmap.josm.JOSMFixture; 13 15 import org.openstreetmap.josm.data.Bounds; … … 30 32 private static DataSet dsMultipolygon; 31 33 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); 32 40 33 41 @BeforeClass -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java
r8836 r9458 3 3 4 4 import org.junit.BeforeClass; 5 import org.junit.Rule; 5 6 import org.junit.Test; 7 import org.junit.rules.Timeout; 6 8 import org.openstreetmap.josm.JOSMFixture; 7 9 import org.openstreetmap.josm.PerformanceTestUtils; … … 78 80 79 81 /** 82 * Global timeout applied to all test methods. 83 */ 84 @Rule 85 public Timeout globalTimeout = Timeout.seconds(15*60); 86 87 /** 80 88 * Prepare the test. 81 89 */ … … 142 150 timer.done(); 143 151 } 144 145 152 } -
trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
r9457 r9458 11 11 12 12 import org.junit.BeforeClass; 13 import org.junit.Rule; 13 14 import org.junit.Test; 15 import org.junit.rules.Timeout; 14 16 import org.openstreetmap.josm.JOSMFixture; 15 17 import org.openstreetmap.josm.PerformanceTestUtils; … … 29 31 private static final int TIMES = 4; 30 32 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); 31 39 32 40 /** -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java
r9400 r9458 11 11 12 12 import org.junit.BeforeClass; 13 import org.junit.Rule; 13 14 import org.junit.Test; 15 import org.junit.rules.Timeout; 14 16 import org.openstreetmap.josm.JOSMFixture; 15 17 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; … … 30 32 31 33 /** 34 * Global timeout applied to all test methods. 35 */ 36 @Rule 37 public Timeout globalTimeout = Timeout.seconds(10*60); 38 39 /** 32 40 * Setup test. 33 41 */ … … 42 50 * @throws ParseException if the config file does not match MapCSS syntax 43 51 */ 44 @Test (timeout = 10*60*1000)52 @Test 45 53 public void testValidityOfAvailableStyles() throws ParseException, IOException { 46 54 Collection<ExtendedSourceEntry> sources = new MapPaintPreference.MapPaintSourceEditor() -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java
r9166 r9458 12 12 13 13 import org.junit.BeforeClass; 14 import org.junit.Rule; 14 15 import org.junit.Test; 16 import org.junit.rules.Timeout; 15 17 import org.openstreetmap.josm.JOSMFixture; 16 18 import org.openstreetmap.josm.Main; … … 26 28 27 29 /** 30 * Global timeout applied to all test methods. 31 */ 32 @Rule 33 public Timeout globalTimeout = Timeout.seconds(10*60); 34 35 /** 28 36 * Setup test. 29 37 */ … … 36 44 * Test that available tagging presets are valid. 37 45 */ 38 @Test (timeout = 10*60*1000)46 @Test 39 47 public void testValidityOfAvailablePresets() { 40 48 Collection<ExtendedSourceEntry> sources = new TaggingPresetPreference.TaggingPresetSourceEditor() -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
r9429 r9458 12 12 13 13 import org.junit.BeforeClass; 14 import org.junit.Rule; 14 15 import org.junit.Test; 16 import org.junit.rules.Timeout; 15 17 import org.openstreetmap.josm.JOSMFixture; 16 18 import org.openstreetmap.josm.Main; … … 21 23 */ 22 24 public class PluginHandlerTest { 25 26 /** 27 * Global timeout applied to all test methods. 28 */ 29 @Rule 30 public Timeout globalTimeout = Timeout.seconds(10*60); 23 31 24 32 /** … … 33 41 * Test that available plugins rules can be loaded. 34 42 */ 35 @Test (timeout = 10*60*1000)43 @Test 36 44 public void testValidityOfAvailablePlugins() { 37 45 // Download complete list of plugins
Note:
See TracChangeset
for help on using the changeset viewer.