Skip to content

Commit 7e73e86

Browse files
Alexandr PliushchouiText-CI
Alexandr Pliushchou
authored and
iText-CI
committed
Fix 50 bugs on SonarQube
DEVSIX-8878 Autoported commit. Original commit hash: [c10a3c2d9]
1 parent 0b22286 commit 7e73e86

File tree

19 files changed

+142
-138
lines changed

19 files changed

+142
-138
lines changed

‎itext.tests/itext.forms.tests/itext/forms/PdfAcroFormTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,11 @@ public virtual void AddRootFieldWithMergedFieldKidTest() {
343343
firstField.AddKid(mergedField);
344344
acroForm.AddField(firstField);
345345
NUnit.Framework.Assert.AreEqual(1, acroForm.GetFields().Size());
346-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetField("root").GetKids().Size());
347-
NUnit.Framework.Assert.IsTrue(PdfFormAnnotationUtil.IsPureWidgetOrMergedField((PdfDictionary)acroForm.GetField
348-
("root").GetKids().Get(0)));
349-
NUnit.Framework.Assert.IsFalse(PdfFormAnnotationUtil.IsPureWidget((PdfDictionary)acroForm.GetField("root")
350-
.GetKids().Get(0)));
346+
PdfArray kids = acroForm.GetField("root").GetKids();
347+
NUnit.Framework.Assert.AreEqual(1, kids.Size());
348+
PdfObject firstKid = kids.Get(0);
349+
NUnit.Framework.Assert.IsTrue(PdfFormAnnotationUtil.IsPureWidgetOrMergedField((PdfDictionary)firstKid));
350+
NUnit.Framework.Assert.IsFalse(PdfFormAnnotationUtil.IsPureWidget((PdfDictionary)firstKid));
351351
}
352352
}
353353

‎itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTextTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public virtual void FontsResourcesHelvCourierNotoFontTest() {
110110
(destinationFolder + filename));
111111
PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "NotoSans-Regular.ttf", PdfEncodings.IDENTITY_H);
112112
font.SetSubset(false);
113-
PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, false);
114-
form.GetField("description").SetFont(font);
115-
form.GetField("description").SetValue(TEXT);
113+
PdfFormField formField = PdfFormCreator.GetAcroForm(pdfDoc, false).GetField("description");
114+
formField.SetFont(font);
115+
formField.SetValue(TEXT);
116116
pdfDoc.Close();
117117
PdfDocument document = new PdfDocument(new PdfReader(destinationFolder + filename));
118118
// Note that we know the structure of the expected pdf file

