Context Navigation

Changeset 1615

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

Files:

-                      r1556
+                      r1615
 using HeuristicLab.Persistence.Interfaces;
+using System.Reflection;
+using System.Text;
 namespace HeuristicLab.Persistence.Core.Tokens {
 …
       Name = name;
+    }
+    public override string ToString() {
+      StringBuilder sb = new StringBuilder();
+      sb.Append(this.GetType().Name).Append('(');
+      foreach (FieldInfo fi in this.GetType().GetFields()) {
+        sb.Append(fi.Name).Append('=').Append(fi.GetValue(this)).Append(", ");
+      }
+      sb.Append(')');
+      return sb.ToString();
+    }
+  }

-                      r1570
+                      r1615
 using HeuristicLab.Persistence.Interfaces;
 using System.Text;
+using System.Text.RegularExpressions;
 …
   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[");
 …
+    }
+    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();

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

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

Note: See TracChangeset for help on using the changeset viewer.