Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java =================================================================== --- applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java (revision 36064) @@ -2,24 +2,18 @@ package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import org.junit.Rule; -import org.junit.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import org.junit.jupiter.api.Test; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; /** * Unit tests of {@link ToulouseModule} class. */ -public class ToulouseModuleTest { - - /** - * Setup test. - */ - @Rule - public JOSMTestRules rules = new JOSMTestRules().preferences(); - +@BasicPreferences +class ToulouseModuleTest { @Test - public void testHandlersConstruction() { + void testHandlersConstruction() { ToulouseModule module = new ToulouseModule(null); assertFalse(module.getHandlers().isEmpty()); Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTestIT.java =================================================================== --- applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTestIT.java (revision 36062) +++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTestIT.java (revision 36064) @@ -2,5 +2,6 @@ package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -8,8 +9,8 @@ import java.util.TreeMap; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import org.openstreetmap.josm.tools.HttpClient; @@ -17,14 +18,9 @@ * Integration tests of {@link ToulouseModule} class. */ -public class ToulouseModuleTestIT { - - /** - * Setup test. - */ - @Rule - public JOSMTestRules rules = new JOSMTestRules().preferences().timeout(30_000); - +@BasicPreferences +@Timeout(30) +class ToulouseModuleTestIT { @Test - public void testUrlValidity() throws IOException { + void testUrlValidity() throws IOException { Map errors = new TreeMap<>(); for (AbstractDataSetHandler handler : new ToulouseModule(null).getNewlyInstanciatedHandlers()) { @@ -34,5 +30,5 @@ } } - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } } Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java (revision 36064) @@ -3,15 +3,16 @@ import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; +import java.nio.file.Files; import java.nio.file.Path; import java.util.Map.Entry; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Timeout; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; import org.openstreetmap.josm.tools.Logging; @@ -20,12 +21,7 @@ */ @BasicPreferences +@Projection +@Timeout(value = 10, unit = TimeUnit.MINUTES) class ZipReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - public JOSMTestRules rules = new JOSMTestRules().projection().noTimeout(); - /** * Test for various zip files reading @@ -37,5 +33,5 @@ File zipfile = p.toFile(); Logging.info("Testing reading file "+zipfile.getPath()); - try (InputStream is = new FileInputStream(zipfile)) { + try (InputStream is = Files.newInputStream(zipfile.toPath())) { for (Entry entry : ZipReader.parseDataSets(is, null, null, false).entrySet()) { String name = entry.getKey().getName(); Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/datasets/DataSetUpdaterTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/datasets/DataSetUpdaterTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/datasets/DataSetUpdaterTest.java (revision 36064) @@ -2,10 +2,15 @@ package org.openstreetmap.josm.plugins.opendata.core.io.datasets; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; +import java.nio.file.Files; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; @@ -17,7 +22,5 @@ import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -25,4 +28,6 @@ */ @BasicPreferences +@Projection +@Timeout(value = 1, unit = TimeUnit.MINUTES) class DataSetUpdaterTest { @@ -31,5 +36,5 @@ */ @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection().devAPI().timeout(60000); + JOSMTestRules rules = new JOSMTestRules().devAPI(); /** @@ -40,5 +45,5 @@ void testTicket11166() throws Exception { File file = new File(TestUtils.getRegressionDataFile(11166, "raba760dissJosm.zip")); - try (InputStream is = new FileInputStream(file)) { + try (InputStream is = Files.newInputStream(file.toPath())) { Predicate p = w -> w.getNodesCount() >= 0.9 * OsmApi.getOsmApi().getCapabilities().getMaxWayNodes(); DataSet ds = ZipReader.parseDataSet(is, null, null, false); Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java (revision 36064) @@ -6,13 +6,14 @@ import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; +import java.nio.file.Files; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Timeout; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -20,12 +21,7 @@ */ @BasicPreferences +@Projection +@Timeout(value = 1, unit = TimeUnit.MINUTES) class GmlReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection().timeout(60000); - /** * Non-regression test for ticket #11624 @@ -35,5 +31,5 @@ void testTicket11624() throws Exception { File file = new File(TestUtils.getRegressionDataFile(11624, "temp3.gml")); - try (InputStream is = new FileInputStream(file)) { + try (InputStream is = Files.newInputStream(file.toPath())) { for (Node n : GmlReader.parseDataSet(is, null, null).getNodes()) { assertNotNull(n.getCoor(), n.toString()); Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 36064) @@ -8,9 +8,8 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -18,12 +17,6 @@ */ @BasicPreferences +@Projection class KmlReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection(); - /** * Unit test of {@link KmlReader#COLOR_PATTERN} Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java (revision 36064) @@ -8,5 +8,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.DataSet; @@ -14,6 +13,6 @@ import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -21,12 +20,6 @@ */ @BasicPreferences +@Projection class MifReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection(); - private static AbstractDataSetHandler newHandler(final String epsgCode) { AbstractDataSetHandler handler = new AbstractDataSetHandler() { Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 36064) @@ -1,21 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.opendata.core.io.geographic; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.Collection; -import java.util.Objects; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,16 +8,30 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.nio.file.Files; +import java.util.Collection; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; + /** * Unit tests of {@link ShpReader} class. */ @BasicPreferences +@Projection +@Timeout(value = 1, unit = TimeUnit.MINUTES) class ShpReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection().timeout(60000); - /** * Non-regression test for ticket #12714 @@ -44,5 +41,5 @@ void testTicket12714() throws Exception { File file = new File(TestUtils.getRegressionDataFile(12714, "linhas.shp")); - try (InputStream is = new FileInputStream(file)) { + try (InputStream is = Files.newInputStream(file.toPath())) { for (Node n : ShpReader.parseDataSet(is, file, null, null).getNodes()) { assertNotNull(n.getCoor(), n.toString()); Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java (revision 36064) @@ -3,13 +3,14 @@ import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; +import java.nio.file.Files; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Timeout; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -17,12 +18,7 @@ */ @BasicPreferences +@Projection +@Timeout(value = 1, unit = TimeUnit.MINUTES) class TabReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection().timeout(60000); - /** * Non-regression test for ticket #15159 @@ -32,5 +28,5 @@ void testTicket15159() throws Exception { File file = new File(TestUtils.getRegressionDataFile(15159, "Sanisette.tab")); - try (InputStream is = new FileInputStream(file)) { + try (InputStream is = Files.newInputStream(file.toPath())) { NonRegFunctionalTests.testGeneric("#15159", TabReader.parseDataSet(is, file, null, null)); } Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 36064) @@ -5,5 +5,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.EastNorth; @@ -13,6 +12,6 @@ import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -20,12 +19,6 @@ */ @BasicPreferences +@Projection class CsvReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection(); - private static AbstractDataSetHandler newHandler(final String epsgCode) { AbstractDataSetHandler handler = new AbstractDataSetHandler() { Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java (revision 36064) @@ -5,9 +5,8 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -15,11 +14,6 @@ */ @BasicPreferences +@Projection class OdsReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - JOSMTestRules rules = new JOSMTestRules().projection(); /** Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java (revision 36062) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java (revision 36064) @@ -1,9 +1,11 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.opendata.core.io.tabular; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.EastNorth; @@ -14,9 +16,6 @@ import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler; import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -24,12 +23,6 @@ */ @BasicPreferences +@Projection class XlsReaderTest { - - /** - * Setup test. - */ - @RegisterExtension - public JOSMTestRules rules = new JOSMTestRules().projection(); - private static AbstractDataSetHandler newHandler(final String epsgCode) { AbstractDataSetHandler handler = new AbstractDataSetHandler() {