‎itext.tests/itext.forms.tests/itext/forms/fields/RadioFormFieldBuilderTest.cs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,21 @@ private static void CompareRadioButtons(PdfFormAnnotation radioButtonFormField,
236236
, PdfDocument pdfDoc, bool isAddedToRadioGroup) {
237237
PdfDictionary expectedDictionary = new PdfDictionary();
238238
IList<PdfWidgetAnnotation> widgets = new List<PdfWidgetAnnotation>();
239-
if (radioButtonFormField.GetWidget() != null) {
240-
widgets.Add(radioButtonFormField.GetWidget());
241-
}
242-
// if a rectangle is assigned in the builder than we should check it
243-
if (radioButtonFormField.GetWidget().GetRectangle() != null && radioButtonFormField.GetWidget().GetRectangle
244-
().ToRectangle() != null) {
245-
NUnit.Framework.Assert.AreEqual(1, widgets.Count);
246-
PdfWidgetAnnotation annotation = widgets[0];
247-
NUnit.Framework.Assert.IsTrue(DUMMY_RECTANGLE.EqualsWithEpsilon(annotation.GetRectangle().ToRectangle()));
248-
PutIfAbsent(expectedDictionary, PdfName.Rect, new PdfArray(DUMMY_RECTANGLE));
249-
// if the radiobutton has been added to the radiogroup we expect the AP to be generated
250-
if (isAddedToRadioGroup) {
251-
PutIfAbsent(expectedDictionary, PdfName.AP, radioButtonFormField.GetPdfObject().GetAsDictionary(PdfName.AP
252-
));
239+
PdfWidgetAnnotation buttonWidget = radioButtonFormField.GetWidget();
240+
if (buttonWidget != null) {
241+
widgets.Add(buttonWidget);
242+
// if a rectangle is assigned in the builder than we should check it
243+
PdfArray buttonWidgetRectangle = buttonWidget.GetRectangle();
244+
if (buttonWidgetRectangle != null && buttonWidgetRectangle.ToRectangle() != null) {
245+
NUnit.Framework.Assert.AreEqual(1, widgets.Count);
246+
PdfWidgetAnnotation annotation = widgets[0];
247+
NUnit.Framework.Assert.IsTrue(DUMMY_RECTANGLE.EqualsWithEpsilon(annotation.GetRectangle().ToRectangle()));
248+
PutIfAbsent(expectedDictionary, PdfName.Rect, new PdfArray(DUMMY_RECTANGLE));
249+
// if the radiobutton has been added to the radiogroup we expect the AP to be generated
250+
if (isAddedToRadioGroup) {
251+
PutIfAbsent(expectedDictionary, PdfName.AP, radioButtonFormField.GetPdfObject().GetAsDictionary(PdfName.AP
252+
));
253+
}
253254
}
254255
}
255256
if (radioButtonFormField.pdfConformance != null && radioButtonFormField.pdfConformance.IsPdfAOrUa()) {

‎itext.tests/itext.layout.tests/itext/layout/ImageTest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,8 +768,9 @@ public virtual void CreateTiffImageTest() {
768768
PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
769769
Document document = new Document(pdfDoc);
770770
ImageData id = ImageDataFactory.Create(imgPath);
771-
ImageData idAsTiff = ImageDataFactory.CreateTiff(UrlUtil.ToURL(imgPath), true, 1, true);
772-
ImageData idAsTiffFalse = ImageDataFactory.CreateTiff(UrlUtil.ToURL(imgPath), false, 1, false);
771+
Uri imageURL = UrlUtil.ToURL(imgPath);
772+
ImageData idAsTiff = ImageDataFactory.CreateTiff(imageURL, true, 1, true);
773+
ImageData idAsTiffFalse = ImageDataFactory.CreateTiff(imageURL, false, 1, false);
773774
document.Add(new iText.Layout.Element.Image(id));
774775
document.Add(new iText.Layout.Element.Image(idAsTiff));
775776
document.Add(new iText.Layout.Element.Image(idAsTiffFalse));

‎itext.tests/itext.layout.tests/itext/layout/LayoutTaggingPdf2Test.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,14 @@ public virtual void CustomRolesMappingPdf17() {
149149
html4Ns.AddNamespaceRoleMapping(LayoutTaggingPdf2Test.HtmlRoles.center, LayoutTaggingPdf2Test.HtmlRoles.center
150150
, xhtmlNs);
151151
// test some tricky mapping cases
152-
pdfDocument.GetStructTreeRoot().AddRoleMapping(h9, h1);
153-
pdfDocument.GetStructTreeRoot().AddRoleMapping(h1, h1);
154-
pdfDocument.GetStructTreeRoot().AddRoleMapping("Center", StandardRoles.P);
155-
pdfDocument.GetStructTreeRoot().AddRoleMapping("I", StandardRoles.SPAN);
156-
pdfDocument.GetTagStructureContext().SetDocumentDefaultNamespace(null);
157-
pdfDocument.GetTagStructureContext().GetAutoTaggingPointer().SetNamespaceForNewTags(xhtmlNs);
152+
PdfStructTreeRoot structTreeRoot = pdfDocument.GetStructTreeRoot();
153+
structTreeRoot.AddRoleMapping(h9, h1);
154+
structTreeRoot.AddRoleMapping(h1, h1);
155+
structTreeRoot.AddRoleMapping("Center", StandardRoles.P);
156+
structTreeRoot.AddRoleMapping("I", StandardRoles.SPAN);
157+
TagStructureContext tagStructureContext = pdfDocument.GetTagStructureContext();
158+
tagStructureContext.SetDocumentDefaultNamespace(null);
159+
tagStructureContext.GetAutoTaggingPointer().SetNamespaceForNewTags(xhtmlNs);
158160
Document document = new Document(pdfDocument);
159161
AddContentToDocInCustomNs(pdfDocument, null, xhtmlNs, html4Ns, h1, document);
160162
document.Close();

‎itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2GraphicsCheckTest.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ You should have received a copy of the GNU Affero General Public License
2727
using iText.IO.Source;
2828
using iText.Kernel.Colors;
2929
using iText.Kernel.Font;
30+
using iText.Kernel.Geom;
3031
using iText.Kernel.Pdf;
3132
using iText.Kernel.Pdf.Canvas;
3233
using iText.Kernel.Pdf.Colorspace;
@@ -106,9 +107,10 @@ public virtual void ColorCheckTest3() {
106107
PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent);
107108
PdfCanvas canvas = new PdfCanvas(doc.AddNewPage());
108109
canvas.SetFillColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f));
109-
canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom());
110-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetBottom());
111-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetTop());
110+
PageSize defaultSize = doc.GetDefaultPageSize();
111+
canvas.MoveTo(defaultSize.GetLeft(), defaultSize.GetBottom());
112+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetBottom());
113+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetTop());
112114
canvas.Fill();
113115
Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close());
114116
NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.DEVICECMYK_MAY_BE_USED_ONLY_IF_THE_FILE_HAS_A_CMYK_PDFA_OUTPUT_INTENT_OR_DEFAULTCMYK_IN_USAGE_CONTEXT
@@ -118,7 +120,6 @@ public virtual void ColorCheckTest3() {
118120
[NUnit.Framework.Test]
119121
public virtual void ColorCheckTest4() {
120122
String outPdf = destinationFolder + "pdfA2b_colorCheckTest4.pdf";
121-
String cmpPdf = cmpFolder + "cmp_pdfA2b_colorCheckTest4.pdf";
122123
PdfWriter writer = new PdfWriter(outPdf);
123124
Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm");
124125
PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
@@ -127,14 +128,15 @@ public virtual void ColorCheckTest4() {
127128
PdfCanvas canvas = new PdfCanvas(doc.AddNewPage());
128129
canvas.SetFillColor(ColorConstants.BLUE);
129130
canvas.SetStrokeColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f));
130-
canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom());
131-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetBottom());
132-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetTop());
131+
PageSize defaultSize = doc.GetDefaultPageSize();
132+
canvas.MoveTo(defaultSize.GetLeft(), defaultSize.GetBottom());
133+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetBottom());
134+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetTop());
133135
canvas.Fill();
134136
canvas.SetFillColor(DeviceGray.BLACK);
135-
canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom());
136-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetBottom());
137-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetTop());
137+
canvas.MoveTo(defaultSize.GetLeft(), defaultSize.GetBottom());
138+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetBottom());
139+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetTop());
138140
canvas.Fill();
139141
Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close());
140142
NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.DEVICECMYK_MAY_BE_USED_ONLY_IF_THE_FILE_HAS_A_CMYK_PDFA_OUTPUT_INTENT_OR_DEFAULTCMYK_IN_USAGE_CONTEXT

