From e8af583de67a93a1713de458b4b44ac1d956e305 Mon Sep 17 00:00:00 2001 From: Rustam Sayfutdinov Date: Sat, 26 Nov 2022 23:31:24 +0300 Subject: [PATCH] Check other parts --- .../Word/AdvancedDocumentTests.cs | 34 +++++++---------- ...umentTests.AdvancedWordCreate.verified.txt | 37 ++++++++++++++++--- OfficeImo.sln | 2 + azure-pipelines.yml | 6 +-- 4 files changed, 49 insertions(+), 30 deletions(-) diff --git a/OfficeIMO.VerifyTests/Word/AdvancedDocumentTests.cs b/OfficeIMO.VerifyTests/Word/AdvancedDocumentTests.cs index b594ea70..568d6169 100644 --- a/OfficeIMO.VerifyTests/Word/AdvancedDocumentTests.cs +++ b/OfficeIMO.VerifyTests/Word/AdvancedDocumentTests.cs @@ -1,5 +1,5 @@ using System; -using System.Globalization; +using System.Text; using System.Threading.Tasks; using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Wordprocessing; @@ -13,28 +13,20 @@ namespace OfficeIMO.VerifyTests.Word; public class AdvancedDocumentTests : VerifyTestBase { private static async Task DoTest(WordprocessingDocument wordprocessingDocument) { - var document = wordprocessingDocument.MainDocumentPart!.Document; - - var i = 1; - foreach (var hyperlink in document.Descendants()) { - hyperlink.Id = "R" + i.ToString(CultureInfo.InvariantCulture); - i++; - } - - i = 1; - foreach (var headerReference in document.Descendants()) { - headerReference.Id = "R" + i.ToString(CultureInfo.InvariantCulture); - i++; - } - - i = 1; - foreach (var footerReference in document.Descendants()) { - footerReference.Id = "R" + i.ToString(CultureInfo.InvariantCulture); - i++; + NormalizeWord(wordprocessingDocument); + + var result = new StringBuilder(); + foreach (var id in wordprocessingDocument.Parts) { + if (id.OpenXmlPart.RootElement is null) + continue; + var xml = FormatXml(id.OpenXmlPart.RootElement.OuterXml); + result.AppendLine(id.OpenXmlPart.Uri.ToString()); + result.AppendLine("------------"); + result.AppendLine(xml); + result.AppendLine("------------"); } - var xml = FormatXml(document.MainDocumentPart!.Document.OuterXml); - await Verifier.Verify(xml, GetSettings()); + await Verifier.Verify(result.ToString(), GetSettings()); } [Fact] diff --git a/OfficeIMO.VerifyTests/Word/verified/AdvancedDocumentTests.AdvancedWordCreate.verified.txt b/OfficeIMO.VerifyTests/Word/verified/AdvancedDocumentTests.AdvancedWordCreate.verified.txt index 6c060827..37696557 100644 --- a/OfficeIMO.VerifyTests/Word/verified/AdvancedDocumentTests.AdvancedWordCreate.verified.txt +++ b/OfficeIMO.VerifyTests/Word/verified/AdvancedDocumentTests.AdvancedWordCreate.verified.txt @@ -1,4 +1,6 @@ - +/word/document.xml +------------ + @@ -666,7 +668,7 @@ - + @@ -702,7 +704,7 @@ 4th element with hyperlink - + @@ -771,8 +773,8 @@ - - + + @@ -813,4 +815,27 @@ - \ No newline at end of file + +------------ +/docProps/app.xml +------------ + + + Evotec Services + +------------ +/docProps/custom.xml +------------ + + + + 9999-12-31T23:59:59Z + + + Some text + + + true + + +------------ diff --git a/OfficeImo.sln b/OfficeImo.sln index f5a32142..59dac92f 100644 --- a/OfficeImo.sln +++ b/OfficeImo.sln @@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md Directory.Build.props = Directory.Build.props .editorconfig = .editorconfig + azure-pipelines-linux.yml = azure-pipelines-linux.yml + azure-pipelines-macos.yml = azure-pipelines-macos.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OfficeIMO.Excel", "OfficeIMO.Excel\OfficeIMO.Excel.csproj", "{80B77D75-D25C-4168-B6A3-FA58DB118EF8}" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4f119337..fb162ba3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,10 +55,10 @@ steps: version: '7.0.x' - task: UseDotNet@2 - displayName: Install .NET 3.1 + displayName: 'Install .NET 3.1' inputs: version: '3.1.x' - packageType: sdk + packageType: 'sdk' includePreviewVersions: false # Add a Command To List the Current .NET SDKs (Sanity Check) @@ -103,4 +103,4 @@ steps: # displayName: 'Publish Code Coverage Report' # inputs: # codeCoverageTool: 'Cobertura' -# summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' \ No newline at end of file +# summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'