Ignore:
Timestamp:
2023-08-08T21:24:36+02:00 (15 months ago)
Author:
taylor.smock
Message:

See r18798: Actually use the @Territories annotation

This also fixes some tests that fail with specific options, but were passing due
to run order.

Location:
trunk/test/performance/org/openstreetmap/josm/data/validation
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/performance/org/openstreetmap/josm/data/validation/ValidationTaskPerformanceTest.java

    r17617 r18799  
    22package org.openstreetmap.josm.data.validation;
    33
    4 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     4import static org.junit.jupiter.api.Assertions.assertTrue;
     5
     6import java.util.Collection;
     7import java.util.List;
     8import java.util.stream.Collectors;
     9
    510import org.junit.jupiter.api.BeforeEach;
    611import org.junit.jupiter.api.Test;
    7 import org.junit.jupiter.api.extension.RegisterExtension;
    812import org.openstreetmap.josm.PerformanceTestUtils;
    913import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    1317import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1418import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    15 import org.openstreetmap.josm.testutils.JOSMTestRules;
    16 
    17 import java.util.Collection;
    18 import java.util.List;
    19 import java.util.stream.Collectors;
    20 
    21 import static org.junit.jupiter.api.Assertions.assertTrue;
     19import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     20import org.openstreetmap.josm.testutils.annotations.Projection;
     21import org.openstreetmap.josm.testutils.annotations.Territories;
    2222
    2323/**
    2424 * Performance test of {@code ValidationTask}.
    2525 */
     26@BasicPreferences
     27@Projection
     28@Territories
    2629class ValidationTaskPerformanceTest {
    2730
    2831    private List<org.openstreetmap.josm.data.validation.Test> tests;
    29 
    30     /**
    31      * Setup test.
    32      */
    33     @RegisterExtension
    34     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    35     public JOSMTestRules test = new JOSMTestRules().projection().territories().preferences();
    3632
    3733    /**

  • trunk/test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java

    r17617 r18799  
    22package org.openstreetmap.josm.data.validation.tests;
    33
    4 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    54import org.junit.jupiter.api.BeforeEach;
    65import org.junit.jupiter.api.Test;
    7 import org.junit.jupiter.api.extension.RegisterExtension;
    86import org.openstreetmap.josm.PerformanceTestUtils;
    97import org.openstreetmap.josm.data.osm.DataSet;
    10 import org.openstreetmap.josm.testutils.JOSMTestRules;
     8import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     9import org.openstreetmap.josm.testutils.annotations.Projection;
     10import org.openstreetmap.josm.testutils.annotations.Territories;
    1111
    1212/**
    1313 * Performance test of {@code MapCSSTagChecker}.
    1414 */
     15@BasicPreferences
     16@Projection
     17@Territories
    1518class MapCSSTagCheckerPerformanceTest {
    1619
    1720    private MapCSSTagChecker tagChecker;
    1821    private DataSet dsCity;
    19 
    20     /**
    21      * Setup test.
    22      */
    23     @RegisterExtension
    24     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    25     public JOSMTestRules test = new JOSMTestRules().projection().territories().preferences();
    2622
    2723    /**
Note: See TracChangeset for help on using the changeset viewer.