Changeset 3293

Timestamp:

04/09/10 11:14:37 (14 years ago)

Author:

epitzer

Message:

Replace XML reader to ensure proper parsing of line endings especially inside CDATA blocks (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/Xml/XmlParser.cs (modified) (2 diffs)
• Tests/UseCases.cs (modified) (1 diff)

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

@@ -18 +18 @@
   public class XmlParser : IEnumerable<ISerializationToken> {
 
-    private readonly XmlReader reader;
+    private readonly XmlTextReader reader;
     private delegate IEnumerator<ISerializationToken> Handler();
     private readonly Dictionary<string, Handler> handlers;
@@ -27 +27 @@
     /// <param name="input">The input.</param>
     public XmlParser(TextReader input) {
-      XmlReaderSettings settings = new XmlReaderSettings {
-        ConformanceLevel = ConformanceLevel.Document,
-        IgnoreWhitespace = true,
-        IgnoreComments = true
-      };
-      reader = XmlReader.Create(input, settings);
+      reader = new XmlTextReader(input);
+      reader.WhitespaceHandling = WhitespaceHandling.All;
+      reader.Normalization = false;
       handlers = new Dictionary<string, Handler> {
                      {XmlStringConstants.PRIMITIVE, ParsePrimitive},

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1007 +1007 @@
     }
 
+    [TestMethod]
+    public void TestLineEndings() {
+      List<string> lineBreaks = new List<string> { "\r\n", "\n", "\r", "\n\r", Environment.NewLine };
+      List<string> lines = new List<string>();
+      foreach (var br in lineBreaks)
+        lines.Add("line1" + br + "line2");
+      XmlGenerator.Serialize(lines, tempFile);
+      List<string> newLines = XmlParser.Deserialize<List<string>>(tempFile);
+      Assert.AreEqual(lines.Count, newLines.Count);
+      for (int i = 0; i < lineBreaks.Count; i++) {
+        Assert.AreEqual(lines[i], newLines[i]);
+      }
+    }