Unit test DocumentAssembler's xml:space handling

(now that UnicodeMapper.RunToString supports it
well enough to tell whether it's working or not!)

Author: Lowell Stewart

OpenXmlPowerTools.Tests/DocumentAssemblerTests.cs

@@ -171,18 +171,22 @@ public void DA259(string name, string data, bool err)
             Assert.Equal(4, brCount);
         }
 
-        [Theory]
-        [InlineData("DA240-ListPunctuation.docx", "DA-DataList.xml", false)]
-        public void DA240(string name, string data, bool err)
+        [Fact]
+        public void DA240()
         {
-            DA101(name, data, err);
+            string name = "DA240-Whitespace.docx";
+            DA101(name, "DA240-Whitespace.xml", false);
             var assembledDocx = new FileInfo(Path.Combine(TestUtil.TempDir.FullName, name.Replace(".docx", "-processed-by-DocumentAssembler.docx")));
             WmlDocument afterAssembling = new WmlDocument(assembledDocx.FullName);
 
-            // when elements are inserted that begin or end with white space (such as the list punctuation
-            // in this example), make sure white space is preserved
-            string firstParaText = afterAssembling.MainDocumentPart.Element(W.body).Elements(W.p).First().Value;
-            Assert.Equal("The children’s names are Greg, Marcia, Peter, Jan, Bobby and Cindy.", firstParaText);
+            // when elements are inserted that begin or end with white space, make sure white space is preserved
+            string firstParaTextIncorrect = afterAssembling.MainDocumentPart.Element(W.body).Elements(W.p).First().Value;
+            Assert.Equal("Content may or may not have spaces: he/she; he, she; he and she.", firstParaTextIncorrect);
+            // warning: XElement.Value returns the string resulting from direct concatenation of all W.t elements. This is fast but ignores
+            // proper handling of xml:space="preserve" attributes, which Word honors when rendering content. Below we also check
+            // the result of UnicodeMapper.RunToString, which has been enhanced to take xml:space="preserve" into account.
+            string firstParaTextCorrect = InnerText(afterAssembling.MainDocumentPart.Element(W.body).Elements(W.p).First());
+            Assert.Equal("Content may or may not have spaces: he/she; he, she; he and she.", firstParaTextCorrect);
         }
 
         [Theory]
@@ -235,6 +239,14 @@ public void DA103_UseXmlDocument(string name, string data, bool err)
             Assert.Equal(err, returnedTemplateError);
         }
 
+        private static string InnerText(XContainer e)
+        {
+            return e.Descendants(W.r)
+                .Where(r => r.Parent.Name != W.del)
+                .Select(UnicodeMapper.RunToString)
+                .StringConcatenate();
+        }
+
         private static List<string> s_ExpectedErrors = new List<string>()
         {
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:evenHBand' attribute is not declared.",

TestFiles/DA-DataList.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<Test240>
+  <MayOrMayNot>may or may not</MayOrMayNot>
+  <Join1>/</Join1>
+  <Join2>, </Join2>
+  <Join3> and </Join3>
+</Test240>