Standardize test namespaces and syntax

OpenXmlPowerTools.Tests/ChartUpdaterTests.cs

@@ -5,7 +5,7 @@
 using System.IO;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class CuTests
     {

OpenXmlPowerTools.Tests/ColorParserTests.cs

@@ -2,7 +2,7 @@
 using SkiaSharp;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class ColorParserTests
     {
@@ -53,4 +53,4 @@ public void ShouldRejectInvalidColors(string? input)
             Assert.False(success);
         }
     }
-}
+}

OpenXmlPowerTools.Tests/CssPropertyValueTests.cs

@@ -2,7 +2,7 @@
 using SkiaSharp;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class CssPropertyValueTests
     {

OpenXmlPowerTools.Tests/DocumentAssemblerTests.cs

@@ -1,18 +1,18 @@
 using Codeuctivity.OpenXmlPowerTools;
 using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
 using DocumentFormat.OpenXml.Validation;
+using DocumentFormat.OpenXml.Wordprocessing;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using Xunit;
-using System.Globalization;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class DaTests
     {
@@ -126,7 +126,7 @@ public void DA101(string name, string data, bool err)
                 ms.Write(afterAssembling.DocumentByteArray, 0, afterAssembling.DocumentByteArray.Length);
                 using var wDoc = WordprocessingDocument.Open(ms, true);
                 var v = new OpenXmlValidator();
-                var valErrors = v.Validate(wDoc).Where(ve => !s_ExpectedErrors.Contains(ve.Description));
+                var valErrors = v.Validate(wDoc, TestContext.Current.CancellationToken).Where(ve => !s_ExpectedErrors.Contains(ve.Description));
 
                 var sb = new StringBuilder();
                 foreach (var item in valErrors.Select(r => r.Description).OrderBy(t => t).Distinct())
@@ -215,7 +215,7 @@ public void DA103_UseXmlDocument(string name, string data, bool err)
                 ms.Write(afterAssembling.DocumentByteArray, 0, afterAssembling.DocumentByteArray.Length);
                 using var wDoc = WordprocessingDocument.Open(ms, true);
                 var v = new OpenXmlValidator();
-                var valErrors = v.Validate(wDoc).Where(ve => !s_ExpectedErrors.Contains(ve.Description));
+                var valErrors = v.Validate(wDoc, TestContext.Current.CancellationToken).Where(ve => !s_ExpectedErrors.Contains(ve.Description));
                 Assert.Empty(valErrors);
             }
 
@@ -515,8 +515,8 @@ private static string InnerText(XContainer e)
                 .StringConcatenate();
         }
 
-        private static readonly List<string> s_ExpectedErrors = new List<string>()
-        {
+        private static readonly List<string> s_ExpectedErrors =
+        [
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:evenHBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:evenVBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:firstColumn' attribute is not declared.",
@@ -531,6 +531,6 @@ private static string InnerText(XContainer e)
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:noVBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:oddHBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:oddVBand' attribute is not declared.",
-        };
+        ];
     }
-}
+}

OpenXmlPowerTools.Tests/FormattingAssemblerTests.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class FaTests
     {
@@ -49,7 +49,7 @@ public void FA001_DocumentsWithRevTracking(string testId, string src)
             var thisTestTempDir = new DirectoryInfo(Path.Combine(rootTempDir.FullName, testId));
             if (thisTestTempDir.Exists)
             {
-                Assert.True(false, "Duplicate test id: " + testId);
+                Assert.Fail("Duplicate test id: " + testId);
             }
             else
             {
@@ -100,12 +100,12 @@ private void Validate(FileInfo fi)
                     sb.Append(item.Description).Append(Environment.NewLine);
                 }
                 var s = sb.ToString();
-                Assert.True(false, s);
+                Assert.Fail(s);
             }
         }
 
-        private static readonly List<string> s_ExpectedErrors = new List<string>()
-        {
+        private static readonly List<string> s_ExpectedErrors =
+        [
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:evenHBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:evenVBand' attribute is not declared.",
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:firstColumn' attribute is not declared.",
@@ -135,6 +135,6 @@ private void Validate(FileInfo fi)
             "The 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:customStyles' attribute is not declared.",
             "The element has invalid child element 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:ins'.",
             "The element has invalid child element 'http://schemas.openxmlformats.org/wordprocessingml/2006/main:del'.",
-        };
+        ];
     }
 }

OpenXmlPowerTools.Tests/HtmlToWmlConverterTests.cs

