Changeset 18818 in josm

Timestamp:

2023-08-23T00:10:21+02:00 (10 months ago)

Author:

taylor.smock

Message:

Fix tests

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxParser.java (modified) (7 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (modified) (1 diff)

trunk/build.xml

@@ -188 +188 @@
                 <!-- Indicate that this jar may have version specific classes. Only used in Java9+. -->
                 <attribute name="Multi-Release" value="true"/>
+                <attribute name="Automatic-Module-Name" value="org.openstreetmap.josm"/>
             </manifest>
         </jar>

trunk/src/org/openstreetmap/josm/io/GpxParser.java

@@ -18 +18 @@
 
 import java.time.DateTimeException;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -27 +25 @@
 import java.util.Map;
 import java.util.Optional;
+import java.util.Stack;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -77 +76 @@
     private GpxExtensionCollection currentExtensionCollection;
     private GpxExtensionCollection currentTrackExtensionCollection;
-    private Deque<State> states;
-    private final Deque<String[]> elements = new ArrayDeque<>();
+    private final Stack<State> states = new Stack<>();
+    private final Stack<String[]> elements = new Stack<>();
 
     private StringBuilder accumulator = new StringBuilder();
@@ -87 +86 @@
     public void startDocument() {
         accumulator = new StringBuilder();
-        states = new ArrayDeque<>();
         data = new GpxData(true);
         currentExtensionCollection = new GpxExtensionCollection();
@@ -402 +400 @@
      */
     private void startElementExt(String namespaceURI, String qName, Attributes attributes) {
-        if (states.peekLast() == State.TRK) {
+        if (states.lastElement() == State.TRK) {
             currentTrackExtensionCollection.openChild(namespaceURI, qName, attributes);
         } else {
@@ -651 +649 @@
                 convertUrlToLink(currentWayPoint.attr);
                 currentWayPoint.getExtensions().addAll(currentExtensionCollection);
-                if (!currentWayPoint.isLatLonKnown()) {
-                    currentExtensionCollection.clear();
-                    throw new SAXException(tr("{0} element does not have valid latitude and/or longitude.", "wpt"));
-                }
                 data.waypoints.add(currentWayPoint);
                 currentExtensionCollection.clear();
@@ -723 +717 @@
         } else if (currentExtensionCollection != null) {
             String acc = accumulator.toString().trim();
-            if (states.peekLast() == State.TRK) {
+            if (states.lastElement() == State.TRK) {
                 currentTrackExtensionCollection.closeChild(qName, acc); //a segment inside the track can have an extension too
             } else {

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

@@ -12 +12 @@
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -19 +18 @@
 import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper.ColorMode;
 import org.openstreetmap.josm.io.GpxReaderTest;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.xml.sax.SAXException;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link GpxDrawHelper} class.
  */
+@BasicPreferences
 class GpxDrawHelperTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
 
     /**

trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java

@@ -104 +104 @@
 
     @ParameterizedTest
-    @ValueSource(strings = {
-            "<gpx><wpt></wpt></gpx>",
-    })
+    @ValueSource(strings = "<gpx><wpt></wpt></gpx>")
     void testIncompleteLocations(String gpx) {
         SAXException saxException = assertThrows(SAXException.class,