Context Navigation

Changeset 9349 in josm

Timestamp:

2016-01-09T12:10:25+01:00 (9 years ago)

Author:

simon04

Message:

see #12083 - Search: improve error message when keyword without a required parameter is used

Example: foo type bar

Location:

trunk

Files:

-              r9067
+              r9349
                             return new TimestampRange(minDate, maxDate);
                         } else {
+                            // I18n: Don't translate timestamp keyword
+                            throw new ParseError(tr("Expecting <i>min</i>/<i>max</i> after ''timestamp''"));
+                            throw new ParseError("<html>" + tr("Expecting {0} after {1}", "<i>min</i>/<i>max</i>", "<i>timestamp</i>"));
+                        }
+                    }
+                }
+            }
+            return null;
+                } else {
+                    throw new ParseError("<html>" + tr("Expecting {0} after {1}", "<code>:</code>", "<i>" + keyword + "</i>"));
+                }
+            }
+            throw new IllegalStateException("Not expecting keyword " + keyword);
+        }

-              r9214
+              r9349
 package org.openstreetmap.josm.actions.search;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 …
         anonymous.match(anonymous.n2, true);
+    }
+    @Test
+    public void testFooTypeBar() throws Exception {
+        try {
+            SearchCompiler.compile("foo type bar");
+            throw new RuntimeException();
+        } catch (ParseError parseError) {
+            assertEquals("<html>Expecting <code>:</code> after <i>type<i>", parseError.getMessage());
+        }
+    }
+}

Note: See TracChangeset for help on using the changeset viewer.