Skip to content

Commit 7bfe237

Browse files
pavel-alaypavel-alay
committed
Merge branch 'release/7.0.6' into 7.0-master
2 parents c90df04 + 913fed6 commit 7bfe237

File tree

108 files changed

+4036
-1688
lines changed

Some content is hidden

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

108 files changed

+4036
-1688
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
[assembly: AssemblyConfiguration ("")]
77
[assembly: AssemblyCompany ("iText Group NV")]
88
[assembly: AssemblyProduct ("iText")]
9-
[assembly: AssemblyCopyright ("Copyright (c) 1998-2017 iText Group NV")]
9+
[assembly: AssemblyCopyright ("Copyright (c) 1998-2018 iText Group NV")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

1313
[assembly: ComVisible(false)]
1414

1515
[assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]
1616

17-
[assembly: AssemblyVersion("7.0.5.0")]
18-
[assembly: AssemblyFileVersion("7.0.5.0")]
19-
[assembly: AssemblyInformationalVersion("7.0.5")]
17+
[assembly: AssemblyVersion("7.0.6.0")]
18+
[assembly: AssemblyFileVersion("7.0.6.0")]
19+
[assembly: AssemblyInformationalVersion("7.0.6")]
2020

2121
#if !NETSTANDARD1_6
2222
[assembly: NUnit.Framework.Timeout(300000)]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
[assembly: AssemblyConfiguration ("")]
77
[assembly: AssemblyCompany ("iText Group NV")]
88
[assembly: AssemblyProduct ("iText")]
9-
[assembly: AssemblyCopyright ("Copyright (c) 1998-2017 iText Group NV")]
9+
[assembly: AssemblyCopyright ("Copyright (c) 1998-2018 iText Group NV")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

1313
[assembly: ComVisible(false)]
1414

1515
[assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]
1616

17-
[assembly: AssemblyVersion("7.0.5.0")]
18-
[assembly: AssemblyFileVersion("7.0.5.0")]
19-
[assembly: AssemblyInformationalVersion("7.0.5")]
17+
[assembly: AssemblyVersion("7.0.6.0")]
18+
[assembly: AssemblyFileVersion("7.0.6.0")]
19+
[assembly: AssemblyInformationalVersion("7.0.6")]
2020

2121
#if !NETSTANDARD1_6
2222
[assembly: NUnit.Framework.Timeout(300000)]

‎itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTest.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,5 +322,43 @@ public virtual void AcroFieldDictionaryNoFields() {
322322
NUnit.Framework.Assert.Fail(errorMessage);
323323
}
324324
}
325+
326+
/// <exception cref="System.IO.IOException"/>
327+
/// <exception cref="System.Exception"/>
328+
[NUnit.Framework.Test]
329+
public virtual void RegenerateAppearance() {
330+
String input = "regenerateAppearance.pdf";
331+
String output = "regenerateAppearance.pdf";
332+
PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input), new PdfWriter(destinationFolder
333+
+ output), new StampingProperties().UseAppendMode());
334+
PdfAcroForm acro = PdfAcroForm.GetAcroForm(document, false);
335+
int i = 1;
336+
foreach (KeyValuePair<String, PdfFormField> entry in acro.GetFormFields()) {
337+
if (entry.Key.Contains("field")) {
338+
PdfFormField field = entry.Value;
339+
field.SetValue("test" + i++, false);
340+
}
341+
}
342+
document.Close();
343+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + output, sourceFolder
344+
+ "cmp_" + output, destinationFolder, "diff"));
345+
}
346+
347+
/// <exception cref="System.IO.IOException"/>
348+
/// <exception cref="System.Exception"/>
349+
[NUnit.Framework.Test]
350+
public virtual void RegenerateAppearance2() {
351+
String input = "regenerateAppearance2.pdf";
352+
String output = "regenerateAppearance2.pdf";
353+
PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input), new PdfWriter(destinationFolder
354+
+ output), new StampingProperties().UseAppendMode());
355+
PdfAcroForm acro = PdfAcroForm.GetAcroForm(document, false);
356+
acro.SetNeedAppearances(true);
357+
PdfFormField field = acro.GetField("number");
358+
field.SetValue("20150044DR");
359+
document.Close();
360+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + output, sourceFolder
361+
+ "cmp_" + output, destinationFolder, "diff"));
362+
}
325363
}
326364
}

‎itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_regenerateAppearance.pdf‎

27.4 KB
Binary file not shown.

‎itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_regenerateAppearance2.pdf‎

39.1 KB
Binary file not shown.

‎itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/regenerateAppearance.pdf‎

25.2 KB
Binary file not shown.

‎itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/regenerateAppearance2.pdf‎

34.5 KB
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
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-2017 iText Group NV")]
10+
[assembly: AssemblyCopyright ("Copyright (c) 1998-2018 iText Group NV")]
1111
[assembly: AssemblyTrademark("")]
1212
[assembly: AssemblyCulture("")]
1313

1414
[assembly: ComVisible(false)]
1515

1616
[assembly: Guid("a53a5dd3-787b-4563-8778-1d76bdad57ba")]
1717

18-
[assembly: AssemblyVersion("7.0.5.0")]
19-
[assembly: AssemblyFileVersion("7.0.5.0")]
20-
[assembly: AssemblyInformationalVersion("7.0.5")]
18+
[assembly: AssemblyVersion("7.0.6.0")]
19+
[assembly: AssemblyFileVersion("7.0.6.0")]
20+
[assembly: AssemblyInformationalVersion("7.0.6")]
2121

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

‎itext.tests/itext.io.tests/itext/io/font/FontProgramTest.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,16 @@ source product.
4545

4646
namespace iText.IO.Font {
4747
public class FontProgramTest {
48+
private const String notExistingFont = "some-font.ttf";
49+
4850
/// <exception cref="System.IO.IOException"/>
4951
[NUnit.Framework.Test]
5052
public virtual void ExceptionMessageTest() {
51-
String font = "some-font.ttf";
52-
try {
53-
FontProgramFactory.CreateFont(font);
54-
}
55-
catch (iText.IO.IOException ex) {
56-
NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(iText.IO.IOException.FontFile1NotFound, font), ex
57-
.Message);
53+
NUnit.Framework.Assert.That(() => {
54+
FontProgramFactory.CreateFont(notExistingFont);
5855
}
56+
, NUnit.Framework.Throws.TypeOf<System.IO.IOException>().With.Message.EqualTo(MessageFormatUtil.Format(iText.IO.IOException._1NotFoundAsFileOrResource, notExistingFont)));
57+
;
5958
}
6059

6160
/// <exception cref="System.IO.IOException"/>

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

Lines changed: 4 additions & 4 deletions
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-2017 iText Group NV")]
10+
[assembly: AssemblyCopyright ("Copyright (c) 1998-2018 iText Group NV")]
1111
[assembly: AssemblyTrademark("")]
1212
[assembly: AssemblyCulture("")]
1313

1414
[assembly: ComVisible(false)]
1515

1616
[assembly: Guid("02e54061-eb72-409d-b2c0-307ce66b57e9")]
1717

18-
[assembly: AssemblyVersion("7.0.5.0")]
19-
[assembly: AssemblyFileVersion("7.0.5.0")]
20-
[assembly: AssemblyInformationalVersion("7.0.5")]
18+
[assembly: AssemblyVersion("7.0.6.0")]
19+
[assembly: AssemblyFileVersion("7.0.6.0")]
20+
[assembly: AssemblyInformationalVersion("7.0.6")]
2121

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

0 commit comments

Comments
 (0)