Merge pull request #2681 from ControlSystemStudio/CSSTUDIO-1919-branch2

CSSTUDIO-1911 Bug-fix: macros should be expanded in the context of the widget they are defined in

Author: abrahamwolk

app/display/model/src/main/java/org/csstudio/display/builder/model/macros/DisplayMacroExpander.java

@@ -28,20 +28,20 @@ public class DisplayMacroExpander
      */
     public static void expandDisplayMacros(final DisplayModel model) throws Exception
     {
-        expand(model.runtimeChildren(), model.getMacrosOrProperties());
+        expand(model.runtimeChildren());
     }
 
-    private static void expand(final ChildrenProperty widgets, MacroValueProvider input) throws Exception
+    private static void expand(final ChildrenProperty widgets) throws Exception
     {
         for (Widget widget : widgets.getValue())
         {
             final Optional<WidgetProperty<Macros>> macros = widget.checkProperty(CommonWidgetProperties.propMacros);
             if (macros.isPresent())
-                macros.get().getValue().expandValues(input);
+                macros.get().getValue().expandValues(widget.getMacrosOrProperties());
             // Recurse
             final ChildrenProperty children = ChildrenProperty.getChildren(widget);
             if (children != null)
-                expand(children, widget.getMacrosOrProperties());
+                expand(children);
         }
     }
 }

app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java

@@ -166,10 +166,12 @@ public void testTimeOfExpansion() throws Exception
         // When macros are expanded as the runtime starts..
         DisplayMacroExpander.expandDisplayMacros(model);
 
-        // ..you get $(P)="display"
+        // ..you get $(P)="group", since 'subgroup' defines 'P' as
+        // '$(SAVE)', and 'group' defines 'SAVE' as '$(P)' and
+        // 'P' as 'group'.
         macros = label.getEffectiveMacros();
         System.out.println(macros);
-        assertThat(macros.getValue("P"), equalTo("display"));
-        assertThat(MacroHandler.replace(macros, "$(P)"), equalTo("display"));
+        assertThat(macros.getValue("P"), equalTo("group"));
+        assertThat(MacroHandler.replace(macros, "$(P)"), equalTo("group"));
     }
 }