@@ -25,7 +25,7 @@
  * this module do not require the HtmlAgilityPack to run.
 *******************************************************************************************/
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class HwTests
     {

OpenXmlPowerTools.Tests/HtmlToWmlReadAsXElement.cs

@@ -26,7 +26,7 @@
 using HtmlAgilityPack;
 #endif
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class HtmlToWmlReadAsXElement
     {

OpenXmlPowerTools.Tests/ImageHandlerTests.cs

@@ -5,7 +5,7 @@
 using SkiaSharp;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class ImageHandlerTests
     {

OpenXmlPowerTools.Tests/MarkupSimplifierTests.cs

@@ -6,7 +6,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class MarkupSimplifierTests
     {

OpenXmlPowerTools.Tests/MetricsGetterTests.cs

@@ -3,7 +3,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class MgTests
     {

OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/AllowedDiffInfo.cs

@@ -1,4 +1,4 @@
-namespace Codeuctivity.Tests.OpenXMLWordProcessingMLToHtmlConverter
+namespace OpenXmlPowerTools.Tests.OpenXMLWordprocessingMLToHtmlConverter
 {
     internal class AllowedDiffInfo
     {

OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterHandlerTests.cs

@@ -8,7 +8,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests.OpenXMLWordProcessingMLToHtmlConverter
+namespace OpenXmlPowerTools.Tests.OpenXMLWordprocessingMLToHtmlConverter
 {
     public class WmlToHtmlConverterHandlerTests
     {

OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterTests.cs

@@ -13,7 +13,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests.OpenXMLWordProcessingMLToHtmlConverter
+namespace OpenXmlPowerTools.Tests.OpenXMLWordprocessingMLToHtmlConverter
 {
     public class WmlToHtmlConverterTests
     {
@@ -117,7 +117,7 @@ public async Task HC003_ContainsSubstring(string name, params string[] expectedS
             var sourceDocx = new FileInfo(Path.Combine(sourceDir.FullName, name));
             var settings = new WmlToHtmlConverterSettings(sourceDocx.FullName, new ImageHandler(), new TextDummyHandler(), new SymbolHandler(), new BreakHandler(), new FontHandler(), false);
 
-            var byteArray = await File.ReadAllBytesAsync(sourceDocx.FullName);
+            var byteArray = await File.ReadAllBytesAsync(sourceDocx.FullName, TestContext.Current.CancellationToken);
             using var memoryStream = new MemoryStream();
             memoryStream.Write(byteArray, 0, byteArray.Length);
             using var wDoc = WordprocessingDocument.Open(memoryStream, true);
@@ -243,7 +243,7 @@ internal static async Task AssertImageIsEqual(string actualImagePath, string exp
                     Assert.Fail($"Expected PixelErrorCount less or equal {allowedPixelErrorCount} but was {result.PixelErrorCount}\nExpected {expectFullPath}\ndiffers to actual {actualFullPath}\n Diff is {allowedDiffInfo.NewDiffImageFileName} \nReplace {actualFullPath} with the new value or store the diff as {allowedDiffInfo.ExistingDiffImageFilename.First()}.");
                 }
             }
-            catch (System.Exception ex) when (!(ex is Xunit.Sdk.FailException))
+            catch (System.Exception ex) when (ex is not Xunit.Sdk.FailException)
             {
                 SaveToGithubActionsPickupTestresultsDirectory(actualFullPath, expectFullPath, allowedDiffInfo.NewDiffImageFileName);
             }

OpenXmlPowerTools.Tests/OpenXmlRegexTests.cs

@@ -7,7 +7,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class OpenXmlRegexTests
     {

OpenXmlPowerTools.Tests/PowerToolsBlockExtensionsTests.cs

@@ -6,7 +6,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class PowerToolsBlockExtensionsTests : TestsBase
     {
@@ -52,7 +52,7 @@ public void MustBeginPowerToolsBlockToUsePowerTools()
             // paragraph. This is caused by the GetXDocument method using the cached
             // XDocument, i.e., the annotation, rather reading the part's stream again.
             content = part.GetXDocument();
-            paragraphElements = content.Descendants(W.p).ToList();
+            paragraphElements = [.. content.Descendants(W.p)];
             Assert.Single(paragraphElements);
             Assert.Equal("First", paragraphElements[0].Value);
 
@@ -65,7 +65,7 @@ public void MustBeginPowerToolsBlockToUsePowerTools()
             // Get content through the PowerTools in the exact same way as above.
             // We should now see both paragraphs.
             content = part.GetXDocument();
-            paragraphElements = content.Descendants(W.p).ToList();
+            paragraphElements = [.. content.Descendants(W.p)];
             Assert.Equal(2, paragraphElements.Count);
             Assert.Equal("First", paragraphElements[0].Value);
             Assert.Equal("Second", paragraphElements[1].Value);
@@ -114,7 +114,7 @@ public void MustEndPowerToolsBlockToUseStronglyTypedClasses()
             // Get the part's content through the SDK. Having reloaded the root element,
             // we should still see both paragraphs.
             body = part.Document.Body;
-            paragraphs = body.Elements<Paragraph>().ToList();
+            paragraphs = [.. body.Elements<Paragraph>()];
             Assert.Equal(2, paragraphs.Count);
             Assert.Equal("Added through SDK", paragraphs[0].InnerText);
             Assert.Equal("Added through PowerTools", paragraphs[1].InnerText);

OpenXmlPowerTools.Tests/PowerToolsBlockTests.cs

@@ -7,7 +7,7 @@
 using System.Xml.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class PowerToolsBlockTests : TestsBase
     {

OpenXmlPowerTools.Tests/PtUtilTests.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class PtUtilTests
     {

OpenXmlPowerTools.Tests/RevisionAccepterTests.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class RaTests
     {

OpenXmlPowerTools.Tests/RevisionProcessorTests.cs

@@ -3,7 +3,7 @@
 using System.IO;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class RpTests
     {

OpenXmlPowerTools.Tests/SmlCellFormatterTests.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class CfTests
     {

OpenXmlPowerTools.Tests/SmlToHtmlConverterTests.cs

@@ -3,7 +3,7 @@
 using System.IO;
 using Xunit;
 
-namespace Codeuctivity.Tests
+namespace OpenXmlPowerTools.Tests
 {
     public class ShTests
     {