--- a/reports/Builder__TestReportFormat.st	Tue Jan 31 19:21:31 2012 +0100
+++ b/reports/Builder__TestReportFormat.st	Fri Feb 03 14:21:05 2012 +0100
@@ -100,16 +100,15 @@
     [
     context printOn: s.
     s cr.
-"
-    s nextPutAll:'receiver: '. self print: context receiver on: s. s cr.
-    s nextPutAll:'selector: '. self print:context selector on: s. s cr.
+    s nextPutAll:'receiver: '. context receiver printOn: s. s cr.
+    s nextPutAll:'selector: '. context selector printOn: s. s cr.
     s nextPutAll:'args: '; cr.
     context args keysAndValuesDo:[:idx :eachArg |
-        s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '. self  print: eachArg on: s.s cr.
+        s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '. eachArg printOn: s.s cr.
     ].
     s nextPutAll:'vars: '; cr.
     context vars keysAndValuesDo:[:idx :eachVar |
-        s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '. self print: eachVar on: s.s cr.
+        s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '. eachVar printOn: s.s cr.
     ].
     s nextPutAll:'source: '; cr.    
 
@@ -143,14 +142,12 @@
         s nextPutAll: line; cr.
     ].
     s cr.
-"
     ] on: Error do:[:ex|
         s   cr;
             nextPutAll:'!!!!!!ERROR WHEN GETTING STACK TRACE!!!!!!'; cr;
             nextPutAll: ex description; cr
     ]
 
-    "Modified: / 01-04-2011 / 12:00:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 03-08-2011 / 14:53:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
@@ -164,6 +161,7 @@
         or:[ (context receiver == aTestCase and:[ context selector == #runCase ])
             or: [ context receiver == self and:[ context selector == #setUp ] ] ] ] whileFalse:
                 [ self writeContext: context on: str.
+                str cr; cr.
                 context := context sender ]
 
     "Created: / 03-08-2011 / 14:53:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -271,9 +269,9 @@
             nextPutAll:(self encode:type);
             nextPutAll:'" message="';
             nextPutAll:(self encode: message);
-            nextPutAll:'">';
-            nextPutAll:(self encode:stacktrace ? 'stacktrace not available');
-            nextPutAll:'</'; nextPutAll: outcome; nextPutAll:'>';
+            nextPutAll:'"><!![CDATA['; cr;
+            nextPutAll:(stacktrace ? 'stacktrace not available');
+            nextPutAll:']]></'; nextPutAll: outcome; nextPutAll:'>';
             nextPut:Character lf
     ].
     stream tab;