Skip to content

Commit dd1c3bd

Browse files
iText-CIiText-CI
committed
[RELEASE] iText 7 pdfHTML - 3.0.4
https://github.com/itext/i7n-pdfhtml/releases/tag/3.0.4 * release_branch: [RELEASE] pdfHTML 3.0.4 Add a test on NPE while updating layout box of flex element Drop .NET Framework 4.0 support in favor of 4.5 in html2pdf modules Add overflow tests Remove TODO related to already closed ticket Add message logging for not supported flex-related properties Support collapsing margins for flex container Apply overflow: visible on anonymous flex items Add a test on max-height Remove redundant TODOs. Update cmps Update cmp files and their names Add missing copyright headers Reorganize AbsoluteNonReplacedWidth and PositionRelative tests Replace html2pdf-private tests Replace html2pdf-private tests: CssOpacityTest Add missing copyright headers Add flexbox-basic and flexbox-sizing tests Fix a long name issue Add missing copyright headers Add integration tests for flex algorithm Make FlexContainer be default-accessed Update cmps after a fix of flex container's width Support justify-content and align-tems properties Replace html2pdf-private tests: TextPropertiesTest Add a test on processing of simultaneous page-break avoid and page-break always Add missing copyright headers Add flex-aspect-ratio-img-column and flex-aspect-ratio-img-row tests Replace html2pdf-private tests: PsedoElementsTest Add missing copyright headers Add flexbox-align-items and flexbox-definite-sizes tests Add missing copyright headers Reorganize FunctionalCalligraphTest Implement display:flex's tagWorker and cssAppliers Add missing copyright headers Add flexbox align-items and overflow tests Replace html2pdf-private tests: ImagesDpiTest Replace html2pdf-private tests: ClearTest Replace html2pdf-private tests: VerticalAlignmetTest and RgbaTest Add missing copyright headers Add direction tests Add test for table with wrong colspan value Replace html2pdf-private test: PageBreakTest Replace html2pdf-private tests: BoxSizingTest Add test for Tag Structure flushing error for pdf converted from html Replace BackgroundImageTest from html2pdf-private Replace tests from html2pdf-private element#ImageTest Support 'display:inline-block' for 'label' tag Add missing copyright headers Reorganize tests Add missing copyright headers Add flexbox-justify-content tests Edit name in some tests Test files cmp update Update tests after validator improvements Add missing copyright headers Add flexbox tests Add missing copyright headers Add w3c flexbox tests starting with flexbox_flex Remove System.Net.Http package Add a test to demonstrate the issue with rowspan and column widths Add missing copyright headers Fix javadoc documentation message Update port-hash after release [AFTER RELEASE] pdfHTML 3.0.3 Add missing copyright headers Make SvgTagWorker constructor logging more clear
2 parents bee6a50 + 9c16d5a commit dd1c3bd

File tree

3,409 files changed

+24914
-2622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,409 files changed

+24914
-2622
lines changed

‎doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "pdfHTML 3.0.3 API"
35+
PROJECT_NAME = "pdfHTML 3.0.4 API"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

‎itext.tests/itext.html2pdf.tests/Properties/AssemblyInfo.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
[assembly: AssemblyConfiguration("")]
88
[assembly: AssemblyCompany("iText Group NV")]
99
[assembly: AssemblyProduct("iText")]
10-
[assembly: AssemblyCopyright ("Copyright (c) 1998-2020 iText Group NV")]
10+
[assembly: AssemblyCopyright ("Copyright (c) 1998-2021 iText Group NV")]
1111
[assembly: AssemblyTrademark("")]
1212
[assembly: AssemblyCulture("")]
1313

1414
[assembly: ComVisible(false)]
1515

