Changeset 36270 in osm for applications/editors

Timestamp:

2024-06-04T23:55:44+02:00 (7 months ago)

Author:

taylor.smock

Message:

Fix graphview tests when run with asserts enabled

This also removes some additional asserts in code that were unrelated to the test
failures.

File:

• applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeed.java (modified) (5 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeed.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.graphview.core.property;
+
+import java.util.Objects;
 
 import org.openstreetmap.josm.plugins.graphview.core.access.AccessParameters;
@@ -34 +36 @@
     public <N, W, R, M> Float evaluateN(N node, AccessParameters accessParameters,
             DataSource<N, W, R, M> dataSource) {
-        assert node != null && accessParameters != null && dataSource != null;
+        Objects.requireNonNull(node);
+        Objects.requireNonNull(dataSource);
 
         initializeIfNecessary(dataSource);
@@ -44 +47 @@
     public <N, W, R, M> Float evaluateW(W way, boolean forward, AccessParameters accessParameters,
             DataSource<N, W, R, M> dataSource) {
-        assert way != null && accessParameters != null && dataSource != null;
+        Objects.requireNonNull(dataSource);
+        Objects.requireNonNull(way);
 
         initializeIfNecessary(dataSource);
@@ -55 +59 @@
 
         if (maxspeedString != null) {
-
-            Float maxspeed = ValueStringParser.parseSpeed(maxspeedString);
-            if (maxspeed != null) {
-                return maxspeed;
-            }
-
+            return ValueStringParser.parseSpeed(maxspeedString);
         }
 
@@ -68 +67 @@
     @Override
     public boolean isUsable(Object propertyValue, AccessParameters accessParameters) {
-        assert propertyValue instanceof Float;
-        return true;
+        return propertyValue instanceof Float;
     }