[xwiki-notifications] r10970 - in xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test: java/org/xwiki/rendering/macro resources
vmassol (SVN)
notifications at xwiki.org
Tue Jul 1 12:20:11 CEST 2008
Author: vmassol
Date: 2008-07-01 12:20:11 +0200 (Tue, 01 Jul 2008)
New Revision: 10970
Modified:
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/IncludeMacroTest.java
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/VelocityMacroTest.java
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/XHTMLMacroTest.java
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/html-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/links-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/list-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macro-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/paragraph-TestEventsListener.expected
xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/section-TestEventsListener.expected
Log:
XWIKI-2508: Firm up the new rendering module implementation
* Fix errors introduced in previous commit
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/IncludeMacroTest.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/IncludeMacroTest.java 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/IncludeMacroTest.java 2008-07-01 10:20:11 UTC (rev 10970)
@@ -42,7 +42,9 @@
{
public void testIncludeMacroWithCurrentContext() throws Exception
{
- String expected = "onMacro: [someMacro] [] []\n";
+ String expected = "beginDocument\n"
+ + "onMacro: [someMacro] [] []\n"
+ + "endDocument\n";
IncludeMacro macro = (IncludeMacro) getComponentManager().lookup(VelocityMacro.ROLE, "include/xwiki");
Mock mockDocumentManager = mock(DocumentManager.class);
@@ -60,12 +62,14 @@
public void testIncludeMacroWithNewContext() throws Exception
{
- String expected = "beginMacroMarker: [velocity] [] [$myvar]\n"
+ String expected = "beginDocument\n"
+ + "beginMacroMarker: [velocity] [] [$myvar]\n"
+ "beginParagraph\n"
+ "onSpecialSymbol: [$]\n"
+ "onWord: [myvar]\n"
+ "endParagraph\n"
- + "endMacroMarker: [velocity] [] [$myvar]\n";
+ + "endMacroMarker: [velocity] [] [$myvar]\n"
+ + "endDocument\n";
// 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.
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/VelocityMacroTest.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/VelocityMacroTest.java 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/VelocityMacroTest.java 2008-07-01 10:20:11 UTC (rev 10970)
@@ -41,14 +41,16 @@
+ "* $item\n"
+ "#end";
- String expected = "beginList: [BULLETED]\n" +
- "beginListItem\n" +
- "onWord: [one]\n" +
- "endListItem\n" +
- "beginListItem\n" +
- "onWord: [two]\n" +
- "endListItem\n" +
- "endList: [BULLETED]\n";
+ String expected = "beginDocument\n"
+ + "beginList: [BULLETED]\n"
+ + "beginListItem\n"
+ + "onWord: [one]\n"
+ + "endListItem\n"
+ + "beginListItem\n"
+ + "onWord: [two]\n"
+ + "endListItem\n"
+ + "endList: [BULLETED]\n"
+ + "endDocument\n";
Macro macro = (Macro) getComponentManager().lookup(VelocityMacro.ROLE, "velocity/xwiki");
List<Block> blocks = macro.execute(Collections.EMPTY_MAP, content,
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/XHTMLMacroTest.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/XHTMLMacroTest.java 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/macro/XHTMLMacroTest.java 2008-07-01 10:20:11 UTC (rev 10970)
@@ -44,7 +44,8 @@
+ "</tr>\n"
+ "</table>";
- String expected = "beginXMLElement: [table] [border=1]\n"
+ String expected = "beginDocument\n"
+ + "beginXMLElement: [table] [border=1]\n"
+ "beginXMLElement: [tr] []\n"
+ "beginXMLElement: [td] []\n"
+ "beginList: [BULLETED]\n"
@@ -54,7 +55,8 @@
+ "endList: [BULLETED]\n"
+ "endXMLElement: [td] []\n"
+ "endXMLElement: [tr] []\n"
- + "endXMLElement: [table] [border=1]\n";
+ + "endXMLElement: [table] [border=1]\n"
+ + "endDocument\n";
Macro macro = (Macro) getComponentManager().lookup(XHTMLMacro.ROLE, "xhtml/xwiki");
List<Block> blocks = macro.execute(Collections.EMPTY_MAP, html,
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginParagraph
onEscape: [*]
onWord: [hello]
@@ -3,2 +4,3 @@
onEscape: [*]
endParagraph
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/html-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/html-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/html-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginParagraph
onWord: [This]
onSpace
@@ -21,3 +22,4 @@
onSpecialSymbol: [>]
onSpecialSymbol: [.]
endParagraph
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/links-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/links-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/links-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginParagraph
onLink: [Reference = [Space.ExistingPage]]
onLineBreak
@@ -11,3 +12,4 @@
onLineBreak
onLink: [Reference = [{macro}]]
endParagraph
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/list-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/list-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/list-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginList: [NUMBERED]
beginListItem
onWord: [Item]
@@ -65,3 +66,4 @@
onWord: [6]
endListItem
endList: [BULLETED]
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macro-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macro-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macro-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,5 @@
+beginDocument
onMacro: [macro] [param1=value1|param2=value2] [
content
]
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/paragraph-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/paragraph-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/paragraph-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginParagraph
onWord: [hello]
onSpace
@@ -9,3 +10,4 @@
onWord: [world]
endBold
endParagraph
+endDocument
Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/section-TestEventsListener.expected
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/section-TestEventsListener.expected 2008-07-01 10:13:45 UTC (rev 10969)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/section-TestEventsListener.expected 2008-07-01 10:20:11 UTC (rev 10970)
@@ -1,3 +1,4 @@
+beginDocument
beginSection: [1]
onWord: [Title]
onSpace
@@ -50,3 +51,4 @@
onSpace
onWord: [7]
endSection: [6]
+endDocument
More information about the notifications
mailing list