‎itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ public virtual void ColorCheckTest4() {
311311
[NUnit.Framework.Test]
312312
public virtual void ColorCheckTest5() {
313313
String outPdf = DESTINATION_FOLDER + "pdfA4_colorCheckTest5.pdf";
314-
String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colorCheckTest5.pdf";
315314
PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0));
316315
Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm");
317316
PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
@@ -323,14 +322,15 @@ public virtual void ColorCheckTest5() {
323322
PdfCanvas canvas = new PdfCanvas(page);
324323
canvas.SetFillColor(ColorConstants.BLUE);
325324
canvas.SetStrokeColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f));
326-
canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom());
327-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetBottom());
328-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetTop());
325+
PageSize defaultSize = doc.GetDefaultPageSize();
326+
canvas.MoveTo(defaultSize.GetLeft(), defaultSize.GetBottom());
327+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetBottom());
328+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetTop());
329329
canvas.Fill();
330330
canvas.SetFillColor(DeviceGray.BLACK);
331-
canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom());
332-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetBottom());
333-
canvas.LineTo(doc.GetDefaultPageSize().GetRight(), doc.GetDefaultPageSize().GetTop());
331+
canvas.MoveTo(defaultSize.GetLeft(), defaultSize.GetBottom());
332+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetBottom());
333+
canvas.LineTo(defaultSize.GetRight(), defaultSize.GetTop());
334334
canvas.Fill();
335335
// Here we use RGB and CMYK at the same time. And only page output intent is taken into account not both.
336336
// So it throws on device RGB color.

