Fix the unit testing after new changes from #197 and #199

Author: onizet

src/Html2OpenXml/Expressions/FigureCaptionExpression.cs

@@ -12,7 +12,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using AngleSharp.Dom;
 using AngleSharp.Html.Dom;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Wordprocessing;
@@ -31,30 +30,25 @@ public override IEnumerable<OpenXmlElement> Interpret (ParsingContext context)
         ComposeStyles(context);
         var childElements = Interpret(context.CreateChild(this), node.ChildNodes);
 
-        var figNumRef = new List<OpenXmlElement>()
-        {
+        var figNumRef = new List<OpenXmlElement>() {
             new Run(
                 new Text("Figure ") { Space = SpaceProcessingModeValues.Preserve }
             ),
             new SimpleField(
                 new Run(
                     new Text(AddFigureCaption(context).ToString(CultureInfo.InvariantCulture)))
-            )
-            { Instruction = " SEQ Figure \\* ARABIC " }
+            ) { Instruction = " SEQ Figure \\* ARABIC " }
         };
 
 
         if (!childElements.Any())
         {
-            return
-                [new Paragraph(figNumRef)
-                {
-                    ParagraphProperties = new ParagraphProperties
-                    {
-                        ParagraphStyleId = context.DocumentStyle.GetParagraphStyle(context.DocumentStyle.DefaultStyles.CaptionStyle),
-                        KeepNext = DetermineKeepNext(node),
-                    }
-                }];
+            return [new Paragraph(figNumRef) {
+                ParagraphProperties = new ParagraphProperties {
+                    ParagraphStyleId = context.DocumentStyle.GetParagraphStyle(context.DocumentStyle.DefaultStyles.CaptionStyle),
+                    KeepNext = DetermineKeepNext(node),
+                }
+            }];
         }
 
         //Add the figure number references to the start of the first paragraph.
@@ -69,12 +63,12 @@ [new Paragraph(figNumRef)
         }
         else
         {
-            //The first child of the figure caption is a table or something. Just prepend a new paragraph with the figure number reference.
-            childElements = 
-                [
-                    new Paragraph(figNumRef),
-                    ..childElements
-                ];
+            // The first child of the figure caption is a table or something.
+            // Just prepend a new paragraph with the figure number reference.
+            childElements =  [
+                new Paragraph(figNumRef),
+                ..childElements
+            ];
         }
 
         foreach (var paragraph in childElements.OfType<Paragraph>())
@@ -118,8 +112,7 @@ private static int AddFigureCaption(ParsingContext context)
     /// <summary>
     /// Determines whether the KeepNext property should apply this this caption.
     /// </summary>
-    /// <param name="node"></param>
-    /// <returns>A new <see cref="KeepNext"/> or null./></returns>
+    /// <returns>A new <see cref="KeepNext"/> or null.</returns>
     private static KeepNext? DetermineKeepNext(IHtmlElement node)
     {
         // A caption at the end of a figure will have no next sibling.

test/HtmlToOpenXml.Tests/ElementTests.cs

@@ -28,7 +28,6 @@ public void PhrasingTag_ReturnsRunWithDefaultStyle<T> (string html) where T : Op
         [TestCase(@"<sup>Superscript</sup>", ExpectedResult = "superscript")]
         public string? SubSup_ReturnsRunWithVerticalAlignment (string html)
         {
-            //var val = new VerticalPositionValues(tagName);
             var textAlign = ParsePhrasing<VerticalTextAlignment>(html);
             Assert.That(textAlign.Val?.HasValue, Is.True);
             return textAlign.Val.InnerText;
@@ -154,9 +153,32 @@ public void FigCaption_ReturnsRunWithSimpleField()
 
             Assert.Multiple(() =>
             {
-                Assert.That(elements[0].ChildElements, Has.Count.EqualTo(3));
                 Assert.That(elements[0].HasChild<Run>(), Is.True);
                 Assert.That(elements[0].HasChild<SimpleField>(), Is.True);
+                Assert.That(elements[0].Elements<Run>().Count(), Is.EqualTo(3));
+                Assert.That(elements[0].GetFirstChild<ParagraphProperties>()!.KeepNext, Is.Null);
+                Assert.That(elements[0].GetFirstChild<SimpleField>()!.Instruction?.Value, Does.Contain("SEQ Figure \\* ARABIC"));
+            });
+        }
+
+        [Test]
+        public void FigCaption_WithHeading_ReturnsParagraphWithSimpleField()
+        {
+            var elements = converter.Parse(@"<figcaption>
+                <h2>Puppy School</h2>
+                <p>Championship Class of 2016</p>
+            </figcaption>");
+
+            Assert.That(elements, Has.Count.EqualTo(2));
+            Assert.That(elements, Is.All.TypeOf<Paragraph>());
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(elements[0].HasChild<Run>(), Is.True);
+                Assert.That(elements[0].HasChild<SimpleField>(), Is.True);
+                Assert.That(elements[0].GetFirstChild<ParagraphProperties>()!.KeepNext, Is.Not.Null);
+                Assert.That(elements[1].HasChild<Run>(), Is.True);
+                Assert.That(elements[1].HasChild<SimpleField>(), Is.False);
             });
         }
 

