Changeset 13175 in josm for trunk/test
- Timestamp:
- 2017-12-01T19:28:25+01:00 (7 years ago)
- Location:
- trunk/test/performance/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
r11324 r13175 14 14 import org.apache.commons.lang.RandomStringUtils; 15 15 import org.junit.Before; 16 import org.junit.BeforeClass;17 16 import org.junit.Rule; 18 17 import org.junit.Test; 19 18 import org.junit.rules.Timeout; 20 import org.openstreetmap.josm.JOSMFixture;21 19 import org.openstreetmap.josm.PerformanceTestUtils; 22 20 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; 23 21 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator; 22 import org.openstreetmap.josm.testutils.JOSMTestRules; 24 23 25 24 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 48 47 * Prepare the test. 49 48 */ 50 @BeforeClass 51 public static void createJOSMFixture() { 52 JOSMFixture.createPerformanceTestFixture().init(true); 53 } 49 @Rule 50 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 51 public JOSMTestRules test = new JOSMTestRules().projection(); 54 52 55 53 /** -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
r12783 r13175 50 50 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 51 51 52 /** 53 * Performance test of map renderer. 54 */ 52 55 public class MapRendererPerformanceTest { 53 56 … … 87 90 public Timeout globalTimeout = Timeout.seconds(15*60); 88 91 92 /** 93 * Initializes test environment. 94 * @throws Exception if any error occurs 95 */ 89 96 @BeforeClass 90 97 public static void load() throws Exception { … … 152 159 } 153 160 161 /** 162 * Cleanup test environment. 163 */ 154 164 @AfterClass 155 165 public static void cleanUp() { … … 319 329 320 330 private static void setFilterStyleActive(boolean active) { 321 if (filterStyle.active != active) { 322 MapPaintStyles.toggleStyleActive(filterStyleIdx); 323 } 324 Assert.assertEquals(active, filterStyle.active); 331 if (filterStyle != null) { 332 if (filterStyle.active != active) { 333 MapPaintStyles.toggleStyleActive(filterStyleIdx); 334 } 335 Assert.assertEquals(active, filterStyle.active); 336 } 325 337 } 326 338
Note:
See TracChangeset
for help on using the changeset viewer.