fix for different results message

[mono.git] / mcs / class / System.XML / Test / System.Xml.Xsl / standalone_tests / xslttest.cs

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs
index 34d5d282e7b8bb09fa03ccec95f125342300766a..33279178008fa10ce8b50d0ae261771e23b5efd5 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs
@@ -102,17 +102,28 @@ namespace MonoTests.oasis_xslt {
                        Categories = arr;
                }
 
+               static string EscapeString (string res)
+               {
+                       MemoryStream s = new MemoryStream ();
+                       XmlTextWriter w = new XmlTextWriter (s, System.Text.Encoding.ASCII);
+                       w.WriteString (res);
+                       w.Close ();     
+                       
+                       StringBuilder sb = new StringBuilder (res.Length);
+                       byte [] arr = s.ToArray ();
+                       foreach (byte b in arr)
+                               sb.Append (Convert.ToChar (b));
+
+                       return sb.ToString ();
+               }
+
                string CompareResult (string actual, string expected)
                {
                        //TODO: add xml comparison
                        if (actual == expected)
                                return null;
-                       else
-#if !FAILURE_DETAILED_MESSAGE
-                               return "Different.";
-#else
-                               return "Different.\nActual*****\n"+actual+"\nReference*****\n"+expected;
-#endif
+                       string res = "Different.\nActual*****\n"+actual+"\nReference*****\n"+expected;
+                       return EscapeString (res);
                }
 
                string CompareException (Exception actual, string testid)