- xwiki-devs@xwiki.org - lists.xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r24669 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/test: java/org/xwiki/rendering java/org/xwiki/rendering/internal/macro/wikibridge resources resources/M
by Asiri Rathnayake 24 Oct '09

24 Oct '09

Hi Vincent, On Fri, Oct 23, 2009 at 11:20 PM, Vincent Massol <vincent(a)massol.net> wrote: > Asiri, > > Can you document the test case (wikimaro2.test) and add comments to > explain what the test tests? (it's not obvious IMO). > Ok. > Also you might want to consider writing a unit test proper instead of > using the rendering test fwk maybe since I'm not sure what it brings > here (but I haven't really checked enough so I may be wrong). > IMO writing a rendering test is more appropriate here because we are testing a rendering macro. In this particular case I'm checking whether a wiki macro (which contains a nested macro) is behaving correctly when operating in inline mode. If I'm to write a unit test, I need to define the input and analyze the output XDOM to see if it has behaved correctly - but this is very easy to do with a rendering test. Thanks. - Asiri > > -Vincent > > On Oct 23, 2009, at 1:11 PM, asiri (SVN) wrote: > > > Author: asiri > > Date: 2009-10-23 13:11:30 +0200 (Fri, 23 Oct 2009) > > New Revision: 24669 > > > > Added: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > Removed: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/components.txt > > Modified: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > Log: > > XWIKI-4520: Not possible to generate inline content from wiki macros > > when the macro body starts with another macro. > > > > * Added a test case to exploit the issue. > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -20,6 +20,9 @@ > > > > package org.xwiki.rendering; > > > > +import java.util.ArrayList; > > +import java.util.List; > > + > > import junit.framework.Test; > > import junit.framework.TestCase; > > > > @@ -28,6 +31,13 @@ > > import org.xwiki.bridge.DocumentAccessBridge; > > import org.xwiki.component.descriptor.DefaultComponentDescriptor; > > import org.xwiki.component.embed.EmbeddableComponentManager; > > +import > > org.xwiki.rendering.internal.macro.wikibridge.DefaultWikiMacro; > > +import org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro; > > +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacroManager; > > +import > > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > > import org.xwiki.rendering.scaffolding.RenderingTestSuite; > > import org.xwiki.test.ComponentManagerTestSetup; > > > > @@ -50,6 +60,7 @@ > > RenderingTestSuite suite = new RenderingTestSuite("Test Wiki > > Macro Bridge"); > > > > suite.addTestsFromResource("wikimacro1", true); > > + suite.addTestsFromResource("wikimacro2", true); > > > > ComponentManagerTestSetup testSetup = new > > ComponentManagerTestSetup(suite); > > setUpMocks(testSetup.getComponentManager()); > > @@ -67,9 +78,35 @@ > > new DefaultComponentDescriptor<DocumentAccessBridge>(); > > descriptorDAB.setRole(DocumentAccessBridge.class); > > componentManager.registerComponent(descriptorDAB, > > mockDocumentAccessBridge); > > + > > + // Register mock wiki macros. > > + WikiMacroManager wikiMacroManager = > > componentManager.lookup(WikiMacroManager.class); > > + > > + // Mock wiki macro - 1. > > + WikiMacroParameterDescriptor param1 = new > > WikiMacroParameterDescriptor("param1", "This is param1", true); > > + WikiMacroParameterDescriptor param2 = new > > WikiMacroParameterDescriptor("param2", "This is param2", true); > > + List<WikiMacroParameterDescriptor> params = new > > ArrayList<WikiMacroParameterDescriptor>(); > > + params.add(param1); > > + params.add(param2); > > + WikiMacroDescriptor descriptor = new > > WikiMacroDescriptor("Mock Wiki Macro - 1", "Description", "Test", > > + new DefaultContentDescriptor(false), params); > > + WikiMacro wikiMacro = new MockWikiMacro(new > > DefaultWikiMacro("xwiki:Main.MockWikiMacro1", "mockwikimacro1", > > + true, descriptor, "This is **mockwikimacro1**", "xwiki/ > > 2.0", componentManager), componentManager); > > + > > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro1", > > wikiMacro); > > + > > + // Mock wiki macro - 2. > > + params = new ArrayList<WikiMacroParameterDescriptor>(); > > + descriptor = new WikiMacroDescriptor("Mock Wiki Macro - 2", > > "Description", "Test", > > + new DefaultContentDescriptor(false), params); > > + wikiMacro = new MockWikiMacro(new > > DefaultWikiMacro("xwiki:Main.MockWikiMacro2", "mockwikimacro2", > > + true, descriptor, "{{mockwikimacro1 param1=\"p1\" > > param2=\"p2\"/}}", "xwiki/2.0", componentManager), > > + componentManager); > > + > > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro2", > > wikiMacro); > > + > > > > context.checking(new Expectations() {{ > > - > > oneOf > > (mockDocumentAccessBridge).getDocument("xwiki:Main.TestWikiMacro"); > > will(returnValue(null)); > > + > > allowing > > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro1"); > > will(returnValue(null)); > > + > > allowing > > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro2"); > > will(returnValue(null)); > > }}); > > } > > } > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 10:23:04 UTC > > (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 11:11:30 UTC > > (rev 24669) > > @@ -20,72 +20,48 @@ > > > > package org.xwiki.rendering.internal.macro.wikibridge; > > > > -import java.util.ArrayList; > > import java.util.HashMap; > > import java.util.List; > > > > -import org.xwiki.component.annotation.Component; > > -import org.xwiki.component.annotation.Requirement; > > +import org.xwiki.component.manager.ComponentLookupException; > > import org.xwiki.component.manager.ComponentManager; > > -import org.xwiki.component.phase.Initializable; > > -import org.xwiki.component.phase.InitializationException; > > import org.xwiki.context.Execution; > > import org.xwiki.rendering.block.Block; > > import org.xwiki.rendering.macro.Macro; > > import org.xwiki.rendering.macro.MacroExecutionException; > > -import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > > import org.xwiki.rendering.macro.descriptor.MacroDescriptor; > > -import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > > -import > > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > > import org.xwiki.rendering.macro.wikibridge.WikiMacroParameters; > > import org.xwiki.rendering.transformation.MacroTransformationContext; > > > > /** > > - * A wrapper macro used for testing a {@link DefaultWikiMacro} > > instance. > > + * A wrapper macro used for testing wiki macros. > > * > > * @version $Id$ > > * @since 2.0M2 > > */ > > -@Component("testwikimacro") > > -public class MockWikiMacro implements Macro<WikiMacroParameters>, > > Initializable > > +public class MockWikiMacro implements WikiMacro > > { > > /** > > - * The internal {@link DefaultWikiMacro} instance. > > + * The internal wiki macro instance. > > */ > > - private DefaultWikiMacro wikiMacro; > > + private WikiMacro wikiMacro; > > > > /** > > * The {@link ComponentManager} component. > > */ > > - @Requirement > > private ComponentManager componentManager; > > - > > + > > /** > > - * The {@link Execution} component. > > + * Creates a new mock wiki macro encapsulating the given wiki > > macro instance. > > + * > > + * @param wikiMacro encapsulated wiki macro instance. > > + * @param componentManager component manager. > > */ > > - @Requirement > > - private Execution execution; > > - > > - /** > > - * {@inheritDoc} > > - */ > > - public void initialize() throws InitializationException > > + public MockWikiMacro(WikiMacro wikiMacro, ComponentManager > > componentManager) > > { > > - // Require two parameters, one mandatory and one optional. > > - WikiMacroParameterDescriptor param1 = new > > WikiMacroParameterDescriptor("param1", "This is param1", true); > > - WikiMacroParameterDescriptor param2 = new > > WikiMacroParameterDescriptor("param2", "This is param2", true); > > - List<WikiMacroParameterDescriptor> params = new > > ArrayList<WikiMacroParameterDescriptor>(); > > - params.add(param1); > > - params.add(param2); > > - > > - // Initialize the internal WikiMacro instance. > > - WikiMacroDescriptor descriptor = new > > WikiMacroDescriptor("Test Wiki Macro", "Description", "Test", > > - new DefaultContentDescriptor(false), params); > > - this.wikiMacro = new > > DefaultWikiMacro("xwiki:Main.TestWikiMacro", "testwikimacro", true, > > descriptor, > > - "This is **testwikimacro**", "xwiki/2.0", > > componentManager); > > - > > - // Set a dummy XWikiContext. > > - execution.getContext().setProperty("xwikicontext", new > > HashMap<String, Object>()); > > + this.wikiMacro = wikiMacro; > > + this.componentManager = componentManager; > > } > > > > /** > > @@ -94,10 +70,26 @@ > > public List<Block> execute(WikiMacroParameters parameters, > > String content, MacroTransformationContext context) > > throws MacroExecutionException > > { > > + // Use a dummy XWikiContext. > > + try { > > + Execution execution = > > componentManager.lookup(Execution.class); > > + execution.getContext().setProperty("xwikicontext", new > > HashMap<String, Object>()); > > + } catch (ComponentLookupException ex) { > > + throw new MacroExecutionException(ex.getMessage(), ex); > > + } > > + > > return this.wikiMacro.execute(parameters, content, context); > > } > > > > /** > > + * {@inheritDoc} > > + */ > > + public String getId() > > + { > > + return this.wikiMacro.getId(); > > + } > > + > > + /** > > * {@inheritDoc} > > */ > > public MacroDescriptor getDescriptor() > > > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -1 +0,0 @@ > > -org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro > > \ No newline at end of file > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -1,20 +1,20 @@ > > .#----------------------------------------------------- > > .input|xwiki/2.0 > > .#----------------------------------------------------- > > -{{testwikimacro param1="val1" param2="val2"/}} > > +{{mockwikimacro1 param1="val1" param2="val2"/}} > > .#----------------------------------------------------- > > .expect|event/1.0 > > .#----------------------------------------------------- > > beginDocument > > -beginMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > > +beginMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > > beginParagraph > > onWord [This] > > onSpace > > onWord [is] > > onSpace > > beginFormat [BOLD] > > -onWord [testwikimacro] > > +onWord [mockwikimacro1] > > endFormat [BOLD] > > endParagraph > > -endMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > > +endMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > > endDocument > > \ No newline at end of file > > > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/ > > wikimacro2.test (rev 0) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -0,0 +1,8 @@ > > +.#----------------------------------------------------- > > +.input|xwiki/2.0 > > +.#----------------------------------------------------- > > +Hello! {{mockwikimacro2/}} > > +.#----------------------------------------------------- > > +.expect|xhtml/1.0 > > +.#----------------------------------------------------- > > +Hello! This is mockwikimacro1 > > \ No newline at end of file > > > > _______________________________________________ > > notifications mailing list > > notifications(a)xwiki.org > > http://lists.xwiki.org/mailman/listinfo/notifications > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs >

1 0

Re: [xwiki-devs] [xwiki-notifications] r24669 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/test: java/org/xwiki/rendering java/org/xwiki/rendering/internal/macro/wikibridge resources resources/META-INF
by Vincent Massol 23 Oct '09

23 Oct '09

Asiri, Can you document the test case (wikimaro2.test) and add comments to explain what the test tests? (it's not obvious IMO). Also you might want to consider writing a unit test proper instead of using the rendering test fwk maybe since I'm not sure what it brings here (but I haven't really checked enough so I may be wrong). -Vincent On Oct 23, 2009, at 1:11 PM, asiri (SVN) wrote: > Author: asiri > Date: 2009-10-23 13:11:30 +0200 (Fri, 23 Oct 2009) > New Revision: 24669 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > Removed: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/components.txt > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > Log: > XWIKI-4520: Not possible to generate inline content from wiki macros > when the macro body starts with another macro. > > * Added a test case to exploit the issue. > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-10-23 11:11:30 UTC (rev 24669) > @@ -20,6 +20,9 @@ > > package org.xwiki.rendering; > > +import java.util.ArrayList; > +import java.util.List; > + > import junit.framework.Test; > import junit.framework.TestCase; > > @@ -28,6 +31,13 @@ > import org.xwiki.bridge.DocumentAccessBridge; > import org.xwiki.component.descriptor.DefaultComponentDescriptor; > import org.xwiki.component.embed.EmbeddableComponentManager; > +import > org.xwiki.rendering.internal.macro.wikibridge.DefaultWikiMacro; > +import org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro; > +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroManager; > +import > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > import org.xwiki.rendering.scaffolding.RenderingTestSuite; > import org.xwiki.test.ComponentManagerTestSetup; > > @@ -50,6 +60,7 @@ > RenderingTestSuite suite = new RenderingTestSuite("Test Wiki > Macro Bridge"); > > suite.addTestsFromResource("wikimacro1", true); > + suite.addTestsFromResource("wikimacro2", true); > > ComponentManagerTestSetup testSetup = new > ComponentManagerTestSetup(suite); > setUpMocks(testSetup.getComponentManager()); > @@ -67,9 +78,35 @@ > new DefaultComponentDescriptor<DocumentAccessBridge>(); > descriptorDAB.setRole(DocumentAccessBridge.class); > componentManager.registerComponent(descriptorDAB, > mockDocumentAccessBridge); > + > + // Register mock wiki macros. > + WikiMacroManager wikiMacroManager = > componentManager.lookup(WikiMacroManager.class); > + > + // Mock wiki macro - 1. > + WikiMacroParameterDescriptor param1 = new > WikiMacroParameterDescriptor("param1", "This is param1", true); > + WikiMacroParameterDescriptor param2 = new > WikiMacroParameterDescriptor("param2", "This is param2", true); > + List<WikiMacroParameterDescriptor> params = new > ArrayList<WikiMacroParameterDescriptor>(); > + params.add(param1); > + params.add(param2); > + WikiMacroDescriptor descriptor = new > WikiMacroDescriptor("Mock Wiki Macro - 1", "Description", "Test", > + new DefaultContentDescriptor(false), params); > + WikiMacro wikiMacro = new MockWikiMacro(new > DefaultWikiMacro("xwiki:Main.MockWikiMacro1", "mockwikimacro1", > + true, descriptor, "This is **mockwikimacro1**", "xwiki/ > 2.0", componentManager), componentManager); > + > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro1", > wikiMacro); > + > + // Mock wiki macro - 2. > + params = new ArrayList<WikiMacroParameterDescriptor>(); > + descriptor = new WikiMacroDescriptor("Mock Wiki Macro - 2", > "Description", "Test", > + new DefaultContentDescriptor(false), params); > + wikiMacro = new MockWikiMacro(new > DefaultWikiMacro("xwiki:Main.MockWikiMacro2", "mockwikimacro2", > + true, descriptor, "{{mockwikimacro1 param1=\"p1\" > param2=\"p2\"/}}", "xwiki/2.0", componentManager), > + componentManager); > + > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro2", > wikiMacro); > + > > context.checking(new Expectations() {{ > - > oneOf > (mockDocumentAccessBridge).getDocument("xwiki:Main.TestWikiMacro"); > will(returnValue(null)); > + > allowing > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro1"); > will(returnValue(null)); > + > allowing > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro2"); > will(returnValue(null)); > }}); > } > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 10:23:04 UTC > (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 11:11:30 UTC > (rev 24669) > @@ -20,72 +20,48 @@ > > package org.xwiki.rendering.internal.macro.wikibridge; > > -import java.util.ArrayList; > import java.util.HashMap; > import java.util.List; > > -import org.xwiki.component.annotation.Component; > -import org.xwiki.component.annotation.Requirement; > +import org.xwiki.component.manager.ComponentLookupException; > import org.xwiki.component.manager.ComponentManager; > -import org.xwiki.component.phase.Initializable; > -import org.xwiki.component.phase.InitializationException; > import org.xwiki.context.Execution; > import org.xwiki.rendering.block.Block; > import org.xwiki.rendering.macro.Macro; > import org.xwiki.rendering.macro.MacroExecutionException; > -import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > import org.xwiki.rendering.macro.descriptor.MacroDescriptor; > -import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > -import > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > import org.xwiki.rendering.macro.wikibridge.WikiMacroParameters; > import org.xwiki.rendering.transformation.MacroTransformationContext; > > /** > - * A wrapper macro used for testing a {@link DefaultWikiMacro} > instance. > + * A wrapper macro used for testing wiki macros. > * > * @version $Id$ > * @since 2.0M2 > */ > -@Component("testwikimacro") > -public class MockWikiMacro implements Macro<WikiMacroParameters>, > Initializable > +public class MockWikiMacro implements WikiMacro > { > /** > - * The internal {@link DefaultWikiMacro} instance. > + * The internal wiki macro instance. > */ > - private DefaultWikiMacro wikiMacro; > + private WikiMacro wikiMacro; > > /** > * The {@link ComponentManager} component. > */ > - @Requirement > private ComponentManager componentManager; > - > + > /** > - * The {@link Execution} component. > + * Creates a new mock wiki macro encapsulating the given wiki > macro instance. > + * > + * @param wikiMacro encapsulated wiki macro instance. > + * @param componentManager component manager. > */ > - @Requirement > - private Execution execution; > - > - /** > - * {@inheritDoc} > - */ > - public void initialize() throws InitializationException > + public MockWikiMacro(WikiMacro wikiMacro, ComponentManager > componentManager) > { > - // Require two parameters, one mandatory and one optional. > - WikiMacroParameterDescriptor param1 = new > WikiMacroParameterDescriptor("param1", "This is param1", true); > - WikiMacroParameterDescriptor param2 = new > WikiMacroParameterDescriptor("param2", "This is param2", true); > - List<WikiMacroParameterDescriptor> params = new > ArrayList<WikiMacroParameterDescriptor>(); > - params.add(param1); > - params.add(param2); > - > - // Initialize the internal WikiMacro instance. > - WikiMacroDescriptor descriptor = new > WikiMacroDescriptor("Test Wiki Macro", "Description", "Test", > - new DefaultContentDescriptor(false), params); > - this.wikiMacro = new > DefaultWikiMacro("xwiki:Main.TestWikiMacro", "testwikimacro", true, > descriptor, > - "This is **testwikimacro**", "xwiki/2.0", > componentManager); > - > - // Set a dummy XWikiContext. > - execution.getContext().setProperty("xwikicontext", new > HashMap<String, Object>()); > + this.wikiMacro = wikiMacro; > + this.componentManager = componentManager; > } > > /** > @@ -94,10 +70,26 @@ > public List<Block> execute(WikiMacroParameters parameters, > String content, MacroTransformationContext context) > throws MacroExecutionException > { > + // Use a dummy XWikiContext. > + try { > + Execution execution = > componentManager.lookup(Execution.class); > + execution.getContext().setProperty("xwikicontext", new > HashMap<String, Object>()); > + } catch (ComponentLookupException ex) { > + throw new MacroExecutionException(ex.getMessage(), ex); > + } > + > return this.wikiMacro.execute(parameters, content, context); > } > > /** > + * {@inheritDoc} > + */ > + public String getId() > + { > + return this.wikiMacro.getId(); > + } > + > + /** > * {@inheritDoc} > */ > public MacroDescriptor getDescriptor() > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt 2009-10-23 11:11:30 UTC (rev 24669) > @@ -1 +0,0 @@ > -org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro > \ No newline at end of file > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro1.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > 2009-10-23 11:11:30 UTC (rev 24669) > @@ -1,20 +1,20 @@ > .#----------------------------------------------------- > .input|xwiki/2.0 > .#----------------------------------------------------- > -{{testwikimacro param1="val1" param2="val2"/}} > +{{mockwikimacro1 param1="val1" param2="val2"/}} > .#----------------------------------------------------- > .expect|event/1.0 > .#----------------------------------------------------- > beginDocument > -beginMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > +beginMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > beginParagraph > onWord [This] > onSpace > onWord [is] > onSpace > beginFormat [BOLD] > -onWord [testwikimacro] > +onWord [mockwikimacro1] > endFormat [BOLD] > endParagraph > -endMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > +endMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > endDocument > \ No newline at end of file > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro2.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/ > wikimacro2.test (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > 2009-10-23 11:11:30 UTC (rev 24669) > @@ -0,0 +1,8 @@ > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.#----------------------------------------------------- > +Hello! {{mockwikimacro2/}} > +.#----------------------------------------------------- > +.expect|xhtml/1.0 > +.#----------------------------------------------------- > +Hello! This is mockwikimacro1 > \ No newline at end of file > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

1 0

[xwiki-devs] [Discussion] Annotations improvements -- allowing different annotation types
by Anca Luca 23 Oct '09

23 Oct '09

Hi devs, Following the previous mail with the desired improvements for the annotation feature, I would like to discuss some options for implementing the first of the enhancements, namely the ability to configure easily the type of added annotation. (see http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HFeaturesimpro… for details). Two alternatives for this would be: A) to preserve the current architecture of the annotations plugin and only add a map of "extra fields" to the annotation type. The type of the annotation would be known by the js client through the configuration of an XWiki class and the js client would create a "generic" form for any such type. See more details about this solution at http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HSolution1extr… . Pros: preserves the current annotations architecture, creates an easy way to plug an annotation storage service Cons: the Annotation class would be nothing else but a "BaseCollection" the same as a generic XWiki object, and we would be reimplementing view, save, edit, delete of this type (already implemented through the xwiki action) from the web forms level (editing and displaying an annotation), through the controller (REST this time instead of actions in the standard wiki servlet), to the storage level (XWikiIOService will only transform a map (the Annotation class) to another map (the XWikiObject in the xwiki document)). B) to make an XWiki object model based implementation where the js client, to create the UI, would just asynchronously fetch standard actions in XWiki (edit, view, save). In this case, where all is handled exclusively through the XWiki model, Scribo would be plugged as an external service performing periodic updates between the XWiki instance and its RDF store. See more details about this solution at: http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HSolution2XWik… Pros: uses the xwiki object model 100%, there's no reimplementing of the whole process of saving, editing objects, etc, the forms and views are light customizations of standard XWiki mechanisms Cons: the annotation mapping to document source cannot be implemented straightforward (there are changes needed in the architecture and algorithm), Scribo (or any other storage model different from XWiki) would need to duplicate data, and it would not be 100% real time (since it would be a periodical synchronizer) The current implementation is illustrated in the http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HCurrentImplem… section. I like the elegance of the first solution more, for the way a different storage can be easily plugged, but I don't like that we're reimplementing a lot of XWiki objects manipulation (which is why 2 would be a better solution). WDYT? Thanks, Anca

2 2

Re: [xwiki-devs] GWT tree Interact with WYSIWYG editor
by Leon Wang 23 Oct '09

23 Oct '09

Hi Marius, I tried the the first way, "i) access the editor in Java (GWT) code by writing a simple native getter", the dependency is killing me. I can not compile it use eclipse the dependency is the way too complicated. I tried use maven to build it, but I tried for a whole afternoon and I really don't know how to write the correct pom to compile them together. Could you please extend the native JavaScript API so that I can write something like: native void setBackgroudColor(String color) /*-{ editorJSReference.execute('backcolor', color); }-*/; Could you please also tell me what you did to extend the native JavaScript API, so I can learn about how to save the location of highlighted sentence to help software maintainer easily trace back to the high lighted document. If you want I can collect your reply and write document for you for this one too. Here is another problem, please see the screenshot: http://picasaweb.google.com/freeleons/Xwiki#5394862411574232850 in the WYSIWYG edit mode, the customized sidebar are disappeared, which means that I can not use the GWT tree to interact with the WYSIWYG editor. Is there anyway to keep the customized toolbar? I have finished the document writeup here is the url: http://dev.xwiki.org/xwiki/bin/view/Drafts/LoadingGWTApplicationsInXWik You are literally saving my life. Thank you so much!

2 1

[xwiki-devs] Prototype SocialCalc integration
by Ludovic Dubost 23 Oct '09

23 Oct '09

I've done a nice experiment with SocialCalc and I'm pretty happy of the results: It allows to edit a spreadsheet stored in a Wiki Page. It lacks a server-side transformation of the spreadsheet to a Wiki table for rendering, printing and pdfs, but it's already interesting. http://incubator.myxwiki.org/xwiki/bin/view/Test/Calc Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

7 7

[xwiki-devs] [myxwiki] XWiki Enterprise 2.0.2 Upgrade
by Jean-Vincent Drean 23 Oct '09

23 Oct '09

Hello, myxwiki.org has been upgraded to XE 2.0.2, if you own a wiki hosted there you should have a look at : http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise202 We also strongly recommend an upgrade to the latest wiki version. To upgrade you must download XE 2.0.2 XWiki XAR from : http://www.xwiki.org/xwiki/bin/view/Main/Download And follow the upgrade guide available at : http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation#HUpgrading… To be notified of the myxwiki.org server upgrades you can follow myxwiki on twitter: http://twitter.com/myxwiki Thanks, JV.

1 0

[xwiki-devs] [ANN] XWiki Enterprise 2.0.2 and XWiki Enterprise Manager 2.0.2 Released
by Thomas Mortagne 22 Oct '09

22 Oct '09

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0.2 and XWiki Enterprise Manager 2.0.2. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This release fix two important regressions (office import doesn't work in multiwiki mode and a table followed by a block with params fail to render) and add many Watchlist improvements and bufixes. For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise202 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM202. Thanks -The XWiki dev team

1 0

Re: [xwiki-devs] [xwiki-notifications] r12079 - in platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/rendering: macro transformation
by Vincent Massol 22 Oct '09

22 Oct '09

Hi Sergiu, Are you sure about this below? What's your use case? I find it strange to order by class name for an execution order. Thanks -Vincent On Aug 27, 2008, at 1:59 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-08-27 01:59:21 +0200 (Wed, 27 Aug 2008) > New Revision: 12079 > > Modified: > platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java > platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java > Log: > XWIKI-2568: Continue implementing the new Rendering Architecture > Improve the macro and transformation comparer so that component > implementations with the same priority are ordered by the classname. > > > Modified: platform/core/trunk/xwiki-rendering/src/main/java/org/ > xwiki/rendering/macro/AbstractMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java 2008-08-26 23:57:19 UTC (rev 12078) > +++ platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java 2008-08-26 23:59:21 UTC (rev 12079) > @@ -78,6 +78,9 @@ > */ > public int compareTo(Macro< ? > macro) > { > - return getPriority() - macro.getPriority(); > + if (getPriority() != macro.getPriority()) { > + return getPriority() - macro.getPriority(); > + } > + return > this > .getClass > ().getSimpleName().compareTo(macro.getClass().getSimpleName()); > } > } > > Modified: platform/core/trunk/xwiki-rendering/src/main/java/org/ > xwiki/rendering/transformation/AbstractTransformation.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java 2008-08-26 > 23:57:19 UTC (rev 12078) > +++ platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java 2008-08-26 > 23:59:21 UTC (rev 12079) > @@ -52,6 +52,9 @@ > */ > public int compareTo(Transformation transformation) > { > - return getPriority() - transformation.getPriority(); > + if (getPriority() != transformation.getPriority()) { > + return getPriority() - transformation.getPriority(); > + } > + return > this > .getClass > ().getSimpleName > ().compareTo(transformation.getClass().getSimpleName()); > } > }

2 4

[xwiki-devs] Problems with producing inline content from wiki macros
by Asiri Rathnayake 22 Oct '09

22 Oct '09

Hello Devs, As I understand, If a wiki macro supports inline mode and is executed as an inline macro, it must be true that the output generated by the macro does not contain block elements (otherwise the result will not be inline). From the wiki macro bridge code we have the following check: <code> List<Block> result = xdom.getChildren(); // If in inline mode remove any top level paragraph. if (context.isInline()) { this.parserUtils.removeTopLevelParagraph(result); } </code> This only removes the top-level paragraph block. It's possible that inside the content there are more block level elements, I think this is where we need the inline parser. Another problem i discovered is if i have a wiki macro with macro code: <code> {{velocity}} ..... {{/velocity}} </code> This makes the {{velocity}} macro behave in a non-inline fashion regardless of the wiki macro's intentions. Further more, the paragraph block generated by the {{velocity}} macro is not stripped by the check I mentioned above. This is because the paragraph block resides inside a MacroMarkerBlock (so it is not a top-level paragraph). A workaround I found for this problem is to have something like: <code> {{html}}{{/html}}{{velocity}} ..... {{/velocity}} </code> This is only a hack to force the {{velocity}} macro ro behave in an inline fashion. Now I'm wondering if we should wait for the inline parser to be available to fix this or do some custom hacking to get rid of the block elements generated while executing in inline mode. wdyt? Thanks. - Asiri

3 2

[xwiki-devs] XWiki on Nemo(Sonar)
by Vincent Massol 22 Oct '09

22 Oct '09

Hi, The XWiki project is now fully set up on Nemo here: http://nemo.sonarsource.org/components/index/XWIKI Comments: * Since our junit test no longer fail with memory issue they've added back test coverage stats. Link to platform: http://nemo.sonarsource.org/project/index/178319 * They've just added the "Commented LOC" stat feature which shows the number of lines of commented code. We shouldn't have any commented out code so we'll need to gradually reduce this too. * The test coverage don't count integration and functional tests, i.e. if a unit tests tests code from another module the coverage is not taken into account. Thus all our rendering tests in xwiki-rendering- tests are not taken into account (they cover 90% of the rendering api code...). * Since they've added the unit tests the tech debt has gone down a lot. I'll ask them why. Thanks -Vincent

3 4