Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2023-03-13T21:59:27+01:00 (3 years ago)

Author:

taylor.smock

Message:

See #16567: Convert all assertion calls to JUnit 5 (patch by gaben, modified)

The modifications are as follows:

• Merge DomainValidatorTest.testIDN and DomainValidatorTest.testIDNJava6OrLater
• Update some tests to use @ParameterizedTest (DomainValidatorTest)
• Replace various exception blocks with assertThrows. These typically looked like

      try {
          // Something that should throw an exception here
          fail("An exception should have been thrown");
      } catch (Exception e) {
          // Verify the exception matches expectations here
      }
  

• Replace assertTrue(val instanceof Clazz) with assertInstanceOf
• Replace JUnit 4 @Suite with JUnit 5 @Suite

Both the original patch and the modified patch fix various lint issues.

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• MainApplicationTest.java (modified) (5 diffs)
• MapViewStateTest.java (modified) (1 diff)
• NavigatableComponentTest.java (modified) (1 diff)
• TableCellRendererTest.java (modified) (3 diffs)
• datatransfer/ClipboardUtilsTest.java (modified) (2 diffs)
• datatransfer/LayerTransferableTest.java (modified) (5 diffs)
• datatransfer/PrimitiveTransferableTest.java (modified) (2 diffs)
• datatransfer/data/PrimitiveTagTransferDataTest.java (modified) (4 diffs)
• dialogs/MinimapDialogTest.java (modified) (22 diffs)
• dialogs/layer/CycleLayerActionTest.java (modified) (1 diff)
• dialogs/layer/DuplicateActionTest.java (modified) (2 diffs)
• dialogs/relation/sort/RelationSorterTest.java (modified) (12 diffs)
• dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (modified) (22 diffs)
• dialogs/validator/ValidatorTreePanelTest.java (modified) (3 diffs)
• history/HistoryLoadTaskTest.java (modified) (1 diff)
• io/AsynchronousUploadPrimitivesTaskTest.java (modified) (3 diffs)
• layer/GpxLayerTest.java (modified) (5 diffs)
• layer/gpx/ConvertToDataLayerActionTest.java (modified) (3 diffs)
• layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (1 diff)
• mappaint/AllMappaintTests.java (modified) (2 diffs)
• mappaint/MapCSSWithExtendedTextDirectivesTest.java (modified) (3 diffs)
• mappaint/mapcss/AllMapCSSTests.java (modified) (1 diff)
• mappaint/mapcss/ConditionTest.java (modified) (2 diffs)
• mappaint/mapcss/MapCSSParserTest.java (modified) (16 diffs)
• preferences/AbstractExtendedSourceEntryTestCase.java (modified) (2 diffs)
• preferences/ToolbarPreferencesTest.java (modified) (4 diffs)
• preferences/imagery/ImageryPreferenceTestIT.java (modified) (3 diffs)
• preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (1 diff)
• tagging/presets/TaggingPresetReaderTest.java (modified) (4 diffs)
• tagging/presets/TaggingPresetsTest.java (modified) (2 diffs)
• widgets/HistoryComboBoxTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -125 +126 @@
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
             System.setOut(new PrintStream(baos));
-            Thread t = new Thread() {
-                @Override
-                public void run() {
-                    MainApplication.main(new String[] {arg});
-                }
-            };
+            Thread t = new Thread(() -> MainApplication.main(new String[] {arg}));
             t.start();
             t.join();
@@ -229 +225 @@
                     .until(() -> !BugReportQueue.getInstance().exceptionHandlingInProgress());
             assertNotNull(exceptionAtomicReference.get());
-            assertTrue(exceptionAtomicReference.get() instanceof UnsupportedOperationException);
+            assertInstanceOf(UnsupportedOperationException.class, exceptionAtomicReference.get());
             // The LAF only resets on restart, so don't bother checking that it switched back in UIManager
             assertEquals(LafPreference.LAF.getDefaultValue(), LafPreference.LAF.get());
