Skip to content

Commit d9967b7

Browse files
pavel-alaypavel-alay
committed
[RELEASE] Merge branch 'release/1.0.4'
2 parents 1d28ef8 + b4fc838 commit d9967b7

File tree

100 files changed

+814
-308
lines changed

Some content is hidden

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

100 files changed

+814
-308
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

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

18-
[assembly: AssemblyVersion("1.0.3.0")]
19-
[assembly: AssemblyFileVersion("1.0.3.0")]
20-
[assembly: AssemblyInformationalVersion("1.0.3")]
18+
[assembly: AssemblyVersion("1.0.4.0")]
19+
[assembly: AssemblyFileVersion("1.0.4.0")]
20+
[assembly: AssemblyInformationalVersion("1.0.4")]
2121

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

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ResourceResolverTest.cs‎

Lines changed: 240 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,56 @@ public virtual void ResourceResolverTest07() {
9898
));
9999
}
100100

101+
[NUnit.Framework.Test]
102+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
103+
public void ResourceResolverTest07A()
104+
{
105+
String baseUri = sourceFolder + "%23r%e%2525s@o%25urces/";
106+
107+
String outPdf = destinationFolder + "resourceResolverTest07A.pdf";
108+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest07A.pdf";
109+
using (
110+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest07A.html", FileMode.Open,
111+
FileAccess.Read),
112+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
113+
{
114+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
115+
new ConverterProperties().SetBaseUri(baseUri));
116+
NUnit.Framework.Assert.IsNull(
117+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff07A_"));
118+
}
119+
}
120+
121+
/// <exception cref="System.IO.IOException"/>
122+
/// <exception cref="System.Exception"/>
123+
[NUnit.Framework.Test]
124+
public virtual void ResourceResolverTest07B()
125+
{
126+
String outPdf = destinationFolder + "resourceResolverTest07B.pdf";
127+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest07B.pdf";
128+
HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "#r%e%25s@o%urces/resourceResolverTest07B.html"), new FileInfo(outPdf
129+
));
130+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder,
131+
"diff07B_"
132+
));
133+
}
134+
135+
/// <exception cref="System.IO.IOException"/>
136+
/// <exception cref="System.Exception"/>
137+
[NUnit.Framework.Test]
138+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
139+
public virtual void ResourceResolverTest07C()
140+
{
141+
String outPdf = destinationFolder + "resourceResolverTest07C.pdf";
142+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest07C.pdf";
143+
HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "#r%e%25s@o%urces/resourceResolverTest07C.html"), new FileInfo(outPdf
144+
), new ConverterProperties().SetBaseUri(sourceFolder + "#r%e%25s@o%urces/.."));
145+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder,
146+
"diff07C_"
147+
));
148+
}
149+
150+
101151
/// <exception cref="System.IO.IOException"/>
102152
/// <exception cref="System.Exception"/>
103153
[NUnit.Framework.Test]
@@ -145,21 +195,123 @@ public virtual void ResourceResolverTest11() {
145195
}
146196
}
147197

