Skip to content

Commit b98da12

Browse files
committed
CSSTUDIO-1911 Fix test.
1 parent edd4d22 commit b98da12

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ public void testTimeOfExpansion() throws Exception
166166
// When macros are expanded as the runtime starts..
167167
DisplayMacroExpander.expandDisplayMacros(model);
168168

169-
// ..you get $(P)="display"
169+
// ..you get $(P)="group", since 'subgroup' defines 'P' as
170+
// '$(SAVE)', and 'group' defines 'SAVE' as '$(P)' and
171+
// 'P' as 'group'.
170172
macros = label.getEffectiveMacros();
171173
System.out.println(macros);
172-
assertThat(macros.getValue("P"), equalTo("display"));
173-
assertThat(MacroHandler.replace(macros, "$(P)"), equalTo("display"));
174+
assertThat(macros.getValue("P"), equalTo("group"));
175+
assertThat(MacroHandler.replace(macros, "$(P)"), equalTo("group"));
174176
}
175177
}

0 commit comments

Comments
 (0)