test/HtmlToOpenXml.Tests/LinkTests.cs

@@ -61,7 +61,7 @@ public void ImageFigcaptionLink_ReturnsHyperlinkWithTextAndImage ()
             Assert.That(elements[0].FirstChild, Is.TypeOf(typeof(Hyperlink)));
 
             var hyperlink = (Hyperlink) elements[0].FirstChild;
-            Assert.That(hyperlink.ChildElements, Has.Count.EqualTo(4));
+            Assert.That(hyperlink.ChildElements, Has.Count.EqualTo(6));
             Assert.That(hyperlink.ChildElements, Has.All.TypeOf(typeof(Run)), "Hyperlinks don't accept inner paragraphs");
             Assert.That(hyperlink.Descendants<Drawing>(), Is.Not.Null);
         }

test/HtmlToOpenXml.Tests/TableTests.cs

@@ -247,7 +247,7 @@ public void CellSpacing_ReturnsTableCellWithSpacing()
         }
 
         [TestCaseSource(nameof(BorderWidthCases))]
-        public void HtmlBorders_ShouldSucceed(string borderAtrribute, IEnumerable<string> expectedBorderValue, IEnumerable<uint?> expectedBorderWidth)
+        public void HtmlBorders_ShouldSucceed(string borderAtrribute, IEnumerable<string>? expectedBorderValue, IEnumerable<uint?>? expectedBorderWidth)
         {
             // we specify a style which doesn't handle borders
             converter.HtmlStyles.AddStyle(new Style {
@@ -260,6 +260,12 @@ public void HtmlBorders_ShouldSucceed(string borderAtrribute, IEnumerable<string
             Assert.That(elements, Has.Count.EqualTo(1));
             Assert.That(elements, Has.All.TypeOf<Table>());
             var borders = elements[0].GetFirstChild<TableProperties>()?.TableBorders;
+            if (expectedBorderValue is null)
+            {
+                Assert.That(borders, Is.Null);
+                return;
+            }
+
             Assert.That(borders, Is.Not.Null);
             Assert.That(borders.HasChild<BorderType>(), Is.True);
             Assert.That(new string?[] { borders.TopBorder?.Val?.InnerText,
@@ -289,8 +295,8 @@ public void HtmlBorders_ShouldSucceed(string borderAtrribute, IEnumerable<string
         static readonly object[] BorderWidthCases =
         [
             // Negative border should be considered as zero
-            new object[] { "border='-1'", Enumerable.Repeat("none", 6), null! },
-            new object[] { "border='0'", Enumerable.Repeat("none", 6), null! },
+            new object[] { "border='-1'", null!, null! },
+            new object[] { "border='0'", null!, null! },
             new object[] { "border='1'",
                 new string[] { "none", "none", "none", "none", "single", "single" }, 
                 new uint?[] { null, null, null, null, 14, 14 } },