From 21930638093c72b4488b57a0131b94dc6777cabf Mon Sep 17 00:00:00 2001 From: Eliot Jones Date: Mon, 2 Mar 2020 15:07:02 +0000 Subject: [PATCH] fix tests for public api and merge conflict the cross reference parser tests behaviour had change, this fixes a compilation error from merge conflicts. also updates the merger tests to account for new version behaviour and checks the output document text. adds pdfmerger to the public api in the tests. --- .../Parts/FileStructure/CrossReferenceTableParserTests.cs | 2 +- src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs | 1 + src/UglyToad.PdfPig.Tests/Writer/PdfMergerTests.cs | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/UglyToad.PdfPig.Tests/Parser/Parts/FileStructure/CrossReferenceTableParserTests.cs b/src/UglyToad.PdfPig.Tests/Parser/Parts/FileStructure/CrossReferenceTableParserTests.cs index 7efb7175..112e0cfb 100644 --- a/src/UglyToad.PdfPig.Tests/Parser/Parts/FileStructure/CrossReferenceTableParserTests.cs +++ b/src/UglyToad.PdfPig.Tests/Parser/Parts/FileStructure/CrossReferenceTableParserTests.cs @@ -234,7 +234,7 @@ trailer trailer <<>>"); - Action action = () => CrossReferenceTableParser.Parse(input, 0, false); + var result = CrossReferenceTableParser.Parse(input, 0, false); var offset = Assert.Single(result.ObjectOffsets); Assert.Equal(10, offset.Value); diff --git a/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs b/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs index d0277bd3..4e682e83 100644 --- a/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs +++ b/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs @@ -196,6 +196,7 @@ "UglyToad.PdfPig.Util.IWordExtractor", "UglyToad.PdfPig.Util.DefaultWordExtractor", "UglyToad.PdfPig.Writer.PdfDocumentBuilder", + "UglyToad.PdfPig.Writer.PdfMerger", "UglyToad.PdfPig.Writer.PdfPageBuilder", "UglyToad.PdfPig.Writer.TokenWriter", "UglyToad.PdfPig.XObjects.XObjectImage" diff --git a/src/UglyToad.PdfPig.Tests/Writer/PdfMergerTests.cs b/src/UglyToad.PdfPig.Tests/Writer/PdfMergerTests.cs index 2f93f803..3d540b58 100644 --- a/src/UglyToad.PdfPig.Tests/Writer/PdfMergerTests.cs +++ b/src/UglyToad.PdfPig.Tests/Writer/PdfMergerTests.cs @@ -18,7 +18,11 @@ { Assert.Equal(2, document.NumberOfPages); - Assert.Equal(1.7m, document.Version); + Assert.Equal(1.5m, document.Version); + + var page1 = document.GetPage(1); + + Assert.Equal("Write something inInkscape", page1.Text); } } }