Index: trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java (revision 18847) +++ trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java (revision 18853) @@ -6,8 +6,6 @@ import java.io.IOException; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; -import org.openstreetmap.josm.JOSMFixture; /** @@ -15,13 +13,4 @@ */ class GettingStartedTest { - - /** - * Setup test. - */ - @BeforeAll - public static void init() { - JOSMFixture.createFunctionalTestFixture().init(); - } - /** * Tests that image links are replaced. Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java (revision 18847) +++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java (revision 18853) @@ -6,5 +6,4 @@ import javax.swing.JFrame; -import org.junit.jupiter.api.BeforeAll; import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; @@ -18,9 +17,4 @@ class HistoryBrowserTestFT extends JFrame { - - @BeforeAll - public static void init() { - JOSMFixture.createFunctionalTestFixture().init(); - } private HistoryBrowser browser; @@ -57,5 +51,5 @@ public static void main(String[] args) { - HistoryBrowserTestFT.init(); + JOSMFixture.createFunctionalTestFixture().init(); new HistoryBrowserTestFT().setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java (revision 18847) +++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java (revision 18853) @@ -25,11 +25,8 @@ import javax.swing.ImageIcon; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; @@ -38,9 +35,7 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; import org.openstreetmap.josm.gui.tagging.presets.items.Key; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.xml.sax.SAXException; import com.kitfox.svg.SVGConst; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -49,12 +44,4 @@ */ class ImageProviderTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static final class LogHandler14319 extends Handler { boolean failed; @@ -74,12 +61,4 @@ public void close() throws SecurityException { } - } - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); } Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java (revision 18847) +++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java (revision 18853) @@ -5,8 +5,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class ImageProviderTestIT { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test fetching an image using {@code wiki://} protocol. Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java (revision 18847) +++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java (revision 18853) @@ -11,10 +11,6 @@ import javax.swing.JPanel; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,17 +18,9 @@ */ class ImageProviderTestManual { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test getting a cursor * @throws InterruptedException in case of thread interruption */ - @Disabled("manual execution only, as the look of the cursor cannot be checked automatedly") + @Disabled("manual execution only, as the look of the cursor cannot be checked automatically") @Test void testGetCursor() throws InterruptedException { Index: trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java =================================================================== --- trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java (revision 18847) +++ trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java (revision 18853) @@ -12,8 +12,6 @@ import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.PerformanceTestUtils; import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; @@ -30,12 +28,4 @@ class OsmReaderPerformanceTest { private static final int TIMES = 4; - - /** - * Prepare the test. - */ - @BeforeAll - public static void createJOSMFixture() { - JOSMFixture.createPerformanceTestFixture().init(true); - } /** Index: trunk/test/performance/org/openstreetmap/josm/io/OsmWriterPerformanceTest.java =================================================================== --- trunk/test/performance/org/openstreetmap/josm/io/OsmWriterPerformanceTest.java (revision 18847) +++ trunk/test/performance/org/openstreetmap/josm/io/OsmWriterPerformanceTest.java (revision 18853) @@ -1,17 +1,15 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.io; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Timeout; -import org.openstreetmap.josm.JOSMFixture; -import org.openstreetmap.josm.PerformanceTestUtils; -import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; -import org.openstreetmap.josm.data.osm.DataSet; import java.io.PrintWriter; import java.io.StringWriter; import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.openstreetmap.josm.PerformanceTestUtils; +import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer; +import org.openstreetmap.josm.data.osm.DataSet; /** @@ -24,12 +22,4 @@ private static final int TIMES = 4; private DataSet neubrandenburgDataSet; - - /** - * Prepare the test. - */ - @BeforeAll - public static void createJOSMFixture() { - JOSMFixture.createPerformanceTestFixture().init(true); - } /** Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java (revision 18853) @@ -15,5 +15,4 @@ import java.util.Set; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -24,7 +23,5 @@ import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.io.OsmReader; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; @@ -33,12 +30,4 @@ */ class CombineWayActionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Non-regression test for bug #11957. Index: trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayNoTagCorrectorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayNoTagCorrectorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayNoTagCorrectorTest.java (revision 18853) @@ -4,12 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.osm.Tagged; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -17,12 +13,4 @@ */ class ReverseWayNoTagCorrectorTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests the {@link ReverseWayNoTagCorrector#getDirectionalTags} function Index: trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java (revision 18853) @@ -12,5 +12,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.correction.TagCorrection; import org.openstreetmap.josm.data.osm.Node; @@ -19,7 +18,5 @@ import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -28,12 +25,4 @@ */ class ReverseWayTagCorrectorTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code ReverseWayTagCorrector.TagSwitcher} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTaskTest.java (revision 18853) @@ -2,15 +2,12 @@ package org.openstreetmap.josm.actions.downloadtasks; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; import java.awt.Component; import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +15,4 @@ */ class ChangesetContentDownloadTaskTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@code ChangesetContentDownloadTask#ChangesetContentDownloadTask}. @@ -34,7 +23,7 @@ // empty component }; - assertNotNull(new ChangesetContentDownloadTask(parent, 1)); - assertNotNull(new ChangesetContentDownloadTask(parent, Arrays.asList(1, 2))); - assertNotNull(new ChangesetContentDownloadTask(parent, null)); + assertDoesNotThrow(() -> new ChangesetContentDownloadTask(parent, 1)); + assertDoesNotThrow(() -> new ChangesetContentDownloadTask(parent, Arrays.asList(1, 2))); + assertDoesNotThrow(() -> new ChangesetContentDownloadTask(parent, null)); } @@ -60,5 +49,6 @@ @Test void testChangesetContentDownloadTaskNullParent2() { - assertThrows(IllegalArgumentException.class, () -> new ChangesetContentDownloadTask(Arrays.asList(1, 2))); + final List toDownload = Arrays.asList(1, 2); + assertThrows(IllegalArgumentException.class, () -> new ChangesetContentDownloadTask(toDownload)); } } Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java (revision 18853) @@ -6,12 +6,9 @@ import java.awt.Component; +import java.util.Collection; import java.util.Collections; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.Changeset; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -19,12 +16,4 @@ */ class ChangesetHeaderDownloadTaskTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@code ChangesetHeaderDownloadTask#buildTaskForChangesets}. @@ -36,5 +25,5 @@ }; assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.singleton(new Changeset(1)))); - assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.singleton(null))); + assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.singleton(null))); assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, null)); } @@ -45,6 +34,7 @@ @Test void testBuildTaskForChangesetsNullParent() { + final Collection changesets = Collections.singleton(new Changeset(1)); assertThrows(NullPointerException.class, - () -> ChangesetHeaderDownloadTask.buildTaskForChangesets(Collections.singleton(new Changeset(1)))); + () -> ChangesetHeaderDownloadTask.buildTaskForChangesets(changesets)); } } Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTaskTest.java (revision 18853) @@ -2,5 +2,5 @@ package org.openstreetmap.josm.actions.downloadtasks; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -8,9 +8,5 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.io.ChangesetQuery; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class ChangesetQueryTaskTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@code ChangesetQueryTask#ChangesetQueryTask}. @@ -34,5 +22,5 @@ // empty component }; - assertNotNull(new ChangesetQueryTask(parent, new ChangesetQuery())); + assertDoesNotThrow(() -> new ChangesetQueryTask(parent, new ChangesetQuery())); } @@ -42,5 +30,6 @@ @Test void testChangesetQueryTaskNullParent() { - assertThrows(IllegalArgumentException.class, () -> new ChangesetQueryTask(new ChangesetQuery())); + final ChangesetQuery query = new ChangesetQuery(); + assertThrows(IllegalArgumentException.class, () -> new ChangesetQueryTask(query)); } } Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java (revision 18853) @@ -2,10 +2,9 @@ package org.openstreetmap.josm.actions.downloadtasks; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; @@ -13,7 +12,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -21,12 +17,4 @@ */ class DownloadReferrersTaskTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@code DownloadReferrersTask#DownloadReferrersTask}. @@ -42,13 +30,10 @@ ds.addPrimitive(n2); OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); - assertNotNull(new DownloadReferrersTask(layer, null)); - assertNotNull(new DownloadReferrersTask(layer, ds.allPrimitives())); - try { - new DownloadReferrersTask(layer, n1.getPrimitiveId(), null); - fail(); - } catch (IllegalArgumentException e) { - assertEquals("Cannot download referrers for new primitives (ID -1)", e.getMessage()); - } - assertNotNull(new DownloadReferrersTask(layer, n2.getPrimitiveId(), null)); + assertDoesNotThrow(() -> new DownloadReferrersTask(layer, null)); + assertDoesNotThrow(() -> new DownloadReferrersTask(layer, ds.allPrimitives())); + IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, + () -> new DownloadReferrersTask(layer, n1, null)); + assertEquals("Cannot download referrers for new primitives (ID -1)", iae.getMessage()); + assertDoesNotThrow(() -> new DownloadReferrersTask(layer, n2.getPrimitiveId(), null)); } } Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java (revision 18853) @@ -2,6 +2,6 @@ package org.openstreetmap.josm.actions.downloadtasks; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertNull; import java.awt.geom.Area; @@ -9,10 +9,6 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -20,12 +16,4 @@ */ class DownloadTaskListTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@code DownloadTaskList#DownloadTaskList}. @@ -50,5 +38,5 @@ assertTrue(list.getDownloadedPrimitives().isEmpty()); assertNull(list.download(false, - Collections.singletonList(new Area(new Bounds(0, 0, true).asRect())), false, false, NullProgressMonitor.INSTANCE).get()); + Collections.singletonList(new Area(new Bounds(0, 0, true).asRect())), false, false, NullProgressMonitor.INSTANCE).get()); assertTrue(list.getDownloadedPrimitives().isEmpty()); } Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java (revision 18853) @@ -14,11 +14,7 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.gui.progress.ProgressMonitor; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -26,12 +22,4 @@ */ class PostDownloadHandlerTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static DownloadTask newTask(final List errorObjects) { return new DownloadTask() { Index: trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -9,7 +8,5 @@ import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -19,12 +16,4 @@ */ class TransformNodesCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link TransformNodesCommand#equals} and {@link TransformNodesCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (revision 18853) @@ -8,5 +8,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.command.CommandTest.CommandTestData; @@ -17,7 +16,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -27,11 +24,4 @@ */ class ConflictAddCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); private CommandTestData testData; Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -10,7 +9,5 @@ import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -20,12 +17,4 @@ */ class ConflictResolveCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link ConflictResolveCommand#equals} and {@link ConflictResolveCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (revision 18853) @@ -8,5 +8,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.command.CommandTest.CommandTestData; @@ -19,7 +18,5 @@ import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -31,11 +28,4 @@ private CommandTestData testData; - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); /** Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class DeletedStateConflictResolveCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link DeletedStateConflictResolveCommand#equals} and {@link DeletedStateConflictResolveCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class ModifiedConflictResolveCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link ModifiedConflictResolveCommand#equals} and {@link ModifiedConflictResolveCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class RelationMemberConflictResolverCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link RelationMemberConflictResolverCommand#equals} and {@link RelationMemberConflictResolverCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class TagConflictResolveCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link TagConflictResolveCommand#equals} and {@link TagConflictResolveCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class VersionConflictResolveCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link VersionConflictResolveCommand#equals} and {@link VersionConflictResolveCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.command.conflict; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -11,7 +10,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class WayNodesConflictResolverCommandTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link WayNodesConflictResolverCommand#equals} and {@link WayNodesConflictResolverCommand#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java (revision 18853) @@ -4,10 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.conflict.ConflictCollection; @@ -19,7 +18,4 @@ import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -27,12 +23,4 @@ */ class APIDataSetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @Test void testOneNewRelationOnly() throws CyclicUploadDependencyException { @@ -250,10 +238,5 @@ APIDataSet apiDataSet = new APIDataSet(); apiDataSet.init(ds); - try { - apiDataSet.adjustRelationUploadOrder(); - fail("expected cyclic upload dependency exception not thrown"); - } catch (CyclicUploadDependencyException e) { - System.out.println(e); - } + assertThrows(CyclicUploadDependencyException.class, apiDataSet::adjustRelationUploadOrder); } } Index: trunk/test/unit/org/openstreetmap/josm/data/VersionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/VersionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/VersionTest.java (revision 18853) @@ -8,7 +8,5 @@ import java.nio.charset.StandardCharsets; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; /** @@ -16,13 +14,4 @@ */ class VersionTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link Version#getAgentString} Index: trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java (revision 18853) @@ -4,10 +4,7 @@ import java.text.DecimalFormat; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -17,12 +14,4 @@ */ class CachedLatLonTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link CachedLatLon#equals} and {@link CachedLatLon#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java (revision 18853) @@ -2,10 +2,7 @@ package org.openstreetmap.josm.data.correction; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; @@ -14,12 +11,4 @@ */ class TagCorrectionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link TagCorrection#equals} and {@link TagCorrection#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionCollectionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionCollectionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionCollectionTest.java (revision 18853) @@ -9,10 +9,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; import org.xml.sax.helpers.AttributesImpl; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -20,12 +16,4 @@ */ class GpxExtensionCollectionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @BeforeEach void before() { Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.data.gpx; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -8,7 +7,5 @@ import org.openstreetmap.josm.io.GpxReaderTest; import org.openstreetmap.josm.io.GpxWriterTest; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -18,12 +15,4 @@ */ class GpxExtensionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link GpxExtension#equals} and {@link GpxExtension#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (revision 18853) @@ -18,5 +18,4 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.CachedLatLon; @@ -25,25 +24,15 @@ import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.spi.preferences.IPreferences; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.Timezone; import org.openstreetmap.josm.tools.date.DateUtils; -import org.openstreetmap.josm.tools.date.DateUtilsTest; import org.xml.sax.SAXException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests of {@link GpxImageCorrelation} class. */ +@TestInstance(Lifecycle.PER_CLASS) @TestMethodOrder(MethodName.class) -@TestInstance(Lifecycle.PER_CLASS) +@Timezone class GpxImageCorrelationTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - GpxData gpx; GpxImageEntry ib, i0, i1, i2, i3, i4, i5, i6, i7; @@ -59,5 +48,4 @@ public void setUp() throws IOException, SAXException { s = Config.getPref(); - DateUtilsTest.setTimeZone(DateUtils.UTC); gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "tracks/tracks.gpx"); @@ -109,5 +97,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #1: default settings * tag images within 2 minutes to tracks/segments, interpolate between segments only @@ -157,5 +145,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #2: Disable all interpolation and tagging close to tracks. Only i1-i4 are tagged */ @@ -181,5 +169,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #3: Disable all interpolation and allow tagging within 1 minute of a track. i0-i5 are tagged. * i6 will not be tagged, because it's 68 seconds away from the next waypoint in either direction @@ -210,5 +198,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #4: Force tagging (parameter forceTags=true, no change of configuration). All images will be tagged * i5-i6 will now be interpolated, therefore it will have an elevation and different coordinates than in tests above @@ -236,5 +224,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #5: Force tagging (parameter forceTags=false, but configuration changed). * Results same as #4 @@ -273,5 +261,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #6: Disable tagging but allow interpolation when tracks are less than 500m apart. i0-i4 are tagged. * i5-i6 will not be tagged, because the tracks are 897m apart. @@ -293,5 +281,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #7: Disable tagging but allow interpolation when tracks are less than 1000m apart. i0-i6 are tagged. * i5-i6 will be tagged, because the tracks are 897m apart. @@ -312,5 +300,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #8: Disable tagging but allow interpolation when tracks are less than 2 min apart. i0-i4 are tagged. * i5-i6 will not be tagged, because the tracks are 2.5min apart. @@ -331,5 +319,5 @@ /** * Tests matching of images to a GPX track. - * + *

* TEST #9: Disable tagging but allow interpolation when tracks are less than 3 min apart. i0-i6 are tagged. * i5-i6 will be tagged, because the tracks are 2.5min apart. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageEntryTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageEntryTest.java (revision 18853) @@ -4,10 +4,7 @@ import java.io.File; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -17,12 +14,4 @@ */ class GpxImageEntryTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link GpxImageEntry#equals} and {@link GpxImageEntry#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxOffsetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxOffsetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxOffsetTest.java (revision 18853) @@ -6,33 +6,12 @@ import java.text.ParseException; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import org.openstreetmap.josm.tools.date.DateUtils; -import org.openstreetmap.josm.tools.date.DateUtilsTest; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.openstreetmap.josm.testutils.annotations.Timezone; /** * Unit tests of {@link GpxTimeOffset} class. */ +@Timezone class GpxOffsetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - DateUtilsTest.setTimeZone(DateUtils.UTC); - } - /** * Unit test of {@link GpxTimeOffset#formatOffset}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java (revision 18853) @@ -2,11 +2,8 @@ package org.openstreetmap.josm.data.gpx; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -16,12 +13,4 @@ */ class GpxRouteTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link GpxRoute#equals} and {@link GpxRoute#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java (revision 18853) @@ -6,33 +6,12 @@ import java.text.ParseException; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import org.openstreetmap.josm.tools.date.DateUtils; -import org.openstreetmap.josm.tools.date.DateUtilsTest; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.openstreetmap.josm.testutils.annotations.Timezone; /** * Unit tests of {@link GpxTimezone} class. */ +@Timezone class GpxTimezoneTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - DateUtilsTest.setTimeZone(DateUtils.UTC); - } - /** * Unit test of {@link GpxTimezone#formatTimezone}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java (revision 18853) @@ -2,11 +2,8 @@ package org.openstreetmap.josm.data.gpx; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -16,12 +13,4 @@ */ class GpxTrackSegmentTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link GpxTrackSegment#equals} and {@link GpxTrackSegment#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java (revision 18853) @@ -10,10 +10,7 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.ListenerList; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -23,12 +20,4 @@ */ class GpxTrackTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests whether the track can read and write colors. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 18853) @@ -2,18 +2,15 @@ package org.openstreetmap.josm.data.gpx; -import org.junit.jupiter.api.extension.RegisterExtension; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +import java.time.Instant; + import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - -import java.time.Instant; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; /** @@ -21,12 +18,4 @@ */ class WayPointTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link WayPoint#equals} and {@link WayPoint#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java (revision 18853) @@ -2,10 +2,7 @@ package org.openstreetmap.josm.data.gpx; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -15,12 +12,4 @@ */ class WithAttributesTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link WithAttributes#equals} and {@link WithAttributes#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java (revision 18853) @@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -15,12 +12,4 @@ */ class GetCapabilitiesParseHelperTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code GetCapabilitiesParseHelper} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 18853) @@ -11,10 +11,6 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.StructUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.MultiMap; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,12 +20,4 @@ */ class ImageryInfoTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test if extended URL is returned properly Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTileTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTileTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTileTest.java (revision 18853) @@ -9,4 +9,10 @@ import java.util.stream.Stream; +import org.awaitility.Awaitility; +import org.awaitility.Durations; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.openstreetmap.gui.jmapviewer.Tile; import org.openstreetmap.gui.jmapviewer.interfaces.TileJob; @@ -15,22 +21,11 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.TileJobOptions; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import org.awaitility.Awaitility; -import org.awaitility.Durations; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; /** * Test class for {@link MVTTile} */ -public class MVTTileTest { +class MVTTileTest { private MapboxVectorTileSource tileSource; private MapboxVectorCachedTileLoader loader; - @RegisterExtension - JOSMTestRules rule = new JOSMTestRules(); @BeforeEach void setup() { Index: trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java (revision 18853) @@ -8,9 +8,5 @@ import java.time.Instant; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class NoteCommentTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link NoteComment} class. Index: trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 18853) @@ -8,12 +8,9 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.io.NoteReader; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -23,12 +20,4 @@ */ class NoteTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link Note#toString} method. Index: trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java (revision 18853) @@ -6,9 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.spi.preferences.Config; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; @@ -20,12 +18,4 @@ */ class OAuthParametersTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of method {@link OAuthParameters#createDefault}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java (revision 18853) @@ -7,9 +7,5 @@ import java.util.Collections; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -17,12 +13,4 @@ */ class AbstractPrimitiveTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link AbstractPrimitive#isUndeleted} method. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java (revision 18853) @@ -7,11 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -21,12 +18,4 @@ */ class BBoxTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java (revision 18853) @@ -16,11 +16,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.UserIdentityManager; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import org.openstreetmap.josm.tools.Logging; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -29,12 +25,4 @@ @BasicPreferences class ChangesetCacheTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static final ChangesetCache cache = ChangesetCache.getInstance(); @@ -49,5 +37,5 @@ } - abstract class TestListener implements ChangesetCacheListener { + abstract static class TestListener implements ChangesetCacheListener { protected final CountDownLatch latch = new CountDownLatch(1); @@ -72,5 +60,5 @@ /** - * Unit test of {@link ChangesetCache#ChangesetCache} + * Unit test of {@link ChangesetCache#getInstance()} */ @Test Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java (revision 18853) @@ -10,5 +10,4 @@ import java.util.Iterator; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -17,8 +16,5 @@ import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType; import org.openstreetmap.josm.data.osm.history.HistoryNode; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -26,12 +22,4 @@ */ class ChangesetDataSetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of method {@link ChangesetDataSet#iterator}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java (revision 18853) @@ -6,9 +6,5 @@ import java.time.Instant; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -16,12 +12,4 @@ */ class ChangesetDiscussionCommentTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link ChangesetDiscussionComment} constructor. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (revision 18853) @@ -17,9 +17,7 @@ import java.util.stream.IntStream; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; @@ -30,12 +28,4 @@ */ class ChangesetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of method {@link Changeset#setKeys}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java (revision 18853) @@ -5,9 +5,5 @@ import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -15,12 +11,4 @@ */ class DataIntegrityProblemExceptionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link DataIntegrityProblemException} constructor. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 18853) @@ -18,12 +18,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.projection.ProjectionRegistry; import org.openstreetmap.josm.data.projection.Projections; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -31,12 +27,4 @@ */ class DataSetMergerTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private DataSet my; private DataSet their; @@ -76,5 +64,5 @@ /** * two identical nodes, even in id and version. No conflict expected. - * + *

* Can happen if data is loaded in two layers and then merged from one layer * on the other. @@ -150,5 +138,5 @@ * Node with same id, my is modified, their has a higher version * => results in a conflict - * + *

* Use case: node which is modified locally and updated by another mapper on * the server @@ -184,5 +172,5 @@ * node with same id, my is deleted, their has a higher version * => results in a conflict - * + *

* Use case: node which is deleted locally and updated by another mapper on * the server @@ -243,5 +231,5 @@ /** * My and their node are new but semantically equal. My node is deleted. - * + *

* => Ignore my node, no conflict */ @@ -266,5 +254,5 @@ /** * My and their node are new but semantically equal. Both are deleted. - * + *

* => take mine */ @@ -291,5 +279,5 @@ * their node has no assigned id (id == 0) and is semantically equal to one of my * nodes with id == 0 - * + *

* => merge it onto my node. */ @@ -331,5 +319,5 @@ /** * my node is incomplete, their node is complete - * + *

* => merge it onto my node. My node becomes complete */ @@ -361,5 +349,5 @@ * their way has a higher version and different tags. the nodes are the same. My * way is not modified. Merge is possible. No conflict. - * + *

* => merge it onto my way. */ @@ -433,5 +421,5 @@ * their way has a higher version and different tags. And it has more nodes. Two * of the existing nodes are modified. - * + *

* => merge it onto my way, no conflict */ @@ -494,5 +482,5 @@ assertSame(merged.getNode(0), n1); - assertNotSame(merged.getNode(1), n5); // must be clone of the original node in their + assertNotSame(merged.getNode(1), n5); // must be a clone of the original node in their assertSame(merged.getNode(2), n2); @@ -502,5 +490,5 @@ /** * their way has a higher version and different nodes. My way is modified. - * + *

* => merge onto my way not possible, create a conflict */ @@ -566,5 +554,5 @@ /** * their way is not visible anymore. - * + *

* => conflict */ @@ -719,5 +707,5 @@ * My dataset includes a deleted node. * Their dataset includes a way with three nodes, the first one being my node. - * + *

* => the merged way should include all three nodes. Deleted node should have deleted=false and * special conflict with isDeleted should exist @@ -773,5 +761,5 @@ * My dataset includes a deleted node. * Their dataset includes a relation with three nodes, the first one being my node. - * + *

* => the merged relation should include all three nodes. There should be conflict for deleted * node with isMyDeleted set @@ -823,5 +811,5 @@ /** * Merge an incomplete way with two incomplete nodes into an empty dataset. - * + *

* Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456 */ @@ -865,6 +853,6 @@ /** * Merge an incomplete way with two incomplete nodes into a dataset where the way already exists as complete way. - * - * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456 after a "Update selection " of this way + *

+ * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456 after an "Update selection " of this way */ @Test @@ -928,5 +916,5 @@ // -- source dataset - // an complete node + // a complete node Node n1 = new Node(1, 1); n1.setCoor(new LatLon(1, 1)); @@ -992,5 +980,5 @@ // --- target dataset - // an complete node + // a complete node Node n1b = new Node(1, 2); n1b.setCoor(new LatLon(1, 1)); @@ -1098,5 +1086,5 @@ /** - * Dependency loop in relations,, both deleted in source + * Dependency loop in relations, both deleted in source * => make sure that DataIntegrityProblemException is thrown. */ Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (revision 18853) @@ -14,5 +14,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.Bounds; @@ -21,7 +20,4 @@ import org.openstreetmap.josm.data.osm.event.DataSourceAddedEvent; import org.openstreetmap.josm.data.osm.event.DataSourceRemovedEvent; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -29,12 +25,4 @@ */ class DataSetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of method {@link DataSet#searchRelations}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 18853) @@ -16,5 +16,4 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -25,7 +24,5 @@ import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.io.OsmReader; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -35,12 +32,4 @@ */ class FilterTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @Test void testBasic() throws SearchParseError { Index: trunk/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java (revision 18853) @@ -9,9 +9,5 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -19,12 +15,4 @@ */ class NodeGraphTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link NodeGraph#buildNodePairs} and {@link NodeGraph#eliminateDuplicateNodePairs} Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 18853) @@ -7,13 +7,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.extension.RegisterExtension; +import java.util.Collections; +import java.util.HashSet; + import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import java.util.Collections; -import java.util.HashSet; /** @@ -22,12 +20,4 @@ */ class OsmPrimitiveKeyHandlingTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * test query and get methods on a node withouth keys Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (revision 18853) @@ -10,11 +10,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.projection.ProjectionRegistry; import org.openstreetmap.josm.data.projection.Projections; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class OsmPrimitiveTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private void compareReferrers(OsmPrimitive actual, OsmPrimitive... expected) { assertEquals(new HashSet<>(Arrays.asList(expected)), new HashSet<>(actual.getReferrers())); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java (revision 18853) @@ -6,15 +6,11 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Collection; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class OsmPrimitiveTypeTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link OsmPrimitiveType} enum. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java (revision 18853) @@ -6,6 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Arrays; @@ -13,8 +13,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class OsmUtilsTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link OsmUtils#createPrimitive} Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (revision 18853) @@ -19,5 +19,4 @@ import java.util.Random; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; @@ -26,7 +25,4 @@ import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.io.OsmReader; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -34,12 +30,4 @@ */ class QuadBucketsTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @SuppressWarnings("unchecked") private void removeAllTest(DataSet ds) throws ReflectiveOperationException { Index: trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (revision 18853) @@ -4,23 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; class RelationTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @Test void testCreateNewRelation() { Index: trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java (revision 18853) @@ -2,10 +2,7 @@ package org.openstreetmap.josm.data.osm; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -15,12 +12,4 @@ */ class StorageTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link Storage#equals} and {@link Storage#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java (revision 18853) @@ -6,9 +6,5 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -16,12 +12,4 @@ */ class UserTest { - - /** - * Setup test - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test method for {@link User#createOsmUser}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java (revision 18853) @@ -7,10 +7,6 @@ import java.util.Arrays; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class WaySegmentTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - @Test void testForNodePair() { Index: trunk/test/unit/org/openstreetmap/josm/data/osm/WayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/WayTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/WayTest.java (revision 18853) @@ -4,6 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Arrays; @@ -11,7 +11,5 @@ import java.util.HashSet; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.coor.LatLon; @@ -21,13 +19,4 @@ */ class WayTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Test BBox calculation with Way Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class ChangesetIdChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link ChangesetIdChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class DataChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link DataChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class NodeMovedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link NodeMovedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class PrimitiveFlagsChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link PrimitiveFlagsChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java (revision 18853) @@ -6,9 +6,5 @@ import java.util.Collections; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -16,12 +12,4 @@ */ class PrimitivesAddedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link PrimitivesAddedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java (revision 18853) @@ -6,9 +6,5 @@ import java.util.Collections; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -16,12 +12,4 @@ */ class PrimitivesRemovedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link PrimitivesRemovedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class RelationMembersChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link RelationMembersChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class TagsChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link TagsChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class WayNodesChangedEventTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link WayNodesChangedEvent#toString}. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 18853) @@ -9,5 +9,4 @@ import java.util.Map; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; @@ -16,7 +15,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.User; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,12 +20,4 @@ */ class HistoryNodeTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static HistoryNode create(Instant d) { return new HistoryNode( Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 18853) @@ -9,5 +9,4 @@ import java.util.Map; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.DefaultNameFormatter; @@ -15,7 +14,4 @@ import org.openstreetmap.josm.data.osm.RelationMemberData; import org.openstreetmap.josm.data.osm.User; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -23,12 +19,4 @@ */ class HistoryRelationTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static HistoryRelation create(Instant d) { return new HistoryRelation( Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 18853) @@ -11,11 +11,8 @@ import java.util.Map; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.DefaultNameFormatter; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.User; -import org.openstreetmap.josm.testutils.JOSMTestRules; /** @@ -23,12 +20,4 @@ */ class HistoryWayTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static HistoryWay create(Instant d) { return new HistoryWay( Index: trunk/test/unit/org/openstreetmap/josm/data/osm/search/PushbackTokenizerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/search/PushbackTokenizerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/search/PushbackTokenizerTest.java (revision 18853) @@ -2,11 +2,7 @@ package org.openstreetmap.josm.data.osm.search; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.search.PushbackTokenizer.Token; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class PushbackTokenizerTest { - - /** - * Setup rules. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link Token} enum. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java (revision 18853) @@ -2,10 +2,6 @@ package org.openstreetmap.josm.data.osm.search; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -13,12 +9,4 @@ */ class SearchModeTest { - - /** - * Setup rules. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link SearchMode} enum. Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 18853) @@ -9,5 +9,4 @@ import java.util.Collection; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; @@ -19,7 +18,4 @@ import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -35,11 +31,4 @@ .findFirst().orElse(null); } - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); @Test Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 18853) @@ -20,5 +20,4 @@ import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.JOSMFixture; @@ -32,10 +31,10 @@ /** * This test is used to monitor changes in projection code. - * + *

* It keeps a record of test data in the file nodist/data/projection/projection-regression-test-data. * This record is generated from the current Projection classes available in JOSM. It needs to * be updated, whenever a projection is added / removed or an algorithm is changed, such that * the computed values are numerically different. There is no error threshold, every change is reported. - * + *

* So when this test fails, first check if the change is intended. Then update the regression * test data, by running the main method of this class and commit the new data file. @@ -58,5 +57,5 @@ */ public static void main(String[] args) throws IOException { - setUp(); + JOSMFixture.createUnitTestFixture().init(); Map supportedCodesMap = Projections.getAllProjectionCodes().stream() @@ -136,12 +135,4 @@ /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - - /** * Non-regression unit test. * @throws IOException if any I/O error occurs Index: trunk/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,11 +10,4 @@ */ class LonLatTest { - /** - * Setup rule. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link LonLat#lonIsLinearToEast} Index: trunk/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,11 +10,4 @@ */ class MercatorTest { - /** - * Setup rule. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link Mercator#lonIsLinearToEast} Index: trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java (revision 18853) @@ -12,10 +12,7 @@ import java.util.TreeSet; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; @@ -24,12 +21,4 @@ */ class AutoCompletionPriorityTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test getters. Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java (revision 18853) @@ -11,5 +11,4 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -20,7 +19,4 @@ import org.openstreetmap.josm.data.validation.Severity; import org.openstreetmap.josm.data.validation.TestError; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -28,12 +24,4 @@ */ class AddressesTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static Node createAddressNode(String nodeTags, String wayTags, String relationTags) { DataSet ds = new DataSet(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java (revision 18853) @@ -4,9 +4,5 @@ import java.util.stream.Collectors; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -17,11 +13,4 @@ private static final Coastlines COASTLINES = new Coastlines(); private static final WronglyOrderedWays WRONGLY_ORDERED_WAYS = new WronglyOrderedWays(); - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); /** Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ConnectivityRelationsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ConnectivityRelationsTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ConnectivityRelationsTest.java (revision 18853) @@ -6,5 +6,4 @@ import org.junit.jupiter.api.BeforeEach; 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; @@ -12,7 +11,4 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,11 +20,4 @@ private ConnectivityRelations check; private static final String CONNECTIVITY = "connectivity"; - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules rule = new JOSMTestRules(); @BeforeEach Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java (revision 18853) @@ -3,9 +3,5 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -13,12 +9,4 @@ */ class DirectionNodesTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test all error cases manually created in direction-nodes.osm. Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (revision 18853) @@ -9,5 +9,4 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.coor.LatLon; @@ -18,7 +17,4 @@ import org.openstreetmap.josm.data.validation.TestError; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -26,12 +22,4 @@ */ class DuplicateNodeTest { - - /** - * Setup test by initializing JOSM preferences and projection. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static final DuplicateNode TEST = new DuplicateNode(); @@ -180,5 +168,5 @@ /** * Test of "Duplicate node" validation test - server precision. - * + *

* Non-regression test for ticket #18074. */ Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateWayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateWayTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateWayTest.java (revision 18853) @@ -9,5 +9,4 @@ import java.nio.file.Paths; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -19,7 +18,4 @@ import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.io.OsmReader; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -27,12 +23,4 @@ */ class DuplicateWayTest { - - /** - * Setup test by initializing JOSM preferences and projection. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static final DuplicateWay TEST = new DuplicateWay(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java (revision 18853) @@ -10,7 +10,5 @@ import java.util.Collection; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; @@ -20,18 +18,11 @@ import org.openstreetmap.josm.data.validation.TestError; import org.openstreetmap.josm.io.OsmReader; +import org.openstreetmap.josm.testutils.annotations.Projection; /** * Unit test of {@link HighwaysTest}. */ +@Projection class HighwaysTest { - - /** - * Setup test. - */ - @BeforeEach - public void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - private static Way createTestSetting(String highway, String highwayLink) { DataSet ds = new DataSet(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java (revision 18853) @@ -10,5 +10,4 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -17,7 +16,4 @@ import org.openstreetmap.josm.data.validation.routines.EmailValidator; import org.openstreetmap.josm.data.validation.routines.UrlValidator; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -27,11 +23,4 @@ private static final InternetTags TEST = new InternetTags(); - - /** - * Setup test by initializing JOSM preferences and projection. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); /** Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java (revision 18853) @@ -7,5 +7,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.OsmUtils; @@ -23,5 +22,4 @@ @BeforeEach public void setUp() throws Exception { - JOSMFixture.createUnitTestFixture().init(); lanes.initialize(); lanes.startTest(null); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java (revision 18853) @@ -4,12 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; 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.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -17,12 +13,4 @@ */ class LongSegmentTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static int test(Way w) throws Exception { LongSegment test = new LongSegment(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java (revision 18853) @@ -6,11 +6,7 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.data.validation.TestError; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class NameMismatchTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - List test(String primitive) { final NameMismatch test = new NameMismatch(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java (revision 18853) @@ -7,5 +7,4 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -14,7 +13,4 @@ import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,11 +20,4 @@ final PublicTransportRouteTest test = new PublicTransportRouteTest(); - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules rules = new JOSMTestRules(); /** Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java (revision 18853) @@ -11,10 +11,8 @@ import java.util.stream.IntStream; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.Node; @@ -26,13 +24,4 @@ */ class SelfIntersectingWayTest { - - /** - * Setup test. - * @throws Exception if test cannot be initialized - */ - @BeforeAll - public static void setUp() throws Exception { - JOSMFixture.createUnitTestFixture().init(); - } private static List createNodes() { Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SharpAnglesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SharpAnglesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SharpAnglesTest.java (revision 18853) @@ -13,5 +13,4 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.EastNorth; @@ -20,4 +19,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; /** @@ -25,4 +25,5 @@ */ @BasicPreferences +@Projection class SharpAnglesTest { private SharpAngles angles; @@ -34,5 +35,4 @@ @BeforeEach public void setUp() throws Exception { - JOSMFixture.createUnitTestFixture().init(); angles = new SharpAngles(); angles.initialize(); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java (revision 18853) @@ -5,7 +5,5 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; /** @@ -15,12 +13,4 @@ private final SimilarNamedWays test = new SimilarNamedWays(); - - /** - * Setup test - */ - @BeforeEach - public void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } private void checkSimilarity(String message, String name1, String name2, boolean expected) { Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (revision 18853) @@ -14,5 +14,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.DataSet; @@ -22,8 +21,10 @@ import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.io.OsmReader; +import org.openstreetmap.josm.testutils.annotations.Projection; /** * Unit tests of {@code UnconnectedWays} class. */ +@Projection class UnconnectedWaysTest { @@ -37,5 +38,4 @@ public void setUp() throws Exception { bib = new UnconnectedWays.UnconnectedHighways(); - JOSMFixture.createUnitTestFixture().init(); bib.initialize(); } Index: trunk/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java (revision 18853) @@ -2,9 +2,6 @@ package org.openstreetmap.josm.data.validation.util; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -13,12 +10,4 @@ */ class ValUtilTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code ValUtil} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java (revision 18853) @@ -2,9 +2,6 @@ package org.openstreetmap.josm.gui; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -13,12 +10,4 @@ */ class ConditionalOptionPaneUtilTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code ConditionalOptionPaneUtil} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java (revision 18853) @@ -2,9 +2,6 @@ package org.openstreetmap.josm.gui; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -13,12 +10,4 @@ */ class ExceptionDialogUtilTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code ExceptionDialogUtil} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java (revision 18853) @@ -2,10 +2,7 @@ package org.openstreetmap.josm.gui; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; @@ -14,12 +11,4 @@ */ class MapStatusTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link MapStatus.StatusTextHistory#equals} and {@link MapStatus.StatusTextHistory#hashCode}. Index: trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java (revision 18853) @@ -8,7 +8,5 @@ import java.util.Locale; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.SystemOfMeasurement; @@ -17,13 +15,4 @@ */ class SystemOfMeasurementTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Test of {@link SystemOfMeasurement#getDistText} method. Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java (revision 18853) @@ -15,4 +15,6 @@ import java.util.stream.Collectors; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.osm.TagCollection; @@ -20,10 +22,5 @@ import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.AutomaticChoiceGroup; import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.AutomaticCombine; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; /** @@ -102,5 +99,6 @@ * Unit tests of {@link AutomaticCombine} class. */ - static class AutomaticCombineTest { + @Nested + class AutomaticCombineTest { /** @@ -109,5 +107,5 @@ * @return AutomaticCombine object constructed with the two different constructors. */ - private static List differentlyConstructed(AutomaticCombine ac) { + private List differentlyConstructed(AutomaticCombine ac) { AutomaticCombine fullyConstructed = new AutomaticCombine(ac.key, ac.description, ac.isRegex, ac.separator, ac.sort); AutomaticCombine defaultConstructed = new AutomaticCombine(); @@ -121,11 +119,4 @@ /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - - /** * Unit test of {@link AutomaticCombine#matchesKey} with empty key. */ @@ -229,19 +220,12 @@ * Unit tests of {@link AutomaticChoice} class. */ - static class AutomaticChoiceTest { - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - - /** - + @Nested + class AutomaticChoiceTest { + /** * Return AutomaticCombine instantiated with the two possible constructors. * @param ac a model for the constructed object. * @return AutomaticCombine object constructed with the two different constructors. */ - private static List differentlyConstructed(AutomaticChoice ac) { + private List differentlyConstructed(AutomaticChoice ac) { AutomaticChoice fullyConstructed = new AutomaticChoice(ac.key, ac.group, ac.description, ac.isRegex, ac.value, ac.score); AutomaticChoice defaultConstructed = new AutomaticChoice(); @@ -349,12 +333,6 @@ * Unit tests of {@link AutomaticChoiceGroup} class. */ - static class AutomaticChoiceGroupTest { - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - + @Nested + class AutomaticChoiceGroupTest { AutomaticChoice choiceKey1Group1 = new AutomaticChoice("Key1", "Group1", "", false, "value1", "score1"); AutomaticChoice choiceKey1Group1bis = new AutomaticChoice("Key1", "Group1", "", false, "value2", "score2"); Index: trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java (revision 18853) @@ -9,6 +9,6 @@ import java.util.Arrays; +import java.util.Collections; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.correction.RoleCorrection; @@ -16,7 +16,4 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,12 +21,4 @@ */ class RoleCorrectionTableTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link RoleCorrectionTable#RoleCorrectionTable}. @@ -41,5 +30,5 @@ r.addMember(member); RoleCorrection rc = new RoleCorrection(r, 0, member, "bar"); - RoleCorrectionTable t = new RoleCorrectionTable(Arrays.asList(rc)); + RoleCorrectionTable t = new RoleCorrectionTable(Collections.singletonList(rc)); assertNotNull(t.getCellRenderer(0, 0)); assertNotNull(t.getCellRenderer(0, 1)); Index: trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java (revision 18853) @@ -10,10 +10,6 @@ import java.util.Arrays; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.correction.TagCorrection; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -21,12 +17,4 @@ */ class TagCorrectionTableTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link TagCorrectionTable#TagCorrectionTable}. Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java (revision 18853) @@ -2,10 +2,7 @@ package org.openstreetmap.josm.gui.dialogs; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.gui.dialogs.ChangesetDialog.LaunchChangesetManager; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.trajano.commons.testing.UtilityClassTestUtil; @@ -14,12 +11,4 @@ */ class ChangesetDialogTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code LaunchChangesetManager} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TaginfoActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TaginfoActionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TaginfoActionTest.java (revision 18853) @@ -8,19 +8,7 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.Tag; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; class TaginfoActionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link TaginfoAction#getTaginfoUrlForTag} and {@link TaginfoAction#getTaginfoUrlForRelationType} Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java (revision 18853) @@ -8,5 +8,4 @@ import java.awt.event.MouseListener; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.coor.LatLon; @@ -18,7 +17,4 @@ import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable.DoubleClickAdapter; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -26,12 +22,4 @@ */ class SelectionTableTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link SelectionTable#SelectionTable}. Index: trunk/test/unit/org/openstreetmap/josm/gui/download/BookmarkListTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/download/BookmarkListTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/download/BookmarkListTest.java (revision 18853) @@ -2,11 +2,8 @@ package org.openstreetmap.josm.gui.download; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.time.Instant; + import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.Changeset; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import java.time.Instant; /** @@ -14,12 +11,4 @@ */ class BookmarkListTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link BookmarkList.ChangesetBookmark#ChangesetBookmark(Changeset)} Index: trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java (revision 18853) @@ -6,5 +6,4 @@ import java.time.Instant; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; @@ -14,7 +13,4 @@ import org.openstreetmap.josm.data.osm.history.HistoryRelation; import org.openstreetmap.josm.data.osm.history.HistoryWay; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class HistoryBrowserDialogTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test for {@link HistoryBrowserDialog#buildTitle}. Index: trunk/test/unit/org/openstreetmap/josm/gui/io/ActionFlagsTableCellTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/ActionFlagsTableCellTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/ActionFlagsTableCellTest.java (revision 18853) @@ -10,12 +10,8 @@ import javax.swing.JTable; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -23,11 +19,4 @@ */ class ActionFlagsTableCellTest { - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link ActionFlagsTableCell} class. Index: trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerInfoTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerInfoTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerInfoTest.java (revision 18853) @@ -9,9 +9,7 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -21,11 +19,4 @@ */ class SaveLayerInfoTest { - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link SaveLayerInfo} class - null case. Index: trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/SaveLayerTaskTest.java (revision 18853) @@ -2,12 +2,10 @@ package org.openstreetmap.josm.gui.io; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -17,11 +15,4 @@ */ class SaveLayerTaskTest { - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link SaveLayerTask} class - null case. @@ -38,5 +29,5 @@ @Test void testSaveLayerTaskNominal() { - assertNotNull(new SaveLayerTask(new SaveLayerInfo(new OsmDataLayer(new DataSet(), "", null)), null)); + assertDoesNotThrow(() -> new SaveLayerTask(new SaveLayerInfo(new OsmDataLayer(new DataSet(), "", null)), null)); } } Index: trunk/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java (revision 18853) @@ -9,10 +9,6 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -20,12 +16,4 @@ */ class UploadAndSaveProgressRendererTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link UploadAndSaveProgressRenderer#UploadAndSaveProgressRenderer}. Index: trunk/test/unit/org/openstreetmap/josm/gui/io/UploadPrimitivesTaskTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/UploadPrimitivesTaskTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/UploadPrimitivesTaskTest.java (revision 18853) @@ -2,7 +2,6 @@ package org.openstreetmap.josm.gui.io; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.Changeset; @@ -10,7 +9,4 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.io.UploadStrategySpecification; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class UploadPrimitivesTaskTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link UploadPrimitivesTask#UploadPrimitivesTask}. @@ -31,5 +19,5 @@ @Test void testUploadPrimitivesTask() { - assertNotNull(new UploadPrimitivesTask( + assertDoesNotThrow(() -> new UploadPrimitivesTask( new UploadStrategySpecification(), new OsmDataLayer(new DataSet(), null, null), Index: trunk/test/unit/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanelTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanelTest.java (revision 18853) @@ -2,11 +2,7 @@ package org.openstreetmap.josm.gui.io; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class UploadedObjectsSummaryPanelTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test of {@link UploadedObjectsSummaryPanel#UploadedObjectsSummaryPanel}. @@ -27,5 +15,5 @@ @Test void testUploadedObjectsSummaryPanel() { - assertNotNull(new UploadedObjectsSummaryPanel()); + assertDoesNotThrow(UploadedObjectsSummaryPanel::new); } } Index: trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/ImageImporterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/ImageImporterTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/ImageImporterTest.java (revision 18853) @@ -11,10 +11,6 @@ import java.util.List; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class ImageImporterTest { - - /** - * Setup test - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Non-regression test for Bug #14868. Index: trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java (revision 18853) @@ -7,9 +7,7 @@ import java.io.File; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.testutils.JOSMTestRules; /** @@ -17,11 +15,4 @@ */ class NoteImporterTest { - - /** - * Use the test rules to remove any layers and reset state. - */ - @RegisterExtension - public final JOSMTestRules rules = new JOSMTestRules(); - /** * Non-regression test for Bug #12531. Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintableTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintableTest.java (revision 18853) @@ -9,9 +9,5 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -20,11 +16,4 @@ */ class AbstractMapViewPaintableTest { - /** - * No special test rules - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private Layer testLayer; Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/MapViewPaintableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/MapViewPaintableTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/MapViewPaintableTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent; @@ -13,13 +11,4 @@ */ class MapViewPaintableTest { - - /** - * Setup tests - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link MapViewPaintable.PaintableInvalidationEvent#toString} Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/NativeScaleLayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/NativeScaleLayerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/NativeScaleLayerTest.java (revision 18853) @@ -6,7 +6,5 @@ import java.util.Collections; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; /** @@ -14,13 +12,4 @@ */ class NativeScaleLayerTest { - - /** - * Setup tests - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Non-regression test for ticket #12255. @@ -28,5 +17,5 @@ @Test void testTicket12255() { - assertNull(new NativeScaleLayer.ScaleList(Collections.emptyList()).getSnapScale(10, 2, false)); + assertNull(new NativeScaleLayer.ScaleList(Collections.emptyList()).getSnapScale(10, 2, false)); } } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/NoteLayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/NoteLayerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/NoteLayerTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -14,12 +10,4 @@ */ class NoteLayerTest { - - /** - * Setup tests - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Non-regression test for ticket #13208. Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 18853) @@ -6,38 +6,18 @@ import java.util.Collections; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxTimeOffset; import org.openstreetmap.josm.data.gpx.GpxTimezone; import org.openstreetmap.josm.io.GpxReaderTest; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.Timezone; import org.openstreetmap.josm.tools.Pair; import org.openstreetmap.josm.tools.date.DateUtils; -import org.openstreetmap.josm.tools.date.DateUtilsTest; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests of {@link CorrelateGpxWithImages} class. */ +@Timezone class CorrelateGpxWithImagesTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - DateUtilsTest.setTimeZone(DateUtils.UTC); - } - /** * Tests automatic guessing of timezone/offset Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 18853) @@ -9,12 +9,8 @@ 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.gui.ExtendedDialog; import org.openstreetmap.josm.gui.layer.GpxLayerTest; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class ChooseTrackVisibilityActionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test action. Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 18853) @@ -17,5 +17,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.LatLon; @@ -30,21 +29,10 @@ import org.openstreetmap.josm.io.OsmReader; import org.openstreetmap.josm.spi.preferences.Config; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.xml.sax.SAXException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests of {@link ConvertToDataLayerAction} class. */ -public class ConvertToDataLayerActionTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - +class ConvertToDataLayerActionTest { /** * Tests a conversion from a GPX marker layer to a OSM dataset Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java (revision 18853) @@ -12,8 +12,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -40,11 +36,4 @@ private static final IndexColorModel COLOR_MODEL = new IndexColorModel(8, PALETTE.length, PALETTE, 0, true, 255, DataBuffer.TYPE_BYTE); - - /** - * No special rules - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); /** Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/GammaImageProcessorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/GammaImageProcessorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/GammaImageProcessorTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -15,12 +11,4 @@ */ class GammaImageProcessorTest { - - /** - * No special rules - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link GammaImageProcessor#setGamma(double)} and {@link GammaImageProcessor#getGamma()} Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessorTest.java (revision 18853) @@ -4,9 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -15,12 +11,4 @@ */ class SharpenImageProcessorTest { - - /** - * No special rules - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link SharpenImageProcessor#setSharpenLevel(float)} and {@link SharpenImageProcessor#getSharpenLevel()} Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (revision 18853) @@ -7,7 +7,5 @@ import java.net.URL; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxData; @@ -18,13 +16,4 @@ */ class AudioMarkerTest { - - /** - * Setup tests - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link AudioMarker#AudioMarker}. Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarkerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarkerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarkerTest.java (revision 18853) @@ -5,7 +5,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.WayPoint; @@ -15,13 +13,4 @@ */ class PlayHeadMarkerTest { - - /** - * Setup tests - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link PlayHeadMarker#PlayHeadMarker}. Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.java (revision 18853) @@ -8,5 +8,4 @@ import java.util.Collections; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.Node; @@ -15,7 +14,4 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy; import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -23,12 +19,4 @@ */ class LabelCompositionStrategyTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link StaticLabelCompositionStrategy}. Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.java (revision 18853) @@ -9,5 +9,4 @@ import java.awt.Color; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.data.osm.Node; @@ -16,7 +15,4 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy; import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -24,12 +20,4 @@ */ class MapCSSWithExtendedTextDirectivesTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test {@link DeriveLabelFromNameTagsCompositionStrategy} Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java (revision 18853) @@ -2,13 +2,10 @@ package org.openstreetmap.josm.gui.mappaint.mapcss; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import net.trajano.commons.testing.UtilityClassTestUtil; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; + +import org.junit.jupiter.api.Test; + +import net.trajano.commons.testing.UtilityClassTestUtil; /** @@ -16,12 +13,4 @@ */ class ExpressionFactoryTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests that {@code Functions} satisfies utility class criteria. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class AdvancedPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link AdvancedPreference#AdvancedPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 18853) @@ -6,9 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Arrays; +import java.util.Collections; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.advanced.ListEditor.ListSettingTableModel; @@ -17,13 +15,4 @@ */ class ListEditorTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ListSettingTableModel} class. @@ -33,5 +22,5 @@ ListSettingTableModel model = new ListSettingTableModel(null); assertNotNull(model.getData()); - model = new ListSettingTableModel(Arrays.asList("foo")); + model = new ListSettingTableModel(Collections.singletonList("foo")); assertTrue(model.getData().contains("foo")); assertEquals(2, model.getRowCount()); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 18853) @@ -6,7 +6,5 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.spi.preferences.StringSetting; @@ -18,13 +16,4 @@ */ class PrefEntryTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link PrefEntry#PrefEntry}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; import org.openstreetmap.josm.spi.preferences.Config; @@ -14,13 +12,4 @@ */ class AudioPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link AudioPreference#AudioPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class ColorPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ColorPreference#ColorPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class DisplayPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link DisplayPreference#DisplayPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class DrawingPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link DrawingPreference#DrawingPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class GPXPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link GPXPreference.Factory}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class LafPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link LafPreference#LafPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class LanguagePreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link LanguagePreference#LanguagePreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class BackupPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link BackupPreference#BackupPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class MapPaintPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link MapPaintPreference#MapPaintPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,12 +11,4 @@ */ class TaggingPresetPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } /** Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class ProjectionPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ProjectionPreference#ProjectionPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class RemoteControlPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link RemoteControlPreference#RemoteControlPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class ShortcutPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ShortcutPreference#ShortcutPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class ValidatorPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ValidatorPreference#ValidatorPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 18853) @@ -4,7 +4,5 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; @@ -13,13 +11,4 @@ */ class ValidatorTestsPreferenceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test of {@link ValidatorTestsPreference#ValidatorTestsPreference}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java (revision 18853) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.gui.tagging.ac; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; @@ -9,7 +8,5 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager.UserInputTag; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; @@ -18,12 +15,4 @@ */ class AutoCompletionManagerTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Non-regression test for ticket #17064. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/PresetClassificationsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/PresetClassificationsTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/PresetClassificationsTest.java (revision 18853) @@ -14,5 +14,4 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -37,5 +36,4 @@ @BeforeAll public static void setUp() throws IOException, SAXException { - JOSMFixture.createUnitTestFixture().init(); final Collection presets = TaggingPresetReader.readAll("resource://data/defaultpresets.xml", true); classifications.loadPresets(presets); Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java (revision 18853) @@ -2,13 +2,5 @@ package org.openstreetmap.josm.gui.tagging.presets; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.OsmUtils; -import org.openstreetmap.josm.data.osm.Tag; -import org.openstreetmap.josm.testutils.JOSMTestRules; -import org.openstreetmap.josm.tools.template_engine.TemplateEntry; -import org.openstreetmap.josm.tools.template_engine.TemplateParser; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -17,5 +9,10 @@ import java.util.Collections; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.OsmUtils; +import org.openstreetmap.josm.data.osm.Tag; +import org.openstreetmap.josm.tools.template_engine.TemplateEntry; +import org.openstreetmap.josm.tools.template_engine.TemplateParser; /** @@ -23,12 +20,4 @@ */ class TaggingPresetItemGuiSupportTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests {@link TemplateEntry} evaluation Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 18853) @@ -15,12 +15,8 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.gui.tagging.presets.items.Check; import org.openstreetmap.josm.gui.tagging.presets.items.Key; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.xml.sax.SAXException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -28,12 +24,4 @@ */ class TaggingPresetReaderTest { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * #8954 - last checkbox in the preset is not added Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetTest.java (revision 18853) @@ -8,5 +8,4 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.osm.IPrimitive; import org.openstreetmap.josm.data.osm.OsmUtils; @@ -14,7 +13,4 @@ import org.openstreetmap.josm.data.osm.search.SearchParseError; import org.openstreetmap.josm.gui.tagging.presets.items.Key; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,12 +18,4 @@ */ class TaggingPresetTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests {@link TaggingPreset#test(IPrimitive)} Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -17,13 +15,4 @@ */ class CheckGroupTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link CheckGroup#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -17,13 +15,4 @@ */ class ItemSeparatorTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link ItemSeparator#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java (revision 18853) @@ -7,7 +7,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -16,13 +14,4 @@ */ class KeyTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Key#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java (revision 18853) @@ -7,7 +7,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -16,13 +14,4 @@ */ class LabelTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Label#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; import org.openstreetmap.josm.spi.preferences.Config; @@ -18,13 +16,4 @@ */ class LinkTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Link#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java (revision 18853) @@ -7,7 +7,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -16,13 +14,4 @@ */ class MultiSelectTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link MultiSelect#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -17,13 +15,4 @@ */ class OptionalTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Optional#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntryTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntryTest.java (revision 18853) @@ -5,7 +5,5 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; /** @@ -13,13 +11,4 @@ */ class PresetListEntryTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Non-regression test for ticket #12416. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -17,13 +15,4 @@ */ class RolesTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Roles#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java (revision 18853) @@ -8,7 +8,5 @@ import javax.swing.JPanel; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport; @@ -17,13 +15,4 @@ */ class SpaceTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Unit test for {@link Space#addToPanel}. Index: trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java (revision 18853) @@ -12,8 +12,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -22,11 +18,4 @@ */ class MultiLineFlowLayoutTest { - /** - * No special rules. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static final int TEST_WIDHT = 500; private JPanel container; Index: trunk/test/unit/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPaneTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPaneTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPaneTest.java (revision 18853) @@ -8,9 +8,5 @@ import javax.swing.JSplitPane; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -18,12 +14,4 @@ */ class AutoAdjustingSplitPaneTest { - - /** - * Setup test. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of {@link AutoAdjustingSplitPane} class. Index: trunk/test/unit/org/openstreetmap/josm/io/OsmApiTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/OsmApiTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/OsmApiTest.java (revision 18853) @@ -7,7 +7,5 @@ import java.nio.charset.StandardCharsets; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.Changeset; import org.openstreetmap.josm.data.osm.User; @@ -18,13 +16,4 @@ */ class OsmApiTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Non-regression test for Bug #12675. Index: trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java (revision 18853) @@ -3,16 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTimeout; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertTimeout; import java.io.File; -import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.tools.Stopwatch; @@ -28,18 +25,8 @@ /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - - /** * Test method for {@code AudioPlayer#play(URL)} - * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format - * @throws MalformedURLException wrong URL */ @Test - void testPlay() throws MalformedURLException, Exception { + void testPlay() { assertTimeout(Duration.ofMillis(4*MAX_DURATION), () -> { File wav1 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav")); Index: trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java (revision 18853) @@ -6,7 +6,5 @@ import java.io.File; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; @@ -17,12 +15,4 @@ private static final double EPSILON = 1e-11; - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } /** Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 18853) @@ -18,5 +18,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.LatLon; @@ -27,9 +26,6 @@ import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.io.GpxReaderTest; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.date.DateUtils; import org.xml.sax.SAXException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -37,11 +33,4 @@ */ class NmeaReaderTest { - /** - * Set the timezone and timeout. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Tests reading a nmea file. Index: trunk/test/unit/org/openstreetmap/josm/io/protocols/data/HandlerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/protocols/data/HandlerTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/protocols/data/HandlerTest.java (revision 18853) @@ -10,6 +10,4 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; /** @@ -17,11 +15,4 @@ */ class HandlerTest { - - /** - * Use the test rules to remove any layers and reset state. - */ - @RegisterExtension - public final JOSMTestRules rules = new JOSMTestRules(); - /** * Setup test. Index: trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 18853) @@ -13,13 +13,9 @@ import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxConstants; import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.date.DateUtils; import org.xml.sax.SAXException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -27,11 +23,4 @@ */ class RtkLibPosReaderTest { - /** - * Set the timezone and timeout. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private static RtkLibPosReader read(String path) throws IOException, SAXException { TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin")); Index: trunk/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java (revision 18853) @@ -77,6 +77,7 @@ /** * Clean up what test not using these test rules may have broken. + * See {@link org.openstreetmap.josm.JOSMFixture} for the most common reason why this needs to be called. */ - private void cleanUpFromJosmFixture() { + private static void cleanUpFromJosmFixture() { MemoryManagerTest.resetState(true); JOSMTestRules.cleanLayerEnvironment(); Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 18853) @@ -12,12 +12,8 @@ import org.junit.jupiter.api.BeforeEach; 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.coor.conversion.AbstractCoordinateFormat; import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -26,11 +22,4 @@ */ class ExifReaderTest { - /** - * Set the timezone and timeout. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - private File orientationSampleFile, directionSampleFile; Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 18853) @@ -13,5 +13,4 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.spi.preferences.Config; @@ -28,5 +27,4 @@ @BeforeAll public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); hook = new PlatformHookOsx(); } Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java (revision 18853) @@ -8,11 +8,7 @@ import java.net.URL; +import org.junit.jupiter.api.Test; + import jakarta.json.Json; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -20,12 +16,4 @@ */ class PlatformHookTestIT { - - /** - * Setup rule - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Test that we always support the latest Ubuntu version. Index: trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java (revision 18853) @@ -9,7 +9,5 @@ import javax.swing.KeyStroke; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; /** @@ -17,13 +15,4 @@ */ class ShortcutTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Test method for {@code Shortcut#makeTooltip} Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEntryTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEntryTest.java (revision 18853) @@ -6,11 +6,8 @@ import java.util.Set; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Logging; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -20,12 +17,4 @@ */ class TemplateEntryTest { - - /** - * Setup rule. - */ - @RegisterExtension - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); - /** * Unit test of methods {@link TemplateEntry#equals} and {@link TemplateEntry#hashCode}, including all subclasses. Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java (revision 18847) +++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java (revision 18853) @@ -8,7 +8,5 @@ import java.util.List; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; @@ -23,13 +21,4 @@ */ class TemplateParserTest { - - /** - * Setup test. - */ - @BeforeAll - public static void setUp() { - JOSMFixture.createUnitTestFixture().init(); - } - /** * Test to parse an empty string.