Changeset 19223 in josm for trunk/test
- Timestamp:
- 2024-09-17T17:42:35+02:00 (3 months ago)
- Location:
- trunk/test
- Files:
-
- 3 added
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java
r18870 r19223 17 17 import org.openstreetmap.josm.io.OsmReader; 18 18 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 19 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 20 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 19 21 20 22 /** … … 22 24 */ 23 25 @BasicPreferences 26 @FunctionalTest 27 @IntegrationTest 24 28 class BoundariesTestIT { 25 29 -
trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java
r18870 r19223 10 10 import org.openstreetmap.josm.spi.preferences.Config; 11 11 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 12 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 13 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 12 14 import org.openstreetmap.josm.tools.HttpClient; 13 15 … … 17 19 */ 18 20 @BasicPreferences 21 @FunctionalTest 22 @IntegrationTest 19 23 @Timeout(60) 20 24 class ImageryCompareTestIT { -
trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
r19003 r19223 18 18 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; 19 19 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 20 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 20 21 import org.openstreetmap.josm.testutils.annotations.Territories; 21 22 import org.openstreetmap.josm.tools.HttpClient; … … 30 31 */ 31 32 @BasicPreferences 33 @FunctionalTest 32 34 @Timeout(20) 33 35 @Territories -
trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
r18853 r19223 8 8 import org.junit.jupiter.api.Disabled; 9 9 import org.junit.jupiter.api.Test; 10 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 10 11 11 12 /** 12 13 * Tests the {@link GettingStarted} class. 13 14 */ 15 @FunctionalTest 14 16 class GettingStartedTest { 15 17 /** -
trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
r19221 r19223 34 34 import org.openstreetmap.josm.io.OsmReader; 35 35 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 36 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 36 37 import org.openstreetmap.josm.testutils.annotations.Projection; 37 38 import org.openstreetmap.josm.tools.Utils; … … 44 45 */ 45 46 @BasicPreferences 47 @FunctionalTest 46 48 @Projection 47 49 public class MapCSSRendererTest { -
trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
r18870 r19223 32 32 import org.openstreetmap.josm.io.OsmReader; 33 33 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 34 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 34 35 import org.openstreetmap.josm.testutils.annotations.Main; 35 36 import org.openstreetmap.josm.testutils.annotations.Projection; … … 40 41 */ 41 42 @BasicPreferences 43 @FunctionalTest 42 44 @Main 43 45 @org.openstreetmap.josm.testutils.annotations.MapPaintStyles -
trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
r18821 r19223 49 49 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 50 50 import org.openstreetmap.josm.gui.util.GuiHelper; 51 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 51 52 import org.openstreetmap.josm.testutils.annotations.TestUser; 52 53 import org.openstreetmap.josm.tools.Logging; … … 57 58 * Unit tests of {@link MultiFetchServerObjectReader}. 58 59 */ 60 @FunctionalTest 59 61 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS") 60 62 @Timeout(value = 1, unit = TimeUnit.MINUTES) -
trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
r18893 r19223 42 42 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 43 43 import org.openstreetmap.josm.spi.preferences.Config; 44 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 44 45 import org.openstreetmap.josm.testutils.annotations.TestUser; 45 46 import org.openstreetmap.josm.tools.JosmRuntimeException; … … 52 53 * @since 1806 53 54 */ 55 @FunctionalTest 54 56 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS") 55 57 @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 15 15 import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel; 16 16 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 17 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 17 18 import org.openstreetmap.josm.tools.Logging; 18 19 20 @FunctionalTest 19 21 @Disabled 20 22 class UploadStrategySelectionPanelTest extends JFrame { -
trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
r19156 r19223 50 50 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 51 51 import org.openstreetmap.josm.testutils.annotations.BasicWiremock; 52 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 52 53 import org.openstreetmap.josm.testutils.annotations.HTTP; 53 54 import org.openstreetmap.josm.tools.HttpClient.Response; … … 65 66 @BasicWiremock 66 67 @BasicPreferences 68 @FunctionalTest 67 69 @Timeout(15) 68 70 class HttpClientTest { -
trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java
r19221 r19223 35 35 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; 36 36 import org.openstreetmap.josm.gui.tagging.presets.items.Key; 37 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 37 38 import org.xml.sax.SAXException; 38 39 … … 43 44 * Unit tests of {@link ImageProvider} class. 44 45 */ 46 @FunctionalTest 45 47 class ImageProviderTest { 46 48 private static final class LogHandler14319 extends Handler { -
trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java
r18853 r19223 5 5 6 6 import org.junit.jupiter.api.Test; 7 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 8 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 7 9 8 10 /** 9 11 * Integration tests of {@link ImageProvider} class. 10 12 */ 13 @FunctionalTest 14 @IntegrationTest 11 15 class ImageProviderTestIT { 12 16 /** -
trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java
r18853 r19223 13 13 import org.junit.jupiter.api.Disabled; 14 14 import org.junit.jupiter.api.Test; 15 import org.openstreetmap.josm.testutils.annotations.FunctionalTest; 15 16 16 17 /** 17 18 * Unit tests of {@link ImageProvider} class for manual execution. 18 19 */ 20 @FunctionalTest 19 21 class ImageProviderTestManual { 20 22 /** -
trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
r18870 r19223 20 20 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; 21 21 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator; 22 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 22 23 import org.openstreetmap.josm.testutils.annotations.Projection; 23 24 … … 28 29 * @author Michael Zangl 29 30 */ 31 @PerformanceTest 30 32 @Projection 31 33 @Timeout(value = 15, unit = TimeUnit.MINUTES) -
trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java
r17275 r19223 9 9 10 10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 11 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 11 12 12 13 /** 13 14 * Checks that rounding of coordinates is not too slow. 14 15 */ 16 @PerformanceTest 15 17 class RoundingPerformanceTest { 16 18 -
trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java
r18870 r19223 24 24 import org.openstreetmap.josm.io.Compression; 25 25 import org.openstreetmap.josm.io.OsmReader; 26 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 26 27 import org.openstreetmap.josm.testutils.annotations.Projection; 27 28 import org.openstreetmap.josm.testutils.annotations.Territories; … … 32 33 * Abstract superclass of {@code StyledMapRendererPerformanceTest} and {@code WireframeMapRendererPerformanceTest}. 33 34 */ 35 @PerformanceTest 34 36 @Projection 35 37 @Territories -
trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java
r17275 r19223 12 12 13 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 14 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 14 15 15 16 /** 16 17 * Performance test of {@code StyledMapRenderer}. 17 18 */ 19 @PerformanceTest 18 20 class StyledMapRendererPerformanceTest extends AbstractMapRendererPerformanceTestParent { 19 21 -
trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRendererPerformanceTest.java
r17275 r19223 4 4 import org.junit.jupiter.api.AfterAll; 5 5 import org.junit.jupiter.api.BeforeAll; 6 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 6 7 7 8 /** 8 9 * Performance test of {@code WireframeMapRenderer}. 9 10 */ 11 @PerformanceTest 10 12 class WireframeMapRendererPerformanceTest extends AbstractMapRendererPerformanceTestParent { 11 13 -
trunk/test/performance/org/openstreetmap/josm/data/validation/ValidationTaskPerformanceTest.java
r18799 r19223 18 18 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 19 19 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 20 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 20 21 import org.openstreetmap.josm.testutils.annotations.Projection; 21 22 import org.openstreetmap.josm.testutils.annotations.Territories; … … 25 26 */ 26 27 @BasicPreferences 28 @PerformanceTest 27 29 @Projection 28 30 @Territories -
trunk/test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java
r18799 r19223 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 8 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 9 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 9 10 import org.openstreetmap.josm.testutils.annotations.Projection; 10 11 import org.openstreetmap.josm.testutils.annotations.Territories; … … 14 15 */ 15 16 @BasicPreferences 17 @PerformanceTest 16 18 @Projection 17 19 @Territories -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
r19050 r19223 46 46 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 47 47 import org.openstreetmap.josm.testutils.annotations.Main; 48 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 48 49 import org.openstreetmap.josm.testutils.annotations.Projection; 49 50 import org.openstreetmap.josm.testutils.annotations.Territories; … … 56 57 @BasicPreferences 57 58 @Main 59 @PerformanceTest 58 60 @Projection 59 61 @Territories -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSConditionPerformanceTest.java
r17275 r19223 7 7 import org.openstreetmap.josm.PerformanceTestUtils; 8 8 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op; 9 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 9 10 10 11 /** … … 12 13 * @author Michael Zangl 13 14 */ 15 @PerformanceTest 14 16 class MapCSSConditionPerformanceTest { 15 17 /** -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java
r18870 r19223 20 20 import org.openstreetmap.josm.gui.mappaint.MapRendererPerformanceTest; 21 21 import org.openstreetmap.josm.io.IllegalDataException; 22 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 22 23 import org.openstreetmap.josm.testutils.annotations.Projection; 23 24 … … 27 28 * 28 29 */ 30 @PerformanceTest 29 31 @Projection 30 32 class MapCSSPerformanceTest { -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterPerformanceTest.java
r18893 r19223 11 11 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator; 12 12 import org.openstreetmap.josm.gui.mappaint.MultiCascade; 13 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 13 14 import org.openstreetmap.josm.testutils.annotations.Projection; 14 15 … … 17 18 * @author Michael Zangl 18 19 */ 20 @PerformanceTest 19 21 @Projection 20 22 @Timeout(value = 15, unit = TimeUnit.MINUTES) -
trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
r18853 r19223 17 17 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; 18 18 import org.openstreetmap.josm.data.osm.DataSet; 19 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 19 20 20 21 /** … … 25 26 * @author Michael Zangl 26 27 */ 28 @PerformanceTest 27 29 @Timeout(value = 15, unit = TimeUnit.MINUTES) 28 30 class OsmReaderPerformanceTest { -
trunk/test/performance/org/openstreetmap/josm/io/OsmWriterPerformanceTest.java
r18853 r19223 12 12 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; 13 13 import org.openstreetmap.josm.data.osm.DataSet; 14 import org.openstreetmap.josm.testutils.annotations.PerformanceTest; 14 15 15 16 /** … … 18 19 * For this, we use the neubrandenburg-file, which is a good real world example of an OSM file. 19 20 */ 21 @PerformanceTest 20 22 @Timeout(value = 15, unit = TimeUnit.MINUTES) 21 23 class OsmWriterPerformanceTest { -
trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java
r18893 r19223 48 48 import org.junit.jupiter.api.Test; 49 49 import org.openstreetmap.josm.testutils.annotations.HTTPS; 50 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 50 51 import org.openstreetmap.josm.tools.Logging; 51 52 … … 58 59 */ 59 60 @HTTPS 61 @IntegrationTest 60 62 class DomainValidatorTestIT { 61 63 /** -
trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTestIT.java
r18893 r19223 6 6 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser; 7 7 import org.openstreetmap.josm.testutils.annotations.HTTPS; 8 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 8 9 import org.openstreetmap.josm.testutils.annotations.Projection; 9 10 … … 13 14 @HTTPS 14 15 @Projection 16 @IntegrationTest 15 17 class MapCSSParserTestIT { 16 18 /** -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
r19056 r19223 68 68 import org.openstreetmap.josm.testutils.annotations.HTTPS; 69 69 import org.openstreetmap.josm.testutils.annotations.I18n; 70 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 70 71 import org.openstreetmap.josm.testutils.annotations.ProjectionNadGrids; 71 72 import org.openstreetmap.josm.tools.HttpClient; … … 79 80 @HTTPS 80 81 @I18n 82 @IntegrationTest 81 83 @org.openstreetmap.josm.testutils.annotations.Projection 82 84 @ProjectionNadGrids -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
r18893 r19223 27 27 import org.openstreetmap.josm.gui.preferences.AbstractExtendedSourceEntryTestCase; 28 28 import org.openstreetmap.josm.testutils.annotations.HTTPS; 29 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 29 30 import org.openstreetmap.josm.tools.ImageProvider; 30 31 … … 33 34 */ 34 35 @HTTPS 36 @IntegrationTest 35 37 @Timeout(value = 15, unit = TimeUnit.MINUTES) 36 38 class MapPaintPreferenceTestIT extends AbstractExtendedSourceEntryTestCase { -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
r19195 r19223 39 39 import org.openstreetmap.josm.spi.preferences.Config; 40 40 import org.openstreetmap.josm.testutils.annotations.HTTPS; 41 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 41 42 import org.openstreetmap.josm.testutils.annotations.Territories; 42 43 import org.openstreetmap.josm.tools.HttpClient; … … 51 52 */ 52 53 @HTTPS 54 @IntegrationTest 53 55 @Territories 54 56 @Timeout(value = 20, unit = TimeUnit.MINUTES) -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java
r18893 r19223 25 25 import org.openstreetmap.josm.gui.preferences.AbstractExtendedSourceEntryTestCase; 26 26 import org.openstreetmap.josm.testutils.annotations.HTTPS; 27 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 27 28 28 29 /** … … 30 31 */ 31 32 @HTTPS 33 @IntegrationTest 32 34 @Timeout(20) 33 35 class ValidatorTagCheckerRulesPreferenceTestIT extends AbstractExtendedSourceEntryTestCase { -
trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java
r19158 r19223 18 18 import org.openstreetmap.josm.TestUtils; 19 19 import org.openstreetmap.josm.testutils.annotations.HTTPS; 20 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 20 21 21 22 /** … … 23 24 */ 24 25 @HTTPS 26 @IntegrationTest 25 27 @Timeout(20) 26 28 class CertificateAmendmentTestIT { -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
r19209 r19223 42 42 import org.openstreetmap.josm.testutils.annotations.BasicPreferences; 43 43 import org.openstreetmap.josm.testutils.annotations.HTTPS; 44 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 44 45 import org.openstreetmap.josm.testutils.annotations.Main; 45 46 import org.openstreetmap.josm.testutils.annotations.Plugins; … … 56 57 @BasicPreferences 57 58 @HTTPS 59 @IntegrationTest 58 60 @Main 59 61 @Projection -
trunk/test/unit/org/openstreetmap/josm/testutils/ImageTestUtils.java
r19221 r19223 148 148 public static void writeDebugImages(@Nonnull Path directory, @Nonnull String filePrefix, @Nonnull BufferedImage diff, 149 149 @Nullable BufferedImage oldImage, @Nullable BufferedImage newImage) { 150 if (!UPDATE_ALL ) {150 if (!UPDATE_ALL && false) { 151 151 return; 152 152 } -
trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java
r18853 r19223 11 11 12 12 import jakarta.json.Json; 13 import org.openstreetmap.josm.testutils.annotations.IntegrationTest; 13 14 14 15 /** 15 16 * Integration tests of {@link PlatformHook} class. 16 17 */ 18 @IntegrationTest 17 19 class PlatformHookTestIT { 18 20 /** -
trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java
r18870 r19223 14 14 */ 15 15 @Projection 16 @org.openstreetmap.josm.testutils.annotations.Territories 16 17 class TerritoriesTestIT { 17 18 /**
Note:
See TracChangeset
for help on using the changeset viewer.