Changeset 19223 in josm for trunk/test/functional


Ignore:
Timestamp:
2024-09-17T17:42:35+02:00 (3 months ago)
Author:
taylor.smock
Message:

Add JUnit5 tags to integration tests, functional tests, and performance tests

This should allow contributors to filter out integration tests inside the standard
test directory. Of specific note, this should reduce test runtime for contributors
by a non-trivial amount if contributors filter out the tagged tests.

For consistencies’ sake, tests in functional and performance were also
annotated. As such, if we ever merge the test directories, this will let us
filter which tests are run in CI.

Note that many functional tests don't have the annotation. This is because they
are manual tests.

Location:
trunk/test/functional/org/openstreetmap/josm
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java

    r18870 r19223  
    1717import org.openstreetmap.josm.io.OsmReader;
    1818import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     19import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
     20import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
    1921
    2022/**
    … …  
    2224 */
    2325@BasicPreferences
     26@FunctionalTest
     27@IntegrationTest
    2428class BoundariesTestIT {
    2529

  • trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java

    r18870 r19223  
    1010import org.openstreetmap.josm.spi.preferences.Config;
    1111import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     12import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
     13import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
    1214import org.openstreetmap.josm.tools.HttpClient;
    1315
    … …  
    1719 */
    1820@BasicPreferences
     21@FunctionalTest
     22@IntegrationTest
    1923@Timeout(60)
    2024class ImageryCompareTestIT {

  • trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

    r19003 r19223  
    1818import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    1919import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     20import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    2021import org.openstreetmap.josm.testutils.annotations.Territories;
    2122import org.openstreetmap.josm.tools.HttpClient;
    … …  
    3031 */
    3132@BasicPreferences
     33@FunctionalTest
    3234@Timeout(20)
    3335@Territories

  • trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java

    r18853 r19223  
    88import org.junit.jupiter.api.Disabled;
    99import org.junit.jupiter.api.Test;
     10import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    1011
    1112/**
    1213 * Tests the {@link GettingStarted} class.
    1314 */
     15@FunctionalTest
    1416class GettingStartedTest {
    1517    /**

  • trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

    r19221 r19223  
    3434import org.openstreetmap.josm.io.OsmReader;
    3535import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     36import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    3637import org.openstreetmap.josm.testutils.annotations.Projection;
    3738import org.openstreetmap.josm.tools.Utils;
    … …  
    4445 */
    4546@BasicPreferences
     47@FunctionalTest
    4648@Projection
    4749public class MapCSSRendererTest {

  • trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java

    r18870 r19223  
    3232import org.openstreetmap.josm.io.OsmReader;
    3333import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
     34import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    3435import org.openstreetmap.josm.testutils.annotations.Main;
    3536import org.openstreetmap.josm.testutils.annotations.Projection;
    … …  
    4041 */
    4142@BasicPreferences
     43@FunctionalTest
    4244@Main
    4345@org.openstreetmap.josm.testutils.annotations.MapPaintStyles

  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r18821 r19223  
    4949import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    5050import org.openstreetmap.josm.gui.util.GuiHelper;
     51import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    5152import org.openstreetmap.josm.testutils.annotations.TestUser;
    5253import org.openstreetmap.josm.tools.Logging;
    … …  
    5758 * Unit tests of {@link MultiFetchServerObjectReader}.
    5859 */
     60@FunctionalTest
    5961@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
    6062@Timeout(value = 1, unit = TimeUnit.MINUTES)

  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r18893 r19223  
    4242import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    4343import org.openstreetmap.josm.spi.preferences.Config;
     44import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    4445import org.openstreetmap.josm.testutils.annotations.TestUser;
    4546import org.openstreetmap.josm.tools.JosmRuntimeException;
    … …  
    5253 * @since 1806
    5354 */
     55@FunctionalTest
    5456@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
    5557@org.openstreetmap.josm.testutils.annotations.OsmApi(org.openstreetmap.josm.testutils.annotations.OsmApi.APIType.DEV)

  • trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java

    r17275 r19223  
    1515import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
    1616import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
     17import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    1718import org.openstreetmap.josm.tools.Logging;
    1819
     20@FunctionalTest
    1921@Disabled
    2022class UploadStrategySelectionPanelTest extends JFrame {

  • trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

    r19156 r19223  
    5050import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
    5151import org.openstreetmap.josm.testutils.annotations.BasicWiremock;
     52import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    5253import org.openstreetmap.josm.testutils.annotations.HTTP;
    5354import org.openstreetmap.josm.tools.HttpClient.Response;
    … …  
    6566@BasicWiremock
    6667@BasicPreferences
     68@FunctionalTest
    6769@Timeout(15)
    6870class HttpClientTest {

  • trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java

    r19221 r19223  
    3535import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    3636import org.openstreetmap.josm.gui.tagging.presets.items.Key;
     37import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    3738import org.xml.sax.SAXException;
    3839
    … …  
    4344 * Unit tests of {@link ImageProvider} class.
    4445 */
     46@FunctionalTest
    4547class ImageProviderTest {
    4648    private static final class LogHandler14319 extends Handler {

  • trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java

    r18853 r19223  
    55
    66import org.junit.jupiter.api.Test;
     7import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
     8import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
    79
    810/**
    911 * Integration tests of {@link ImageProvider} class.
    1012 */
     13@FunctionalTest
     14@IntegrationTest
    1115class ImageProviderTestIT {
    1216    /**

  • trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java

    r18853 r19223  
    1313import org.junit.jupiter.api.Disabled;
    1414import org.junit.jupiter.api.Test;
     15import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
    1516
    1617/**
    1718 * Unit tests of {@link ImageProvider} class for manual execution.
    1819 */
     20@FunctionalTest
    1921class ImageProviderTestManual {
    2022    /**
Note: See TracChangeset for help on using the changeset viewer.