Changeset 13004 in josm

Timestamp:

2017-10-16T15:21:44+02:00 (7 years ago)

Author:

bastiK

Message:

fix deprecations in tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/template_engine/Variable.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java

@@ -25 +25 @@
      * Constructs a new {@code Variable}.
      * @param variableName the variable name (i.e. the key in the data provider key-value mapping);
-     * will be considered "special" if the variable name starts with {@link SPECIAL_VARIABLE_PREFIX}
+     * will be considered "special" if the variable name starts with {@link #SPECIAL_VARIABLE_PREFIX}
      */
     public Variable(String variableName) {

trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java

@@ -59 +59 @@
     public void testConditionWhitespace() throws ParseError {
         TemplateParser parser = new TemplateParser("?{ '{name} {desc}' | '{name}' | '{desc}'    }");
-        Condition condition = new Condition();
-        condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
-        condition.getEntries().add(new Variable("name"));
-        condition.getEntries().add(new Variable("desc"));
+        Condition condition = new Condition(Arrays.asList(
+            CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+            new Variable("name"),
+            new Variable("desc")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }
@@ -73 +73 @@
     public void testConditionNoWhitespace() throws ParseError {
         TemplateParser parser = new TemplateParser("?{'{name} {desc}'|'{name}'|'{desc}'}");
-        Condition condition = new Condition();
-        condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
-        condition.getEntries().add(new Variable("name"));
-        condition.getEntries().add(new Variable("desc"));
+        Condition condition = new Condition(Arrays.asList(
+                CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+                new Variable("name"),
+                new Variable("desc")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }
@@ -92 +92 @@
     public void testConditionSearchExpression() throws ParseError, SearchParseError {
         TemplateParser parser = new TemplateParser("?{ admin_level = 2 'NUTS 1' | admin_level = 4 'NUTS 2' |  '{admin_level}'}");
-        Condition condition = new Condition();
-        condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")));
-        condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")));
-        condition.getEntries().add(new Variable("admin_level"));
+        Condition condition = new Condition(Arrays.asList(
+                new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")),
+                new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")),
+                new Variable("admin_level")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }