Changeset 18783 in josm for trunk/test/unit/org

Timestamp:

2023-07-26T22:06:14+02:00 (16 months ago)

Author:

taylor.smock

Message:

Fix #23081: NoSuchElementException in ConflictDialog.ResolveToAction#actionPerformed

This occurs when one of the Resolve to (my|their) versions actions is called
when no conflict is selected.

There are two distinct bugs:

• isConflictSelected did not check to make certain that the selection index made sense
• ResolveActions were not enabled/disabled when the popup menu became visible, depending upon whether the current selection was valid

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+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 java.awt.Color;
 import java.awt.image.BufferedImage;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -19 +18 @@
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog.ConflictPainter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
  * Unit tests of {@link ConflictDialog} class.
  */
+@Main
+@Projection
 class ConflictDialogTest {
-
-    /**
-     * Setup tests
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection();
-
     /**
      * Unit test of {@link ConflictDialog#ConflictDialog}.
@@ -40 +32 @@
     @Test
     void testConflictDialog() {
-        assertNotNull(new ConflictDialog());
+        assertDoesNotThrow(ConflictDialog::new);
     }