Space.Name
format, for example Main.WebHome.
*
* @return A String
representation of the document's full name.
+ * @deprecated use #getDocumentName instead
*/
String getFullName();
+ /**
+ * @return the full document's name, including Wiki, Space and Page
+ */
+ DocumentName getDocumentName();
+
/**
* Retrieve the name of the virtual wiki this document belongs to.
*
diff --git a/xwiki-core/pom.xml b/xwiki-core/pom.xml
index 06b006de273a..d31226bf6aa3 100644
--- a/xwiki-core/pom.xml
+++ b/xwiki-core/pom.xml
@@ -550,11 +550,6 @@
- This is bold
", printer.toString()); + } + + /** + * When a wiki macro is used in inline mode and its code starts with a macro, that nested macro is made inline. + * In other words, the nested macro should not generate extra paragraph elements. + */ + @org.junit.Test + public void testExecuteWhenInlineAndWithMacro() throws Exception + { + registerWikiMacro("wikimacro1", "This is **bold**"); + registerWikiMacro("wikimacro2", "{{wikimacro1 param1=\"v1\" param2=\"v2\"/}}"); + + Converter converter = getComponentManager().lookup(Converter.class); + + DefaultWikiPrinter printer = new DefaultWikiPrinter(); + // Note: We're putting the macro after the "Hello" text to force it as an inline macro. + converter.convert(new StringReader("Hello {{wikimacro2 param1=\"value1\" param2=\"value2\"/}}"), + Syntax.XWIKI_2_0, Syntax.XHTML_1_0, printer); + + // Note: We're using XHTML as the output syntax just to make it easy for asserting. + Assert.assertEquals("Hello This is bold
", printer.toString()); + } + + private void registerWikiMacro(String macroId, String macroContent) throws Exception + { + ListHello! This is mockwikimacro1
\ No newline at end of file diff --git a/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/scaffolding/MockDocumentAccessBridge.java b/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/scaffolding/MockDocumentAccessBridge.java index 6981c72701a4..da9398c9bb47 100644 --- a/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/scaffolding/MockDocumentAccessBridge.java +++ b/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/scaffolding/MockDocumentAccessBridge.java @@ -284,6 +284,16 @@ public boolean isDocumentEditable(String documentName) return true; } + /** + * {@inheritDoc} + * + * @see DocumentAccessBridge#isDocumentEditable(org.xwiki.bridge.DocumentName) + */ + public boolean isDocumentEditable(DocumentName documentName) + { + return true; + } + /** * {@inheritDoc} *