@@ -253 +249 @@
     void testPostConstructorProcessCmdLineEmpty() {
         // Check the method accepts no arguments
-        MainApplication.postConstructorProcessCmdLine(new ProgramArguments(new String[0]));
+        MainApplication.postConstructorProcessCmdLine(new ProgramArguments());
     }
 
     private static void doTestPostConstructorProcessCmdLine(String download, String downloadGps, boolean gpx) {
         assertNull(MainApplication.getLayerManager().getEditDataSet());
-        for (Future<?> f : MainApplication.postConstructorProcessCmdLine(new ProgramArguments(new String[]{
-                "--download=" + download,
+        for (Future<?> f : MainApplication.postConstructorProcessCmdLine(new ProgramArguments("--download=" + download,
                 "--downloadgps=" + downloadGps,
-                "--selection=type: node"}))) {
+                "--selection=type: node"))) {
             try {
                 f.get();
@@ -314 +309 @@
     /**
      * Unit test of {@link MainApplication#postConstructorProcessCmdLine} - nominal case with file names.
-     * @throws MalformedURLException if an error occurs
-     */
-    @Test
-    void testPostConstructorProcessCmdLineFilename() throws MalformedURLException {
+     */
+    @Test
+    void testPostConstructorProcessCmdLineFilename() {
         doTestPostConstructorProcessCmdLine(
                 Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toFile().getAbsolutePath(),

trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java

@@ -65 +65 @@
     @Test
     void testGetCenter() {
-        doTestGetCenter(s -> s.getCenter(), t -> t / 2d);
+        doTestGetCenter(MapViewState::getCenter, t -> t / 2d);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java

@@ -101 +101 @@
         assertThat(component.getPoint2D((EastNorth) null), CustomMatchers.is(new Point2D.Double()));
         Point2D shouldBeCenter = component.getPoint2D(component.getCenter());
-        assertThat(shouldBeCenter, CustomMatchers.is(new Point2D.Double(WIDTH / 2, HEIGHT / 2)));
+        assertThat(shouldBeCenter, CustomMatchers.is(new Point2D.Double(WIDTH / 2.0, HEIGHT / 2.0)));
 
         EastNorth testPoint = component.getCenter().add(300 * component.getScale(), 200 * component.getScale());
         Point2D testPointConverted = component.getPoint2D(testPoint);
-        assertThat(testPointConverted, CustomMatchers.is(new Point2D.Double(WIDTH / 2 + 300, HEIGHT / 2 - 200)));
+        assertThat(testPointConverted, CustomMatchers.is(new Point2D.Double(WIDTH / 2.0 + 300, HEIGHT / 2.0 - 200)));
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Constructor;
@@ -14 +15 @@
 import javax.swing.table.TableCellRenderer;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
@@ -64 +64 @@
     void testTableCellRenderer() throws ReflectiveOperationException {
         Set<Class<? extends TableCellRenderer>> renderers = TestUtils.getJosmSubtypes(TableCellRenderer.class);
-        Assert.assertTrue(renderers.size() >= 10); // if it finds less than 10 classes, something is broken
+        assertTrue(renderers.size() >= 10); // if it finds less than 10 classes, something is broken
         JTable tbl = new JTable(2, 2);
         for (Class<? extends TableCellRenderer> klass : renderers) {

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java

@@ -58 +58 @@
 
         @Override
-        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
+        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
             throw new UnsupportedFlavorException(flavor);
         }
@@ -84 +84 @@
 
         ClipboardUtils.copy(new SupportNothingTransferable());
-        assertEquals(null, ClipboardUtils.getClipboardStringContent());
+        assertNull(ClipboardUtils.getClipboardStringContent());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/LayerTransferableTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -47 +48 @@
     @Test
     void testLayerData() {
-        Data data = new Data(manager, Arrays.<Layer>asList(layer1, layer2));
+        Data data = new Data(manager, Arrays.asList(layer1, layer2));
 
         // need to be identity
@@ -61 +62 @@
     @Test
     void testSupportedDataFlavor() {
-        LayerTransferable transferable = new LayerTransferable(manager, Arrays.<Layer>asList(layer1, layer2));
+        LayerTransferable transferable = new LayerTransferable(manager, Arrays.asList(layer1, layer2));
 
         assertFalse(transferable.isDataFlavorSupported(DataFlavor.imageFlavor));
@@ -77 +78 @@
     @Test
     void testTransferData() throws Exception {
-        LayerTransferable transferable = new LayerTransferable(manager, Arrays.<Layer>asList(layer1, layer2));
+        LayerTransferable transferable = new LayerTransferable(manager, Arrays.asList(layer1, layer2));
 
         Object object = transferable.getTransferData(LayerTransferable.LAYER_DATA);
-        assertTrue(object instanceof Data);
-        Data data = (Data) object;
+        Data data = assertInstanceOf(Data.class, object);
         assertSame(manager, data.getManager());
         assertSame(layer1, data.getLayers().get(0));
@@ -92 +92 @@
     @Test
     void testTransferDataUnsupported() {
-        LayerTransferable transferable = new LayerTransferable(manager, Arrays.<Layer>asList(layer1, layer2));
+        LayerTransferable transferable = new LayerTransferable(manager, Arrays.asList(layer1, layer2));
 
         assertThrows(UnsupportedFlavorException.class, () -> transferable.getTransferData(DataFlavor.imageFlavor));

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferableTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -67 +68 @@
         Collection<PrimitiveData> td = ((PrimitiveTransferData) pt.getTransferData(PrimitiveTransferData.DATA_FLAVOR)).getAll();
         assertEquals(1, td.size());
-        assertTrue(td.iterator().next() instanceof NodeData);
+        assertInstanceOf(NodeData.class, td.iterator().next());
 
 

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTagTransferDataTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -9 +10 @@
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodeData;
@@ -17 +19 @@
 import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
-
-import org.junit.jupiter.api.Test;
 
 /**
@@ -109 +109 @@
         assertEquals(2, (int) stats.get(OsmPrimitiveType.NODE));
         assertEquals(1, (int) stats.get(OsmPrimitiveType.WAY));
-        assertEquals(null, stats.get(OsmPrimitiveType.RELATION));
+        assertNull(stats.get(OsmPrimitiveType.RELATION));
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java

@@ -3 +3 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -27 +28 @@
 import javax.swing.JPopupMenu;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.awaitility.Awaitility;
 import org.junit.Rule;
@@ -50 +52 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Unit tests of {@link MinimapDialog} class.
@@ -95 +95 @@
         boolean found = false;
         for (Component c: menu.getComponents()) {
-            if (JPopupMenu.Separator.class.isInstance(c)) {
+            if (c instanceof JPopupMenu.Separator) {
                 break;
             } else {
@@ -102 +102 @@
                 assertEquals(equalText, isSelected);
                 if (equalText) {
-                    assertFalse("Second selected source found", found);
+                    assertFalse(found, "Second selected source found");
                     found = true;
                 }
             }
         }
-        assertTrue("Selected source not found in menu", found);
+        assertTrue(found, "Selected source not found in menu");
     }
 
@@ -115 +115 @@
                 JPopupMenu menu = this.sourceButton.getPopupMenu();
                 for (Component c: menu.getComponents()) {
-                    if (JPopupMenu.Separator.class.isInstance(c)) {
+                    if (c instanceof JPopupMenu.Separator) {
                         // sources should all come before any separators
                         break;
@@ -124 +124 @@
                     // else continue...
                 }
-                fail();
+                fail("Expected JMenuItem with text " + label + " not found");
             });
         } catch (Throwable e) {
@@ -196 +196 @@
     /**
      * Tests to switch imagery source.
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testSourceSwitching() throws Exception {
+    public void testSourceSwitching() {
         // relevant prefs starting out empty, should choose the first source and have shown download area enabled
         // (not that there's a data layer for it to use)
@@ -243 +242 @@
     /**
      * Tests that the apparently-selected TileSource survives the tile sources being refreshed.
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testRefreshSourcesRetainsSelection() throws Exception {
+    public void testRefreshSourcesRetainsSelection() {
         // relevant prefs starting out empty, should choose the first source and have shown download area enabled
         // (not that there's a data layer for it to use)
@@ -281 +279 @@
      * Tests that the currently selected source being removed from ImageryLayerInfo will remain present and
      * selected in the source menu even after the tile sources have been refreshed.
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testRemovedSourceStillSelected() throws Exception {
+    public void testRemovedSourceStillSelected() {
         // relevant prefs starting out empty, should choose the first source and have shown download area enabled
         // (not that there's a data layer for it to use)
@@ -314 +311 @@
     /**
      * Tests the tile source list includes sources only present in the LayerManager
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testTileSourcesFromCurrentLayers() throws Exception {
+    public void testTileSourcesFromCurrentLayers() {
         // relevant prefs starting out empty, should choose the first (ImageryLayerInfo) source and have shown download area enabled
         // (not that there's a data layer for it to use)
@@ -448 +444 @@
     /**
      * Tests minimap obeys a saved "mapstyle" preference on startup.
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testSourcePrefObeyed() throws Exception {
+    public void testSourcePrefObeyed() {
         Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
 
@@ -475 +470 @@
     /**
      * Tests minimap handles an unrecognized "mapstyle" preference on startup
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testSourcePrefInvalid() throws Exception {
+    public void testSourcePrefInvalid() {
         Config.getPref().put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
 
@@ -497 +491 @@
     /**
      * test viewport marker rectangle matches the mapView's aspect ratio
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testViewportAspectRatio() throws Exception {
+    public void testViewportAspectRatio() {
         // Add a test layer to the layer manager to get the MapFrame & MapView
         MainApplication.getLayerManager().addLayer(new TestLayer());
@@ -546 +539 @@
         // should equal the number on the right
         assertTrue(
-            "Viewport marker not horizontally centered",
-            Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4
-        );
+                Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4,
+                "Viewport marker not horizontally centered"
+                );
 
         Matcher colMatcher = ImagePatternMatching.columnMatch(
@@ -561 +554 @@
         // should equal the number on the bottom
         assertTrue(
-            "Viewport marker not vertically centered",
-            Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4
-        );
+                Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4,
+                "Viewport marker not vertically centered"
+                );
 
         // (within a tolerance for numerical error) the viewport marker should be square
         assertTrue(
-            "Viewport marker not square",
-            Math.abs(colMatcher.group(2).length() - rowMatcher.group(2).length()) < 4
-        );
+                Math.abs(colMatcher.group(2).length() - rowMatcher.group(2).length()) < 4,
+                "Viewport marker not square"
+                );
 
         // now change the mapView size
@@ -591 +584 @@
         );
         assertTrue(
-            "Viewport marker not horizontally centered",
-            Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4
-        );
+                Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4,
+                "Viewport marker not horizontally centered"
+                );
 
         colMatcher = ImagePatternMatching.columnMatch(
@@ -603 +596 @@
         );
         assertTrue(
-            "Viewport marker not vertically centered",
-            Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4
-        );
+                Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4,
+                "Viewport marker not vertically centered"
+                );
 
         try {
@@ -614 +607 @@
 
         assertTrue(
-            "Viewport marker not 2:1 aspect ratio",
-            Math.abs(colMatcher.group(2).length() - (rowMatcher.group(2).length()*2.0)) < 5
-        );
+                Math.abs(colMatcher.group(2).length() - (rowMatcher.group(2).length()*2.0)) < 5,
+                "Viewport marker not 2:1 aspect ratio"
+                );
     }
 
@@ -623 +616 @@
         boolean afterSeparator = false;
         for (Component c: menu.getComponents()) {
-            if (JPopupMenu.Separator.class.isInstance(c)) {
-                assertFalse("More than one separator before target item", afterSeparator);
+            if (c instanceof JPopupMenu.Separator) {
+                assertFalse(afterSeparator, "More than one separator before target item");
                 afterSeparator = true;
             } else if (((JMenuItem) c).getText().equals(tr("Show downloaded area"))) {
-                assertTrue("Separator not found before target item", afterSeparator);
-                assertTrue("Target item doesn't appear to be a JCheckBoxMenuItem", JCheckBoxMenuItem.class.isInstance(c));
-                return (JCheckBoxMenuItem) c;
+                assertTrue(afterSeparator, "Separator not found before target item");
+                return assertInstanceOf(JCheckBoxMenuItem.class, c, "Target item doesn't appear to be a JCheckBoxMenuItem");
             }
         }
@@ -638 +630 @@
     /**
      * test downloaded area is shown shaded
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testShowDownloadedArea() throws Exception {
+    public void testShowDownloadedArea() {
         Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
         Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", false);
@@ -797 +788 @@
     /**
      * test display of downloaded area follows active layer switching
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testShowDownloadedAreaLayerSwitching() throws Exception {
+    public void testShowDownloadedAreaLayerSwitching() {
         Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
         Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", true);

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/CycleLayerActionTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.layer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.openstreetmap.josm.tools.I18n.tr;
 

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/DuplicateActionTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -37 +37 @@
                 editLayer = MainApplication.getLayerManager().getEditLayer();
                 assertNotNull(editLayer);
-                assertFalse(layer.equals(editLayer));
+                assertNotEquals(layer, editLayer);
                 assertEquals(layer.data.getNodes().size(), editLayer.data.getNodes().size());
                 assertEquals(layer.data.getWays().size(), editLayer.data.getWays().size());

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation.sort;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
@@ -8 +11 @@
 import java.util.List;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68 +70 @@
         final String[] expected = {"t1w4", "t1w3", "t1w2", "t1w1", "t1w7", "t1w6", "t1w5", "t1n1", "t1n2"};
         // expect nodes to be sorted correctly
-        Assert.assertEquals(expected[7], actual[7]);
-        Assert.assertEquals(expected[8], actual[8]);
+        assertEquals(expected[7], actual[7]);
+        assertEquals(expected[8], actual[8]);
     }
 
@@ -75 +77 @@
     void testAssociatedStreet() {
         String[] actual = getNames(sorter.sortMembers(getRelation("associatedStreet").getMembers()));
-        Assert.assertArrayEquals(new String[] {"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4"}, actual);
+        assertArrayEquals(new String[] {"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4"}, actual);
     }
 
@@ -81 +83 @@
     void testStreet() {
         String[] actual = getNames(sorter.sortMembers(getRelation("street").getMembers()));
-        Assert.assertArrayEquals(new String[]{"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4", "playground", "tree"}, actual);
+        assertArrayEquals(new String[]{"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4", "playground", "tree"}, actual);
     }
 
@@ -94 +96 @@
         // Check the first way before sorting, otherwise the sorter
         // might pick a different loop starting point than expected below
-        Assert.assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
 
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w1", "t5w2a", "t5w3a", "t5w4a", "t5w2b", "t5w3b", "t5w4b",
             "t5w5", "t5w6a", "t5w7a", "t5w8a", "t5w6b", "t5w7b", "t5w8b",
@@ -110 +112 @@
         // Check the first way before sorting, otherwise the sorter
         // might sort in reverse compared to what is expected below
-        Assert.assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
 
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w1", "t5w2a", "t5w3a", "t5w4a", "t5w2b", "t5w3b", "t5w4b",
             "t5w5", "t5w6a", "t5w7a", "t5w8a", "t5w6b", "t5w7b", "t5w8b",
@@ -125 +127 @@
         Relation relation = getRelation("three-loops-ends-node");
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w4a", "t5w3a", "t5w2a", "t5w2b", "t5w3b", "t5w4b",
             "t5w5", "t5w6a", "t5w7a", "t5w8a", "t5w6b", "t5w7b", "t5w8b",
@@ -136 +138 @@
         Relation relation = getRelation("one-loop-ends-split");
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w3a", "t5w4a", "t5w3b", "t5w4b",
             "t5w5", "t5w6a", "t5w7a", "t5w8a", "t5w6b", "t5w7b", "t5w8b",
@@ -150 +152 @@
         // for now.
         String[] actual = getNames(relation.getMembers());
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w7a", "t5w8a", "t5w7b", "t5w8b",
             "t5w9a", "t5w10a", "t5w9b", "t5w10b",
@@ -161 +163 @@
         // TODO: This is not yet sorted perfectly (might not be possible)
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t5w1", "t5w2a", "t5w3a", "t5w4a", "t5w2b", "t5w3b",
             "t5w5", "t5w6a", "t5w7a", "t5w8a", "t5w9a", "t5w10a", "t5w11a", "t5w6b", "t5w7b",
@@ -173 +175 @@
         // TODO: This is not always sorted properly, only when the right
         // way is already at the top, so check that
-        Assert.assertEquals("t6w1a", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t6w1a", relation.getMembers().get(0).getMember().get("name"));
 
         String[] actual = getNames(sorter.sortMembers(relation.getMembers()));
-        Assert.assertArrayEquals(new String[]{
+        assertArrayEquals(new String[]{
             "t6w1a", "t6w2a", "t6w3a",
             "t6w1b", "t6w2b", "t6w3b",

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation.sort;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -12 +16 @@
 import java.util.List;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -102 +105 @@
     void testEmpty() {
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(new ArrayList<>()));
-        Assert.assertEquals("[]", actual);
+        assertEquals("[]", actual);
     }
 
@@ -113 +116 @@
         Relation relation = getRelation("generic");
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
-        Assert.assertEquals("[NONE, NONE, FORWARD, FORWARD, NONE, NONE, NONE, I, I]", actual);
+        assertEquals("[NONE, NONE, FORWARD, FORWARD, NONE, NONE, NONE, I, I]", actual);
         actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
-        Assert.assertEquals("[FORWARD, FORWARD, FORWARD, FORWARD, BACKWARD, BACKWARD, NONE, I, I]", actual);
+        assertEquals("[FORWARD, FORWARD, FORWARD, FORWARD, BACKWARD, BACKWARD, NONE, I, I]", actual);
     }
 
@@ -122 +125 @@
         Relation relation = getRelation("associatedStreet");
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
-        Assert.assertEquals("[NONE, I, I, I, NONE, I]", actual);
+        assertEquals("[NONE, I, I, I, NONE, I]", actual);
         actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
-        Assert.assertEquals("[FORWARD, FORWARD, I, I, I, I]", actual);
+        assertEquals("[FORWARD, FORWARD, I, I, I, I]", actual);
     }
 
@@ -131 +134 @@
         Relation relation = getRelation("loop");
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
-        Assert.assertEquals("[FPH FORWARD, FP FORWARD, NONE, FPH FORWARD, NONE, FPH FORWARD, NONE]", actual);
+        assertEquals("[FPH FORWARD, FP FORWARD, NONE, FPH FORWARD, NONE, FPH FORWARD, NONE]", actual);
         //TODO Sorting doesn't work well in this case
         actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
-        Assert.assertEquals("[BACKWARD, BACKWARD, BACKWARD, FP FORWARD, BP BACKWARD, BP BACKWARD, BPT BACKWARD]", actual);
+        assertEquals("[BACKWARD, BACKWARD, BACKWARD, FP FORWARD, BP BACKWARD, BP BACKWARD, BPT BACKWARD]", actual);
     }
 
@@ -147 +150 @@
         // Check the first way before sorting, otherwise the sorter
         // might pick a different loop starting point than expected below
-        Assert.assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
         String expected = "[" +
@@ -155 +158 @@
             "L FORWARD, L FORWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -163 +166 @@
         // Check the first way before sorting, otherwise the sorter
         // might sort in reverse compared to what is expected below
-        Assert.assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t5w1", relation.getMembers().get(0).getMember().get("name"));
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
         String expected = "[" +
@@ -171 +174 @@
             "FORWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -183 +186 @@
             "FPH FORWARD, FP FORWARD, FP FORWARD, FP FORWARD, FP FORWARD, BPT BACKWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -195 +198 @@
             "FPH FORWARD, FP FORWARD, BP BACKWARD, BP BACKWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -208 +211 @@
             "FPH FORWARD, FP FORWARD, BP BACKWARD, BP BACKWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -221 +224 @@
             "BACKWARD, FPH FORWARD, FP FORWARD, FP FORWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -229 +232 @@
         // TODO: This is not always sorted properly, only when the right
         // way is already at the top, so check that
-        Assert.assertEquals("t6w1a", relation.getMembers().get(0).getMember().get("name"));
+        assertEquals("t6w1a", relation.getMembers().get(0).getMember().get("name"));
         String actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
         String expected = "[" +
             "FP FORWARD, FP FORWARD, FP FORWARD, BP BACKWARD, BP BACKWARD, BP BACKWARD" +
         "]";
-        Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
@@ -256 +259 @@
         List<WayConnectionType> returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
         for (int i = 0; i < 4; i++) {
-            Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
-            Assert.assertTrue(returned.get(i).onewayFollowsNext);
-        }
-
-        Assert.assertTrue(returned.get(4).onewayFollowsPrevious);
-        Assert.assertFalse(returned.get(4).onewayFollowsNext);
-
-        Assert.assertFalse(returned.get(5).onewayFollowsPrevious);
-        Assert.assertFalse(returned.get(5).onewayFollowsNext);
-
-        Assert.assertFalse(returned.get(6).onewayFollowsPrevious);
-        Assert.assertTrue(returned.get(6).onewayFollowsNext);
+            assertTrue(returned.get(i).onewayFollowsPrevious);
+            assertTrue(returned.get(i).onewayFollowsNext);
+        }
+
+        assertTrue(returned.get(4).onewayFollowsPrevious);
+        assertFalse(returned.get(4).onewayFollowsNext);
+
+        assertFalse(returned.get(5).onewayFollowsPrevious);
+        assertFalse(returned.get(5).onewayFollowsNext);
+
+        assertFalse(returned.get(6).onewayFollowsPrevious);
+        assertTrue(returned.get(6).onewayFollowsNext);
 
         // Reverse the last oneway
@@ -276 +279 @@
             returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
             for (int i = 0; i < 4; i++) {
-                Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
-                Assert.assertTrue(returned.get(i).onewayFollowsNext);
+                assertTrue(returned.get(i).onewayFollowsPrevious);
+                assertTrue(returned.get(i).onewayFollowsNext);
             }
 
-            Assert.assertTrue(returned.get(4).onewayFollowsPrevious);
-            Assert.assertFalse(returned.get(4).onewayFollowsNext);
-
-            Assert.assertFalse(returned.get(5).onewayFollowsPrevious);
-            Assert.assertTrue(returned.get(5).onewayFollowsNext);
-
-            Assert.assertTrue(returned.get(6).onewayFollowsPrevious);
-            Assert.assertTrue(returned.get(6).onewayFollowsNext);
+            assertTrue(returned.get(4).onewayFollowsPrevious);
+            assertFalse(returned.get(4).onewayFollowsNext);
+
+            assertFalse(returned.get(5).onewayFollowsPrevious);
+            assertTrue(returned.get(5).onewayFollowsNext);
+
+            assertTrue(returned.get(6).onewayFollowsPrevious);
+            assertTrue(returned.get(6).onewayFollowsNext);
             reverseWay(way);
         }
@@ -298 +301 @@
             returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
             for (int i = 0; i < 7; i++) {
-                Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
-                Assert.assertTrue(returned.get(i).onewayFollowsNext);
+                assertTrue(returned.get(i).onewayFollowsPrevious);
+                assertTrue(returned.get(i).onewayFollowsNext);
             }
         }
@@ -309 +312 @@
         returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
         for (int i = 0; i < 7; i++) {
-            Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
-            Assert.assertTrue(returned.get(i).onewayFollowsNext);
+            assertTrue(returned.get(i).onewayFollowsPrevious);
+            assertTrue(returned.get(i).onewayFollowsNext);
         }
     }
@@ -326 +329 @@
         List<WayConnectionType> returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
         for (WayConnectionType type : returned) {
-            Assert.assertTrue(type.onewayFollowsNext);
-            Assert.assertTrue(type.onewayFollowsPrevious);
+            assertTrue(type.onewayFollowsNext);
+            assertTrue(type.onewayFollowsPrevious);
         }
 
@@ -334 +337 @@
         returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
         for (WayConnectionType type : returned) {
-            Assert.assertTrue(type.onewayFollowsNext);
-            Assert.assertTrue(type.onewayFollowsPrevious);
+            assertTrue(type.onewayFollowsNext);
+            assertTrue(type.onewayFollowsPrevious);
         }
 
@@ -346 +349 @@
         for (int i = 0; i < returned.size() - 1; i++) {
             WayConnectionType type = returned.get(i);
-            Assert.assertTrue(type.onewayFollowsNext);
-            Assert.assertTrue(type.onewayFollowsPrevious);
-        }
-        Assert.assertTrue(returned.get(6).onewayFollowsNext);
-        Assert.assertFalse(returned.get(6).onewayFollowsPrevious);
+            assertTrue(type.onewayFollowsNext);
+            assertTrue(type.onewayFollowsPrevious);
+        }
+        assertTrue(returned.get(6).onewayFollowsNext);
+        assertFalse(returned.get(6).onewayFollowsPrevious);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.validator;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31 +32 @@
     @Test
     void testValidatorTreePanel() {
-        assertNotNull(new ValidatorTreePanel());
+        assertDoesNotThrow(() -> new ValidatorTreePanel());
 
         ValidatorTreePanel vtp = new ValidatorTreePanel(new ArrayList<>(Arrays.asList(
@@ -59 +60 @@
         vtp.setVisible(false);
         Node n = new Node(10);
-        vtp.setErrors(Arrays.asList(TestError.builder(null, Severity.ERROR, 0)
+        vtp.setErrors(Collections.singletonList(TestError.builder(null, Severity.ERROR, 0)
                 .message("")
                 .primitives(n)
                 .build()));
         assertEquals(1, vtp.getErrors().size());
-        vtp.selectRelatedErrors(Collections.<OsmPrimitive>singleton(n));
+        vtp.selectRelatedErrors(Collections.singleton(n));
         vtp.expandAll();
         assertNotNull(vtp.getRoot());
         vtp.resetErrors();
-        Set<? extends OsmPrimitive> filter = new HashSet<>(Arrays.asList(n));
+        Set<? extends OsmPrimitive> filter = new HashSet<>(Collections.singletonList(n));
         vtp.setFilter(filter);
         assertEquals(filter, vtp.getFilter());
-        vtp.setFilter(new HashSet<OsmPrimitive>());
+        vtp.setFilter(new HashSet<>());
         assertNull(vtp.getFilter());
         vtp.setFilter(null);

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryLoadTaskTest.java

@@ -53 +53 @@
 
     /**
-     * Unit test of {@link HistoryLoadTask#loadHistory}
+     * Unit test of {@link HistoryLoadTask#loadHistory(OsmServerHistoryReader, ProgressMonitor)}
      * @throws OsmTransferException if an error occurs
      */

trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Collections;
@@ -7 +10 @@
 import javax.swing.JOptionPane;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -94 +96 @@
         Optional<AsynchronousUploadPrimitivesTask> task = AsynchronousUploadPrimitivesTask.
                 createAsynchronousUploadTask(strategy, layer, toUpload, changeset);
-        Assert.assertNotNull(uploadPrimitivesTask);
-        Assert.assertFalse(task.isPresent());
+        assertNotNull(uploadPrimitivesTask);
+        assertFalse(task.isPresent());
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -88 +89 @@
     /**
      * Unit test of {@link GpxLayer#GpxLayer}.
-     * @throws Exception if any error occurs
-     */
-    @Test
-    void testGpxLayer() throws Exception {
+     */
+    @Test
+    void testGpxLayer() {
         GpxLayer layer = new GpxLayer(new GpxData(), "foo", false);
         GpxTrack trk = new GpxTrack(new ArrayList<IGpxTrackSegment>(), new HashMap<>());
@@ -211 +211 @@
     void testGetTimespanForTrack() throws Exception {
         assertEquals("", GpxLayer.getTimespanForTrack(
-                new GpxTrack(new ArrayList<Collection<WayPoint>>(), new HashMap<String, Object>())));
+                new GpxTrack(new ArrayList<Collection<WayPoint>>(), new HashMap<>())));
 
         assertEquals("2016-01-03 11:59:58 \u2013 12:00:00 (2.0 s)", GpxLayer.getTimespanForTrack(getMinimalGpxData().tracks.iterator().next()));
@@ -238 +238 @@
     @Test
     void testMergeFromIAE() {
-        assertThrows(IllegalArgumentException.class, () -> new GpxLayer(new GpxData()).mergeFrom(new OsmDataLayer(new DataSet(), "", null)));
+        final GpxLayer gpxLayer = new GpxLayer(new GpxData());
+        final OsmDataLayer osmDataLayer = new OsmDataLayer(new DataSet(), "testMergeFromIAE", null);
+        assertThrows(IllegalArgumentException.class, () -> gpxLayer.mergeFrom(osmDataLayer));
     }
 
@@ -297 +299 @@
         assertNull(layer.getAssociatedFile());
         Object infoComponent = layer.getInfoComponent();
-        assertTrue(infoComponent instanceof JScrollPane);
-        Component view = ((JScrollPane) infoComponent).getViewport().getView();
-        assertTrue(view instanceof HtmlPanel);
-        String text = ((HtmlPanel) view).getEditorPane().getText().trim();
+        Component view = assertInstanceOf(JScrollPane.class, infoComponent).getViewport().getView();
+        String text = assertInstanceOf(HtmlPanel.class, view).getEditorPane().getText().trim();
         assertTrue(text.startsWith("<html>"), text);
         assertTrue(text.endsWith("</html>"), text);
         assertEquals("<html><br></html>", layer.getToolTipText());
-        assertDoesNotThrow(() -> layer.jumpToNextMarker());
-        assertDoesNotThrow(() -> layer.jumpToPreviousMarker());
+        assertDoesNotThrow(layer::jumpToNextMarker);
+        assertDoesNotThrow(layer::jumpToPreviousMarker);
         assertDoesNotThrow(() -> layer.visitBoundingBox(new BoundingXYVisitor()));
         assertDoesNotThrow(() -> layer.filterTracksByDate(null, null, false));

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java

@@ -9 +9 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -73 +74 @@
 
         Config.getPref().put("gpx.convert-tags", "list");
-        Config.getPref().putList("gpx.convert-tags.list.yes", Arrays.asList("ele"));
-        Config.getPref().putList("gpx.convert-tags.list.no", Arrays.asList("time"));
+        Config.getPref().putList("gpx.convert-tags.list.yes", Collections.singletonList("ele"));
+        Config.getPref().putList("gpx.convert-tags.list.no", Collections.singletonList("time"));
         testFromTrack("tracks.gpx", "tracks-ele.osm");
 
-        Config.getPref().putList("gpx.convert-tags.list.yes", Arrays.asList("time"));
-        Config.getPref().putList("gpx.convert-tags.list.no", Arrays.asList("ele"));
+        Config.getPref().putList("gpx.convert-tags.list.yes", Collections.singletonList("time"));
+        Config.getPref().putList("gpx.convert-tags.list.no", Collections.singletonList("ele"));
         testFromTrack("tracks.gpx", "tracks-time.osm");
 
@@ -141 +142 @@
 
         List<String> ways = osm.getWays().stream()
-                .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream()
-                        .sorted(Comparator.comparing(Map.Entry::getKey)).collect(Collectors.toList()).toString())
+                .map(w -> w.getNodes().size() + ":" + w.getKeys().entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey()).collect(Collectors.toList()))
                 .sorted()
                 .collect(Collectors.toList());
 
         List<String> waysExpected = osmExpected.getWays().stream()
-                .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream()
-                        .sorted(Comparator.comparing(Map.Entry::getKey)).collect(Collectors.toList()).toString())
+                .map(w -> w.getNodes().size() + ":" + w.getKeys().entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey()).collect(Collectors.toList()))
                 .sorted()
                 .collect(Collectors.toList());

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

@@ -3 +3 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 import org.openstreetmap.josm.gui.mappaint.mapcss.AllMapCSSTests;
 
@@ -9 +9 @@
  * All mappaint tests.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     LabelCompositionStrategyTest.class,
     MapCSSWithExtendedTextDirectivesTest.class,

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Color;
@@ -46 +46 @@
         TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */);
         assertNotNull(te.labelCompositionStrategy);
-        assertTrue(te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy);
+        assertInstanceOf(DeriveLabelFromNameTagsCompositionStrategy.class, te.labelCompositionStrategy);
     }
 
@@ -63 +63 @@
         TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */);
         assertNotNull(te.labelCompositionStrategy);
-        assertTrue(te.labelCompositionStrategy instanceof TagLookupCompositionStrategy);
+        assertInstanceOf(TagLookupCompositionStrategy.class, te.labelCompositionStrategy);
         assertEquals("my_name", ((TagLookupCompositionStrategy) te.labelCompositionStrategy).getDefaultLabelTag());
     }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * All MapCSS tests.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     KeyValueConditionTest.class,
     ParsingLinkSelectorTest.class,

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -54 +55 @@
         assertFalse(op.applies(genEnv(node4)));
 
-        assertTrue(op instanceof SimpleKeyValueCondition);
+        TagCondition tc = assertInstanceOf(SimpleKeyValueCondition.class, op);
         assertEquals("[k1=v1]", op.toString());
-        assertEquals("k1", ((TagCondition) op).asTag(null).getKey());
-        assertEquals("v1", ((TagCondition) op).asTag(null).getValue());
+        assertEquals("k1", tc.asTag(null).getKey());
+        assertEquals("v1", tc.asTag(null).getValue());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -16 +17 @@
 import java.util.regex.Pattern;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -80 +80 @@
     void testClassCondition() throws Exception {
         List<Condition> conditions = getParser("way[name=X].highway:closed").selector().getConditions();
-        assertTrue(conditions.get(0) instanceof SimpleKeyValueCondition);
+        assertInstanceOf(SimpleKeyValueCondition.class, conditions.get(0));
         assertTrue(conditions.get(0).applies(getEnvironment("name", "X")));
-        assertTrue(conditions.get(1) instanceof ClassCondition);
-        assertTrue(conditions.get(2) instanceof PseudoClassCondition);
+        assertInstanceOf(ClassCondition.class, conditions.get(1));
+        assertInstanceOf(PseudoClassCondition.class, conditions.get(2));
         assertFalse(conditions.get(2).applies(getEnvironment("name", "X")));
     }
@@ -106 +106 @@
 
     @Test
-    void testClassMatching() throws Exception {
+    void testClassMatching() {
         MapCSSStyleSource css = new MapCSSStyleSource(
                 "way[highway=footway] { set .path; color: #FF6644; width: 2; }\n" +
@@ -147 +147 @@
     void testEqualCondition() throws Exception {
         Condition condition = getParser("[surface=paved]").condition(PRIMITIVE);
-        assertTrue(condition instanceof SimpleKeyValueCondition);
-        assertEquals("surface", ((SimpleKeyValueCondition) condition).k);
-        assertEquals("paved", ((SimpleKeyValueCondition) condition).v);
+        SimpleKeyValueCondition simpleKeyValueCondition = assertInstanceOf(SimpleKeyValueCondition.class, condition);
+        assertEquals("surface", simpleKeyValueCondition.k);
+        assertEquals("paved", simpleKeyValueCondition.v);
         assertTrue(condition.applies(getEnvironment("surface", "paved")));
         assertFalse(condition.applies(getEnvironment("surface", "unpaved")));
@@ -315 +315 @@
     private void tagRegex(Way way, String parserString, Boolean[] expected) throws Exception {
         Selector selector = getParser(parserString).selector();
-        Assert.assertEquals(expected[0], selector.matches(new Environment(way)));
+        assertEquals(expected[0], selector.matches(new Environment(way)));
         way.put("old_ref", null);
-        Assert.assertEquals(expected[1], selector.matches(new Environment(way)));
+        assertEquals(expected[1], selector.matches(new Environment(way)));
         way.put("no_match_tag", "false");
-        Assert.assertEquals(expected[2], selector.matches(new Environment(way)));
+        assertEquals(expected[2], selector.matches(new Environment(way)));
         way.put("old_ref", "A22");
-        Assert.assertEquals(expected[3], selector.matches(new Environment(way)));
+        assertEquals(expected[3], selector.matches(new Environment(way)));
         way.put("old_ref", null);
         way.put("OLD_REF", "A23");
-        Assert.assertEquals(expected[4], selector.matches(new Environment(way)));
+        assertEquals(expected[4], selector.matches(new Environment(way)));
     }
 
@@ -368 +368 @@
 
     @Test
-    void testTicket8568() throws Exception {
+    void testTicket8568() {
         MapCSSStyleSource sheet = new MapCSSStyleSource(
                 "way { width: 5; }\n" +
@@ -385 +385 @@
 
     @Test
-    void testTicket8071() throws Exception {
+    void testTicket8071() {
         MapCSSStyleSource sheet = new MapCSSStyleSource(
                 "*[rcn_ref], *[name] {text: concat(tag(rcn_ref), \" \", tag(name)); }");
@@ -421 +421 @@
 
     @Test
-    void testColorParsing() throws Exception {
+    void testColorParsing() {
         assertEquals(new Color(0x12, 0x34, 0x56, 0x78), ColorHelper.html2color("#12345678"));
     }
@@ -459 +459 @@
 
     @Test
-    void testParentTags() throws Exception {
+    void testParentTags() {
         DataSet ds = new DataSet();
         Node n = new Node(new LatLon(1, 2));
@@ -486 +486 @@
 
     @Test
-    void testSort() throws Exception {
-        assertEquals(Arrays.asList(new String[] {"alpha", "beta"}), Functions.sort(null, "beta", "alpha"));
+    void testSort() {
+        assertEquals(Arrays.asList("alpha", "beta"), Functions.sort(null, "beta", "alpha"));
         Way way1 = TestUtils.newWay("highway=residential name=Alpha alt_name=Beta ref=\"A9;A8\"", new Node(new LatLon(0.001, 0.001)),
                 new Node(new LatLon(0.002, 0.002)));
@@ -508 +508 @@
 
     @Test
-    void testUniqueValues() throws Exception {
-        assertEquals(Arrays.asList(new String[] {"alpha", "beta"}),
+    void testUniqueValues() {
+        assertEquals(Arrays.asList("alpha", "beta"),
                 Functions.uniq(null, "alpha", "alpha", "alpha", "beta"));
-        assertEquals(Arrays.asList(new String[] {"one", "two", "three"}),
-                Functions.uniq_list(Arrays.asList(new String[] {"one", "one", "two", "two", "two", "three"})));
-    }
-
-    @Test
-    void testCountRoles() throws Exception {
+        assertEquals(Arrays.asList("one", "two", "three"),
+                Functions.uniq_list(Arrays.asList("one", "one", "two", "two", "two", "three")));
+    }
+
+    @Test
+    void testCountRoles() {
         DataSet ds = new DataSet();
         Way way1 = TestUtils.newWay("highway=residential name=1",
@@ -596 +596 @@
 
     @Test
-    void testInvalidBaseSelector() throws Exception {
+    void testInvalidBaseSelector() {
         MapCSSStyleSource css = new MapCSSStyleSource("invalid_base[key=value] {}");
         css.loadStyleSource();
@@ -624 +624 @@
         assertEquals(24.0, mc.getCascade(null).get("div"));
         assertEquals(-13.0, mc.getCascade(null).get("neg"));
-        assertEquals(true, mc.getCascade(null).get("not"));
+        assertEquals(Boolean.TRUE, mc.getCascade(null).get("not"));
         assertNull(mc.getCascade(null).get("null0"));
         assertNull(mc.getCascade(null).get("null1"));
@@ -631 +631 @@
 
     @Test
-    void testMinMaxFunctions() throws Exception {
+    void testMinMaxFunctions() {
         MapCSSStyleSource sheet = new MapCSSStyleSource("* {" +
                 "min_value: min(tag(x), tag(y), tag(z)); " +
@@ -700 +700 @@
     @Test
     void testZoomIAE() {
-        assertThrows(IllegalArgumentException.class, () -> getParser("|z16-15").zoom());
+        final MapCSSParser parser = getParser("|z16-15");
+        assertThrows(IllegalArgumentException.class, parser::zoom);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/preferences/AbstractExtendedSourceEntryTestCase.java

@@ -23 +23 @@
     protected static final List<String> errorsToIgnore = new ArrayList<>();
 
-    protected static List<Object[]> getTestParameters(Collection<ExtendedSourceEntry> entries) throws Exception {
+    protected static List<Object[]> getTestParameters(Collection<ExtendedSourceEntry> entries) {
         return entries.stream().map(x -> new Object[] {x.getDisplayName(), cleanUrl(x.url), x}).collect(Collectors.toList());
     }
@@ -45 +45 @@
     protected final void handleException(ExtendedSourceEntry source, Throwable e, Set<String> errors, List<String> ignoredErrors) {
         e.printStackTrace();
-        String s = source.url + " => " + e.toString();
+        String s = source.url + " => " + e;
         if (isIgnoredSubstring(source, s)) {
             ignoredErrors.add(s);

trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.event.ActionEvent;
@@ -11 +13 @@
 import javax.swing.Action;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.actions.ActionParameter;
@@ -54 +55 @@
             expected.put((String) params[i], params[i+1]);
         }
-        Assert.assertEquals(expected, a.getParameters());
+        assertEquals(expected, a.getParameters());
     }
 
@@ -73 +74 @@
         checkAction(parser.loadAction("action(uknownParam=aa)"));
 
-        Assert.assertEquals("action(param1=value1,param2=value2)",
-                parser.saveAction(parser.loadAction("action(param1=value1,param2=value2)")));
-        Assert.assertEquals("action(param1=value1,param2=)",
-                parser.saveAction(parser.loadAction("action(param1=value1)")));
-        Assert.assertEquals("action(param1=value1,param2=2\\(\\=\\,\\\\)",
-                parser.saveAction(parser.loadAction("action(param1=value1,param2=2\\(\\=\\,\\\\)")));
+        assertEquals("action(param1=value1,param2=value2)", parser.saveAction(parser.loadAction("action(param1=value1,param2=value2)")));
+        assertEquals("action(param1=value1,param2=)", parser.saveAction(parser.loadAction("action(param1=value1)")));
+        assertEquals(
+                "action(param1=value1,param2=2\\(\\=\\,\\\\)",
+                parser.saveAction(parser.loadAction("action(param1=value1,param2=2\\(\\=\\,\\\\)"))
+        );
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -146 +146 @@
 
     private static boolean isIgnoredSubstring(String substring) {
-        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x));
+        return errorsToIgnore.parallelStream().anyMatch(substring::contains);
     }
 
@@ -342 +342 @@
             }
         } catch (IOException | RuntimeException | WMSGetCapabilitiesException e) {
-            addError(info, info.getUrl() + ERROR_SEP + e.toString());
+            addError(info, info.getUrl() + ERROR_SEP + e);
         }
 
@@ -394 +394 @@
                 return new WMTSTileSource(info, proj);
             } catch (IOException | WMTSGetCapabilitiesException e) {
-                addError(info, info.getUrl() + ERROR_SEP + e.toString());
+                addError(info, info.getUrl() + ERROR_SEP + e);
                 return null;
             }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -4 +4 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Component;

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java

@@ -5 +5 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -13 +14 @@
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -45 +45 @@
         String presetfile = TestUtils.getRegressionDataFile(8954, "preset.xml");
         final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, false);
-        Assert.assertEquals("Number of preset items", 1, presets.size());
+        assertEquals(1, presets.size(), "Number of preset items");
         final TaggingPreset preset = presets.iterator().next();
-        Assert.assertEquals("Number of entries", 1, preset.data.size());
+        assertEquals(1, preset.data.size(), "Number of entries");
         final TaggingPresetItem item = preset.data.get(0);
-        Assert.assertTrue("Entry is not checkbox", item instanceof Check);
+        assertInstanceOf(Check.class, item, "Entry is not checkbox");
     }
 
@@ -93 +93 @@
         String presetfile = "resource://data/defaultpresets.xml";
         final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true);
-        Assert.assertTrue("Default presets are empty", presets.size() > 0);
+        assertTrue(presets.size() > 0, "Default presets are empty");
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
@@ -62 +62 @@
         assertAll(() -> assertSame(menu.presetSearchAction, presetsMenu.getItem(0).getAction()),
                 () -> assertSame(menu.presetSearchPrimitiveAction, presetsMenu.getItem(1).getAction()),
-                () -> assertTrue(presetsMenu.getItem(2).getAction() instanceof PreferencesAction),
-                () -> assertTrue(presetsMenu.getMenuComponent(3) instanceof JSeparator));
+                () -> assertInstanceOf(PreferencesAction.class, presetsMenu.getItem(2).getAction()),
+                () -> assertInstanceOf(JSeparator.class, presetsMenu.getMenuComponent(3)));
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/widgets/HistoryComboBoxTest.java

@@ -21 +21 @@
 class HistoryComboBoxTest {
     static Stream<Arguments> testNonRegression21203() {
-        return Stream.of(Arguments.of("Hello world"), Arguments.of(new AutoCompletionItem("Hello world2")), Arguments.of(new Double(42)));
+        return Stream.of(Arguments.of("Hello world"), Arguments.of(new AutoCompletionItem("Hello world2")), Arguments.of(42.0));
     }
 
@@ -59 +59 @@
         historyComboBox.addCurrentItemToHistory();
 
-        // add a new item
+        // Add a new item
         historyComboBox.getEditor().setItem(new AutoCompletionItem("testNonRegression21215_2"));
         historyComboBox.addCurrentItemToHistory();