1616
[assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")]
1717

18-
[assembly: AssemblyVersion("3.0.3.0")]
19-
[assembly: AssemblyFileVersion("3.0.3.0")]
20-
[assembly: AssemblyInformationalVersion("3.0.3")]
18+
[assembly: AssemblyVersion("3.0.4.0")]
19+
[assembly: AssemblyFileVersion("3.0.4.0")]
20+
[assembly: AssemblyInformationalVersion("3.0.4")]
2121

2222
#if !NETSTANDARD2_0
2323
[assembly: NUnit.Framework.Timeout(300000)]

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.csproj

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<Import Project="$(SolutionDir)\packages\itext7.pdftest.7.1.14\build\itext7.pdftest.props" Condition="Exists('$(SolutionDir)\packages\itext7.pdftest.7.1.14\build\itext7.pdftest.props')" />
4+
<Import Project="$(SolutionDir)\packages\itext7.pdftest.7.1.15\build\itext7.pdftest.props" Condition="Exists('$(SolutionDir)\packages\itext7.pdftest.7.1.15\build\itext7.pdftest.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
88
<ProjectGuid>{AE4E5743-0665-4705-9A33-07EA57CDD269}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace></RootNamespace>
11+
<RootNamespace />
1212
<AssemblyName>itext.html2pdf.tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
39-
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
39+
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="System" />
@@ -51,22 +51,22 @@
5151
<Project>{e2828ac4-3c63-4b2a-b5ad-5f98862775be}</Project>
5252
<Name>itext.forms</Name>
5353
</ProjectReference>
54-
<Reference Include="itext.forms, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
55-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.forms.dll</HintPath>
54+
<Reference Include="itext.forms, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
55+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.forms.dll</HintPath>
5656
</Reference>
5757
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
5858
<Project>{56137079-541A-425A-AB97-43AF63793C97}</Project>
5959
<Name>itext.hyph</Name>
6060
</ProjectReference>
61-
<Reference Include="itext.hyph, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
62-
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.1.14\lib\net40\itext.hyph.dll</HintPath>
61+
<Reference Include="itext.hyph, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
62+
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.1.15\lib\net45\itext.hyph.dll</HintPath>
6363
</Reference>
6464
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
6565
<Project>{cee5e7e1-1bf0-4be1-9941-903262ce2f83}</Project>
6666
<Name>itext.io</Name>
6767
</ProjectReference>
68-
<Reference Include="itext.io, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
69-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.io.dll</HintPath>
68+
<Reference Include="itext.io, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
69+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.io.dll</HintPath>
7070
</Reference>
7171
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
7272
<Project>{4e7819e8-7555-4e2e-9a01-d8718a2cfdda}</Project>
@@ -75,43 +75,43 @@
7575
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
7676
<HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
7777
</Reference>
78-
<Reference Include="itext.kernel, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
79-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.kernel.dll</HintPath>
78+
<Reference Include="itext.kernel, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
79+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.kernel.dll</HintPath>
8080
</Reference>
8181
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
8282
<Project>{42173642-db52-44d3-9883-3e34c65c53bc}</Project>
8383
<Name>itext.layout</Name>
8484
</ProjectReference>
85-
<Reference Include="itext.layout, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
86-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.layout.dll</HintPath>
85+
<Reference Include="itext.layout, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
86+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.layout.dll</HintPath>
8787
</Reference>
8888
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
8989
<Project>{9fc2f0b3-a8d2-46da-8724-72e00e67a8fa}</Project>
9090
<Name>itext.pdfa</Name>
9191
</ProjectReference>
92-
<Reference Include="itext.pdfa, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
93-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.pdfa.dll</HintPath>
92+
<Reference Include="itext.pdfa, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
93+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.pdfa.dll</HintPath>
9494
</Reference>
9595
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
9696
<Project>{f9880dc4-f015-4413-af86-66d0e9512774}</Project>
9797
<Name>itext.pdftest</Name>
9898
</ProjectReference>
99-
<Reference Include="itext.pdftest, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
100-
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.1.14\lib\net40\itext.pdftest.dll</HintPath>
99+
<Reference Include="itext.pdftest, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
100+
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.1.15\lib\net45\itext.pdftest.dll</HintPath>
101101
</Reference>
102102
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
103103
<Project>{8636f290-00df-403e-b841-e4bfd6d9ce7a}</Project>
104104
<Name>itext.styledxmlparser</Name>
105105
</ProjectReference>
106-
<Reference Include="itext.styledxmlparser, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
107-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.styledxmlparser.dll</HintPath>
106+
<Reference Include="itext.styledxmlparser, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
107+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.styledxmlparser.dll</HintPath>
108108
</Reference>
109109
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
110110
<Project>{ddec35d2-5781-471d-5ea1-a6e433eddb11}</Project>
111111
<Name>itext.svg</Name>
112112
</ProjectReference>
113-
<Reference Include="itext.svg, Version=7.1.14.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
114-
<HintPath>$(SolutionDir)\packages\itext7.7.1.14\lib\net40\itext.svg.dll</HintPath>
113+
<Reference Include="itext.svg, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
114+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15\lib\net45\itext.svg.dll</HintPath>
115115
</Reference>
116116
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj">
117117
<Project>{ff6ba09d-3655-466a-8c17-a7bfd3479ca1}</Project>

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.netstandard.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<PropertyGroup Label="Configuration">
44
<SignAssembly>True</SignAssembly>
55
<DelaySign>False</DelaySign>
6-
<RootNamespace></RootNamespace>
6+
<RootNamespace />
77
</PropertyGroup>
88
<PropertyGroup>
9-
<TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
9+
<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
1010
</PropertyGroup>
11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
11+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
1212
<OutputType>library</OutputType>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
@@ -38,21 +38,21 @@
3838
<PropertyGroup>
3939
<NoWarn>1701;1702;1591;1570;1572;1573;1574;1580;1584;1658</NoWarn>
4040
</PropertyGroup>
41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />
4444
</ItemGroup>
4545
<ItemGroup>
4646
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.netstandard.csproj')" />
47-
<PackageReference Include="itext7" Version="7.1.14" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.netstandard.csproj')" />
47+
<PackageReference Include="itext7" Version="7.1.15" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.netstandard.csproj')" />
4848
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.netstandard.csproj')" />
4949
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.netstandard.csproj')" />
5050
<ProjectReference Include="..\..\..\itextcore\itext\itext.forms\itext.forms.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.netstandard.csproj')" />
5151
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.netstandard.csproj')" />
5252
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.netstandard.csproj')" />
53-
<PackageReference Include="itext7.hyph" Version="7.1.14" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.netstandard.csproj')" />
53+
<PackageReference Include="itext7.hyph" Version="7.1.15" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.netstandard.csproj')" />
5454
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.netstandard.csproj')" />
55-
<PackageReference Include="itext7.pdftest" Version="7.1.14" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.netstandard.csproj')" />
55+
<PackageReference Include="itext7.pdftest" Version="7.1.15" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.netstandard.csproj')" />
5656
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.netstandard.csproj')" />
5757
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.netstandard.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.netstandard.csproj')" />
5858
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.netstandard.csproj" />

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ExtendedFontPropertiesTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ExtendedHtmlConversionITextTest.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify
@@ -126,9 +126,6 @@ public virtual void ConvertToPdfAcroformFlattenAndCompare(String name, String so
126126
String cmpPdfPath = sourceFolder + "cmp_" + name + ".pdf";
127127
String cmpPdfPathAcro = sourceFolder + "cmp_" + name + "_acro.pdf";
128128
String cmpPdfPathAcroFlatten = sourceFolder + "cmp_" + name + "_acro_flatten.pdf";
129-
String diff1 = "diff1_" + name;
130-
String diff2 = "diff2_" + name;
131-
String diff3 = "diff3_" + name;
132129
//convert tagged PDF without acroform (from html with form elements)
133130
PdfWriter taggedWriter = new PdfWriter(outPdfPath);
134131
PdfDocument pdfTagged = new PdfDocument(taggedWriter);
@@ -156,11 +153,11 @@ public virtual void ConvertToPdfAcroformFlattenAndCompare(String name, String so
156153
document.Close();
157154
//compare with cmp
158155
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPath, cmpPdfPath, destinationFolder
159-
, diff1));
156+
));
160157
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPathAcro, cmpPdfPathAcro, destinationFolder
161-
, diff2));
158+
));
162159
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPathFlatted, cmpPdfPathAcroFlatten,
163-
destinationFolder, diff3));
160+
destinationFolder));
164161
//compare tags structure if tagged
165162
if (tagged) {
166163
CompareTagStructure(outPdfPath, cmpPdfPath);

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/FontProviderTest.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify
@@ -55,15 +55,13 @@ public class FontProviderTest : ExtendedITextTest {
5555
public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
5656
+ "/test/itext/html2pdf/FontProviderTest/";
5757

58-
private const String TYPOGRAPHY_WARNING = "Cannot find pdfCalligraph module, which was implicitly required by one of the layout properties";
59-
6058
[NUnit.Framework.OneTimeSetUp]
6159
public static void BeforeClass() {
6260
CreateDestinationFolder(destinationFolder);
6361
}
6462

6563
[NUnit.Framework.Test]
66-
[LogMessage(TYPOGRAPHY_WARNING, Count = 4)]
64+
[LogMessage(iText.IO.LogMessageConstant.TYPOGRAPHY_NOT_FOUND, Count = 4)]
6765
public virtual void HebrewTest() {
6866
HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "hebrew.html"), new FileInfo(destinationFolder + "hebrew.pdf"
6967
));

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2PdfTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlResourceResolverUnitTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ProcessorContextTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2020 iText Group NV
3+
Copyright (c) 1998-2021 iText Group NV
44
Authors: iText Software.
55
66
This program is free software; you can redistribute it and/or modify

0 commit comments

Comments
 (0)