‎itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/jsoup/nodes/DocumentTest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,9 @@ public virtual void TestMetaCharsetUpdatedDisabledPerDefault() {
344344

345345
private Document CreateHtmlDocument(String charset) {
346346
Document doc = Document.CreateShell("");
347-
doc.Head().AppendElement("meta").Attr("charset", charset);
348-
doc.Head().AppendElement("meta").Attr("name", "charset").Attr("content", charset);
347+
iText.StyledXmlParser.Jsoup.Nodes.Element docHead = doc.Head();
348+
docHead.AppendElement("meta").Attr("charset", charset);
349+
docHead.AppendElement("meta").Attr("name", "charset").Attr("content", charset);
349350
return doc;
350351
}
351352

‎itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/jsoup/nodes/ElementItTest.cs‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ It may contain modifications beyond the original version.
55
using System;
66
using System.Collections.Generic;
77
using System.Text;
8+
using iText.StyledXmlParser.Jsoup.Select;
89
using iText.Test;
910

1011
namespace iText.StyledXmlParser.Jsoup.Nodes {
@@ -30,10 +31,10 @@ public virtual void TestFastReparent() {
3031
NUnit.Framework.Assert.AreEqual(0, doc.Body().ChildNodes().Count);
3132
// but on a fresh look, all gone
3233
((iText.StyledXmlParser.Jsoup.Nodes.Element)doc.Body().Empty()).AppendChild(wrapper);
33-
iText.StyledXmlParser.Jsoup.Nodes.Element wrapperAcutal = doc.Body().Children()[0];
34-
NUnit.Framework.Assert.AreEqual(wrapper, wrapperAcutal);
35-
NUnit.Framework.Assert.AreEqual("El-1", wrapperAcutal.Children()[0].Text());
36-
NUnit.Framework.Assert.AreEqual("El-" + rows, wrapperAcutal.Children()[rows - 1].Text());
34+
iText.StyledXmlParser.Jsoup.Nodes.Element wrapperActual = doc.Body().Children()[0];
35+
NUnit.Framework.Assert.AreEqual(wrapper, wrapperActual);
36+
NUnit.Framework.Assert.AreEqual("El-1", wrapperActual.Children()[0].Text());
37+
NUnit.Framework.Assert.AreEqual("El-" + rows, wrapperActual.Children()[rows - 1].Text());
3738
NUnit.Framework.Assert.IsTrue(runtime <= 1000);
3839
}
3940

@@ -51,21 +52,23 @@ public virtual void TestFastReparentExistingContent() {
5152
wrapper.Append("<p>Prior Content</p>");
5253
wrapper.Append("<p>End Content</p>");
5354
NUnit.Framework.Assert.AreEqual(2, wrapper.childNodes.Count);
54-
IList<iText.StyledXmlParser.Jsoup.Nodes.Node> childNodes = doc.Body().ChildNodes();
55+
iText.StyledXmlParser.Jsoup.Nodes.Element docBody = doc.Body();
56+
IList<iText.StyledXmlParser.Jsoup.Nodes.Node> childNodes = docBody.ChildNodes();
5557
wrapper.InsertChildren(1, childNodes);
5658
long runtime = (System.DateTime.Now.Ticks - start) / 1000000;
5759
NUnit.Framework.Assert.AreEqual(rows + 2, wrapper.childNodes.Count);
5860
NUnit.Framework.Assert.AreEqual(rows, childNodes.Count);
5961
// child nodes is a wrapper, so still there
60-
NUnit.Framework.Assert.AreEqual(0, doc.Body().ChildNodes().Count);
62+
NUnit.Framework.Assert.AreEqual(0, docBody.ChildNodes().Count);
6163
// but on a fresh look, all gone
62-
((iText.StyledXmlParser.Jsoup.Nodes.Element)doc.Body().Empty()).AppendChild(wrapper);
64+
((iText.StyledXmlParser.Jsoup.Nodes.Element)docBody.Empty()).AppendChild(wrapper);
6365
iText.StyledXmlParser.Jsoup.Nodes.Element wrapperAcutal = doc.Body().Children()[0];
6466
NUnit.Framework.Assert.AreEqual(wrapper, wrapperAcutal);
65-
NUnit.Framework.Assert.AreEqual("Prior Content", wrapperAcutal.Children()[0].Text());
66-
NUnit.Framework.Assert.AreEqual("El-1", wrapperAcutal.Children()[1].Text());
67-
NUnit.Framework.Assert.AreEqual("El-" + rows, wrapperAcutal.Children()[rows].Text());
68-
NUnit.Framework.Assert.AreEqual("End Content", wrapperAcutal.Children()[rows + 1].Text());
67+
Elements children = wrapperAcutal.Children();
68+
NUnit.Framework.Assert.AreEqual("Prior Content", children[0].Text());
69+
NUnit.Framework.Assert.AreEqual("El-1", children[1].Text());
70+
NUnit.Framework.Assert.AreEqual("El-" + rows, children[rows].Text());
71+
NUnit.Framework.Assert.AreEqual("End Content", children[rows + 1].Text());
6972
NUnit.Framework.Assert.IsTrue(runtime <= 1000);
7073
}
7174
}

0 commit comments

Comments
 (0)