Ignore:
Timestamp:
2023-08-08T21:24:36+02:00 (18 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/unit/org/openstreetmap/josm/data/validation/tests
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

    r18761 r18799  
    1919import org.junit.jupiter.api.BeforeEach;
    2020import org.junit.jupiter.api.Test;
    21 import org.junit.jupiter.api.extension.RegisterExtension;
    2221import org.openstreetmap.josm.TestUtils;
    2322import org.openstreetmap.josm.command.ChangePropertyCommand;
    … …  
    4342import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
    4443import org.openstreetmap.josm.io.OsmReader;
    45 import org.openstreetmap.josm.testutils.JOSMTestRules;
    4644import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    4745import org.openstreetmap.josm.testutils.annotations.Projection;
     46import org.openstreetmap.josm.testutils.annotations.Territories;
    4847import org.openstreetmap.josm.tools.Logging;
    49 
    50 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    5148
    5249/**
    … …  
    5552@BasicPreferences
    5653@Projection
     54@Territories
    5755class MapCSSTagCheckerTest {
    58 
    59     /**
    60      * Setup test.
    61      */
    62     @RegisterExtension
    63     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    64     public JOSMTestRules test = new JOSMTestRules().territories();
    65 
    6656    /**
    6757     * Setup test.

  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UntaggedNodeTest.java

    r17275 r18799  
    88import java.io.InputStream;
    99
    10 import org.junit.jupiter.api.extension.RegisterExtension;
    1110import org.junit.jupiter.api.Test;
    1211import org.openstreetmap.josm.TestUtils;
    … …  
    1413import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    1514import org.openstreetmap.josm.io.OsmReader;
    16 import org.openstreetmap.josm.testutils.JOSMTestRules;
    17 
    18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     15import org.openstreetmap.josm.testutils.annotations.Projection;
    1916
    2017/**
    2118 * Unit tests of {@code UntaggedNode} class.
    2219 */
     20@Projection
    2321class UntaggedNodeTest {
    2422
    2523    private final UntaggedNode test = new UntaggedNode();
    26 
    27     /**
    28      * Setup test.
    29      */
    30     @RegisterExtension
    31     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    32     public JOSMTestRules rules = new JOSMTestRules();
    3324
    3425    /**
Note: See TracChangeset for help on using the changeset viewer.