Changeset 18761 in josm

Timestamp:

2023-06-14T22:27:42+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix borked tests (see r18757)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/mapmode/SplitMode.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java (modified) (5 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/SplitMode.java

@@ -109 +109 @@
     }
 
-
-
     @Override
     public void mousePressed(MouseEvent e) {
@@ -229 +227 @@
     }
 
-
-
     @Override
     public String getModeHelpText() {
@@ -442 +438 @@
     }
 
-
-
     /**
      * Split a specified {@link Way} at the given nodes
@@ -464 +458 @@
          * @param selection (Optional, can be null) Selection which should be updated
          */
-        public SplitWayActionConcrete(Way splitWay, List<Node> splitNodes, List<OsmPrimitive> selection) {
+        SplitWayActionConcrete(Way splitWay, List<Node> splitNodes, List<OsmPrimitive> selection) {
             super(tr("Split way {0}", DefaultNameFormatter.getInstance().format(splitWay)),
                     ImageProvider.get(splitWay.getType()));

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java

@@ -67 +67 @@
             final boolean isError = pErrors.stream().anyMatch(e -> e.getTester() instanceof MapCSSTagChecker.MapCSSTagCheckerAndRule
                     && ((MapCSSTagChecker.MapCSSTagCheckerAndRule) e.getTester()).rule.equals(check.rule));
-            if (isError != i.getValue()) {
+            final boolean iValue = Boolean.TRUE.equals(i.getValue());
+            if (isError != iValue) {
                 assertionConsumer.accept(MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",
-                        check.getMessage(p), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys()));
+                        check.getMessage(null, p), check.rule.selectors, iValue ? "match" : "not match", i.getKey(), p.getKeys()));
             }
             if (isError) {
@@ -76 +77 @@
                 if (fix != null && fix.executeCommand() && !MapCSSTagChecker.getErrorsForPrimitive(p, true, checksToRun).isEmpty()) {
                     assertionConsumer.accept(MessageFormat.format("Autofix does not work for test ''{0}'' (i.e., {1}). Failing test: {2}",
-                            check.getMessage(p), check.rule.selectors, i.getKey()));
+                            check.getMessage(null, p), check.rule.selectors, i.getKey()));
                 }
             }
@@ -84 +85 @@
     }
 
+    /**
+     * Clear previous checks (remove from memory)
+     */
     public static void clear() {
         previousChecks.clear();
@@ -106 +110 @@
         return check.rule.selectors.stream()
                 .filter(s -> s instanceof Selector.GeneralSelector)
-                .flatMap(s -> ((Selector.GeneralSelector) s).getConditions().stream())
+                .flatMap(s -> s.getConditions().stream())
                 .filter(c -> c instanceof ConditionFactory.ExpressionCondition)
                 .map(c -> ((ConditionFactory.ExpressionCondition) c).getExpression())
@@ -112 +116 @@
                 .map(c -> (ExpressionFactory.IsInsideFunction) c)
                 .map(ExpressionFactory.IsInsideFunction::getArg)
-                .filter(e -> e instanceof LiteralExpression)
+                .filter(LiteralExpression.class::isInstance)
                 .map(e -> ((LiteralExpression) e).getLiteral())
-                .filter(l -> l instanceof String)
+                .filter(String.class::isInstance)
                 .map(l -> ((String) l).split(",", -1)[0])
                 .findFirst();

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java

@@ -267 +267 @@
      * Constructs a (localized) message for this deprecation check.
      *
+     * @param selector The selector to use
      * @param p OSM primitive
      * @return a message
      */
-    String getMessage(OsmPrimitive p) {
+    String getMessage(Selector selector, OsmPrimitive p) {
         if (errors.isEmpty()) {
             // Return something to avoid NPEs
@@ -276 +277 @@
         } else {
             final Object val = errors.keySet().iterator().next().val;
+            selector = selector == null ? whichSelectorMatchesPrimitive(p) : selector;
             return String.valueOf(
                     val instanceof Expression
-                            ? ((Expression) val).evaluate(new Environment(p).withSelector(p == null ? null : whichSelectorMatchesPrimitive(p)))
+                            ? ((Expression) val).evaluate(new Environment(p).withSelector(selector))
                             : val
             );
@@ -287 +289 @@
      * Constructs a (localized) description for this deprecation check.
      *
+     * @param selector The selector to use
      * @param p OSM primitive
      * @return a description (possibly with alternative suggestions)
      * @see #getDescriptionForMatchingSelector
      */
-    String getDescription(OsmPrimitive p) {
+    String getDescription(Selector selector, OsmPrimitive p) {
         if (alternatives.isEmpty()) {
-            return getMessage(p);
+            return getMessage(selector, p);
         } else {
             /* I18N: {0} is the test error message and {1} is an alternative */
-            return tr("{0}, use {1} instead", getMessage(p), String.join(tr(" or "), alternatives));
+            return tr("{0}, use {1} instead", getMessage(selector, p), String.join(tr(" or "), alternatives));
         }
     }
@@ -309 +312 @@
      */
     String getDescriptionForMatchingSelector(OsmPrimitive p, Selector matchingSelector) {
-        return insertArguments(matchingSelector, getDescription(p), p);
+        return insertArguments(matchingSelector, getDescription(matchingSelector, p), p);
     }
 
@@ -318 +321 @@
     @Override
     public String toString() {
-        return getDescription(null);
+        return getDescription(null, null);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -99 +99 @@
         final MapCSSTagCheckerRule check = checks.get(0);
         assertNotNull(check);
-        assertEquals("{0.key}=null is deprecated", check.getDescription(null));
+        assertEquals("{0.key}=null is deprecated", check.getDescription(null, null));
         assertEquals("fixRemove: <{0.key}>", check.fixCommands.get(0).toString());
         assertEquals("fixAdd: natural=wetland", check.fixCommands.get(1).toString());