Re: [xwiki-devs] [xwiki-notifications] r21910 - in platform/core/trunk: xwiki-cache/xwiki-cache-tests/src/main/java/org/xwiki/cache/tests xwiki-component/xwiki-component-api/src/main/java/org/xwiki/component/manager xwiki-component/xwiki-component-default xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/embed xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/internal xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/manager xwiki-compo

public void testIncludeMacroWithNewContext() throws Exception { - String expected = "beginDocument\n" - + "beginMacroMarkerStandalone [velocity] [] [$myvar]\n" - + "beginParagraph\n" - + "onWord [hello]\n" - + "endParagraph\n" - + "endMacroMarkerStandalone [velocity] [] [$myvar]\n" - + "endDocument"; + String expected = + "beginDocument\n" + "beginMacroMarkerStandalone [velocity] [] [$myvar]\n" + "beginParagraph\n" + + "onWord [hello]\n" + "endParagraph\n" + "endMacroMarkerStandalone [velocity] [] [$myvar]\n" + + "endDocument";

// Since it's not in the same context, we verify that a Velocity variable set in the including page is not // seen in the included page. @@ -88,21 +91,19 @@ // Create a Macro transformation context with the Macro transformation object defined so that the include // macro can transform included page which is using a new context. - MacroTransformation macroTransformation = + MacroTransformation macroTransformation = (MacroTransformation) getComponentManager().lookup(Transformation.class, "macro"); MacroTransformationContext context = new MacroTransformationContext(); context.setMacroTransformation(macroTransformation); - + List<Block> blocks = macro.execute(parameters, null, context); assertBlocks(expected, blocks); } - + public void testIncludeMacroWithCurrentContext() throws Exception { - String expected = "beginDocument\n" - + "onMacroStandalone [someMacro] []\n" - + "endDocument"; + String expected = "beginDocument\n" + "onMacroStandalone [someMacro] []\n" + "endDocument";

IncludeMacro macro = (IncludeMacro) getComponentManager().lookup(Macro.class, "include"); mockDocumentAccessBridge .expects(once()).method("isDocumentViewable").will(returnValue(true)); @@ -119,7 +120,7 @@ assertBlocks(expected, blocks); } - + public void testIncludeMacroWithNoDocumentSpecified() throws Exception { IncludeMacro macro = (IncludeMacro) getComponentManager().lookup(Macro.class, "include"); @@ -129,8 +130,8 @@ macro.execute(parameters, null, new MacroTransformationContext()); fail("An exception should have been thrown"); } catch (MacroExecutionException expected) { - assertEquals("You must specify a 'document' parameter pointing to the document to include.", - expected.getMessage()); + assertEquals("You must specify a 'document' parameter pointing to the document to include.", expected + .getMessage());