[xwiki-notifications] r10971 - xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/transformation

[vmassol (SVN)]

Author: vmassol
Date: 2008-07-01 12:21:30 +0200 (Tue, 01 Jul 2008)
New Revision: 10971

Modified:
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/transformation/MacroTransformationTest.java
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/transformation/MacroTransformationTest.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/transformation/MacroTransformationTest.java	2008-07-01 10:20:11 UTC (rev 10970)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/transformation/MacroTransformationTest.java	2008-07-01 10:21:30 UTC (rev 10971)
@@ -48,11 +48,13 @@
      */
     public void testSimpleMacroTransform() throws Exception
     {
-        String expected = "beginMacroMarker: [testsimplemacro] [] [null]\n"
+        String expected = "beginDocument\n"
+        	+ "beginMacroMarker: [testsimplemacro] [] [null]\n"
             + "beginParagraph\n"
             + "onWord: [simplemacro0]\n"
             + "endParagraph\n"
-            + "endMacroMarker: [testsimplemacro] [] [null]\n";
+            + "endMacroMarker: [testsimplemacro] [] [null]\n"
+            + "endDocument\n";
 
         XDOM dom = new XDOM(Arrays.asList((Block) new MacroBlock("testsimplemacro",
             Collections.<String, String>emptyMap())));
@@ -69,11 +71,13 @@
      */
     public void testNestedMacroTransform() throws Exception
     {
-        String expected = "beginMacroMarker: [testnestedmacro] [] [null]\n"
+        String expected = "beginDocument\n"
+        	+ "beginMacroMarker: [testnestedmacro] [] [null]\n"
             + "beginParagraph\n"
             + "onWord: [simplemacro0]\n"
             + "endParagraph\n"
-            + "endMacroMarker: [testnestedmacro] [] [null]\n";
+            + "endMacroMarker: [testnestedmacro] [] [null]\n"
+            + "endDocument\n";
 
         XDOM dom = new XDOM(Arrays.asList((Block) new MacroBlock("testnestedmacro",
             Collections.<String, String>emptyMap())));
@@ -90,9 +94,11 @@
      */
     public void testInfiniteRecursionMacroTransform() throws Exception
     {
-        String expected = "beginMacroMarker: [testrecursivemacro] [] [null]\n"
+        String expected = "beginDocument\n"
+        	+ "beginMacroMarker: [testrecursivemacro] [] [null]\n"
             + "onMacro: [testrecursivemacro] [] [null]\n"
-            + "endMacroMarker: [testrecursivemacro] [] [null]\n";
+            + "endMacroMarker: [testrecursivemacro] [] [null]\n"
+            + "endDocument\n";
         
         XDOM dom = new XDOM(Arrays.asList((Block) new MacroBlock("testrecursivemacro",
             Collections.<String, String>emptyMap())));
@@ -109,7 +115,8 @@
      */
     public void testPrioritiesMacroTransform() throws Exception
     {
-        String expected = "beginMacroMarker: [testsimplemacro] [] [null]\n"
+        String expected = "beginDocument\n"
+        	+ "beginMacroMarker: [testsimplemacro] [] [null]\n"
             + "beginParagraph\n"
             + "onWord: [simplemacro1]\n"
             + "endParagraph\n"
@@ -118,7 +125,8 @@
             + "beginParagraph\n"
             + "onWord: [word]\n"
             + "endParagraph\n"
-            + "endMacroMarker: [testprioritymacro] [] [null]\n";
+            + "endMacroMarker: [testprioritymacro] [] [null]\n"
+            + "endDocument\n";
 
         XDOM dom = new XDOM(Arrays.asList(
             (Block) new MacroBlock("testsimplemacro", Collections.<String, String>emptyMap()),