Merge pull request #3516 from rjwills28/issue3458_fix_macro_unit_test

Fix macro test following change to the default EXAMPLE_MACRO

Author: georgweiss

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

@@ -83,7 +83,7 @@ public void testPropertiesAndEnvironment()
         model.expandMacros(Preferences.getMacros());
 
         MacroValueProvider macros = model.getEffectiveMacros();
-        assertThat(macros.getValue("EXAMPLE_MACRO"), equalTo("Value from Preferences"));
+        assertThat(macros.getValue("EXAMPLE_MACRO"), nullValue());
 
         // Can also fall back to widget properties
         assertThat(macros.getValue("type"), nullValue());