Changeset 1615 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

04/21/09 15:27:35 (16 years ago)

Author:

epitzer

Message:

Improve debugability to investigate failing tests. (#593)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml

Files:

• Primitive/String2XmlFormatter.cs (modified) (3 diffs)
• XmlGenerator.cs (modified) (2 diffs)
• XmlString.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlFormatter.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Text;
+using System.Text.RegularExpressions;
 
 
@@ -10 +11 @@
   public class String2XmlFormatter : FormatterBase<string, XmlString> {
 
-    public override XmlString Format(string s) {      
+    public override XmlString Format(string s) {
       StringBuilder sb = new StringBuilder();
       sb.Append("<![CDATA[");
@@ -18 +19 @@
     }
 
-    private static readonly string[] separators = new string[] { "<![CDATA[", "]]>" };
-
-    public override string Parse(XmlString x) {      
+    public override string Parse(XmlString x) {
       StringBuilder sb = new StringBuilder();
-      foreach (string s in x.Data.Split(separators,
-        StringSplitOptions.RemoveEmptyEntries)) {
-        sb.Append(s);
+      Regex re = new Regex(@"<!\[CDATA\[((?:[^]]|\](?!\]>))*)\]\]>", RegexOptions.Singleline);
+      foreach (Match m in re.Matches(x.Data)) {
+        sb.Append(m.Groups[1]);
       }
       return sb.ToString();

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -10 +10 @@
 using HeuristicLab.Persistence.Core.Tokens;
 
-namespace HeuristicLab.Persistence.Default.Xml {  
+namespace HeuristicLab.Persistence.Default.Xml {
 
   public class XmlGenerator : GeneratorBase<string> {
@@ -177 +177 @@
       writer = new StreamWriter(zipStream);
       foreach (string line in generator.Format(serializer.TypeCache)) {
-        writer.WriteLine(line);
+        writer.Write(line);
         logger.Debug(line.TrimEnd());
       }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

@@ -1 +1 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core;
+using System.Text;
 
 namespace HeuristicLab.Persistence.Default.Xml {
@@ -12 +13 @@
       Data = data;
     }
+
+    public override string ToString() {
+      StringBuilder sb = new StringBuilder();
+      sb.Append("XmlString(").Append(Data).Append(')');
+      return sb.ToString();
+    }
   }
 }