198+
[NUnit.Framework.Test]
199+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
200+
public void ResourceResolverTest12A()
201+
{
202+
String baseUri = sourceFolder + "path%with%spaces/";
203+
204+
String outPdf = destinationFolder + "resourceResolverTest12A.pdf";
205+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12A.pdf";
206+
using (
207+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12A.html", FileMode.Open,
208+
FileAccess.Read),
209+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
210+
{
211+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
212+
new ConverterProperties().SetBaseUri(baseUri));
213+
NUnit.Framework.Assert.IsNull(
214+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12A_"));
215+
}
216+
}
217+
148218
[NUnit.Framework.Test]
149-
[Ignore("DEVSIX-1668")]
150-
public void ResourceResolverTest12() {
151-
String baseUri = sourceFolder + "path with spaces";
219+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
220+
public void ResourceResolverTest12B()
221+
{
222+
String baseUri = sourceFolder + "path%25with%25spaces/";
152223

153-
String outPdf = destinationFolder + "resourceResolverTest12.pdf";
154-
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12.pdf";
224+
String outPdf = destinationFolder + "resourceResolverTest12B.pdf";
225+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12B.pdf";
155226
using (
156-
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12.html", FileMode.Open,
157-
FileAccess.Read),
158-
fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
227+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12B.html", FileMode.Open,
228+
FileAccess.Read),
229+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
230+
{
231+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
232+
new ConverterProperties().SetBaseUri(baseUri));
233+
NUnit.Framework.Assert.IsNull(
234+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12B_"));
235+
}
236+
}
237+
238+
[NUnit.Framework.Test]
239+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
240+
public void ResourceResolverTest12C()
241+
{
242+
String baseUri = sourceFolder + "path%2525with%2525spaces/";
243+
244+
String outPdf = destinationFolder + "resourceResolverTest12C.pdf";
245+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12C.pdf";
246+
using (
247+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12C.html", FileMode.Open,
248+
FileAccess.Read),
249+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
250+
{
251+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
252+
new ConverterProperties().SetBaseUri(baseUri));
253+
NUnit.Framework.Assert.IsNull(
254+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12C_"));
255+
}
256+
}
257+
258+
[NUnit.Framework.Test]
259+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
260+
public void ResourceResolverTest12D()
261+
{
262+
String baseUri = sourceFolder + "path with spaces/";
263+
264+
String outPdf = destinationFolder + "resourceResolverTest12D.pdf";
265+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12D.pdf";
266+
using (
267+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12D.html", FileMode.Open,
268+
FileAccess.Read),
269+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
270+
{
159271
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
160272
new ConverterProperties().SetBaseUri(baseUri));
161273
NUnit.Framework.Assert.IsNull(
162-
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12_"));
274+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12D_"));
275+
}
276+
}
277+
278+
[NUnit.Framework.Test]
279+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
280+
public void ResourceResolverTest12E()
281+
{
282+
String baseUri = sourceFolder + "path%20with%20spaces/";
283+
284+
String outPdf = destinationFolder + "resourceResolverTest12E.pdf";
285+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12E.pdf";
286+
using (
287+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12E.html", FileMode.Open,
288+
FileAccess.Read),
289+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
290+
{
291+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
292+
new ConverterProperties().SetBaseUri(baseUri));
293+
NUnit.Framework.Assert.IsNull(
294+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12E_"));
295+
}
296+
}
297+
298+
[NUnit.Framework.Test]
299+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
300+
public void ResourceResolverTest12F()
301+
{
302+
String baseUri = sourceFolder + "path%2520with%2520spaces/";
303+
304+
String outPdf = destinationFolder + "resourceResolverTest12F.pdf";
305+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest12F.pdf";
306+
using (
307+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12F.html", FileMode.Open,
308+
FileAccess.Read),
309+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
310+
{
311+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
312+
new ConverterProperties().SetBaseUri(baseUri));
313+
NUnit.Framework.Assert.IsNull(
314+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12F_"));
163315
}
164316
}
165317

@@ -216,6 +368,85 @@ public void ResourceResolverTest15() {
216368
}
217369
}
218370

371+
[NUnit.Framework.Test]
372+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
373+
public void ResourceResolverTest16A()
374+
{
375+
String baseUri = sourceFolder + "path/with/spaces/";
376+
377+
String outPdf = destinationFolder + "resourceResolverTest16A.pdf";
378+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest16A.pdf";
379+
using (
380+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest16A.html", FileMode.Open,
381+
FileAccess.Read),
382+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
383+
{
384+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
385+
new ConverterProperties().SetBaseUri(baseUri));
386+
NUnit.Framework.Assert.IsNull(
387+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff16A_"));
388+
}
389+
}
390+
391+
[NUnit.Framework.Test]
392+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
393+
public void ResourceResolverTest16B()
394+
{
395+
String baseUri = sourceFolder + "path%2Fwith%2Fspaces/";
396+
397+
String outPdf = destinationFolder + "resourceResolverTest16B.pdf";
398+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest16B.pdf";
399+
using (
400+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest16B.html", FileMode.Open,
401+
FileAccess.Read),
402+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
403+
{
404+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
405+
new ConverterProperties().SetBaseUri(baseUri));
406+
NUnit.Framework.Assert.IsNull(
407+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff16B_"));
408+
}
409+
}
410+
411+
[NUnit.Framework.Test]
412+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
413+
public void ResourceResolverTest16C()
414+
{
415+
String baseUri = sourceFolder + "path%252Fwith%252Fspaces/";
416+
417+
String outPdf = destinationFolder + "resourceResolverTest16C.pdf";
418+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest16C.pdf";
419+
using (
420+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest16C.html", FileMode.Open,
421+
FileAccess.Read),
422+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
423+
{
424+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
425+
new ConverterProperties().SetBaseUri(baseUri));
426+
NUnit.Framework.Assert.IsNull(
427+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff16C_"));
428+
}
429+
}
430+
431+
[NUnit.Framework.Test]
432+
[LogMessage(iText.Html2pdf.LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 1)]
433+
public void ResourceResolverTest16D()
434+
{
435+
String baseUri = sourceFolder + "path%25252Fwith%25252Fspaces/";
436+
437+
String outPdf = destinationFolder + "resourceResolverTest16D.pdf";
438+
String cmpPdf = sourceFolder + "cmp_resourceResolverTest16D.pdf";
439+
using (
440+
FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest16D.html", FileMode.Open,
441+
FileAccess.Read),
442+
fileOutputStream = new FileStream(outPdf, FileMode.Create))
443+
{
444+
HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
445+
new ConverterProperties().SetBaseUri(baseUri));
446+
NUnit.Framework.Assert.IsNull(
447+
new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff16D_"));
448+
}
449+
}
219450

220451
// TODO test with absolute http links for resources?
221452
// TODO test with http base URI?

0 commit comments

Comments
 (0)