Merge branch 'develop' into devsecops

aleks-ivanov · Nov 4, 2023 · 3b594df · 3b594df
2 parents 8576b35 + 5a1b059
commit 3b594df
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 1 deletion.
diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/xobject/GetImageBytesTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/xobject/GetImageBytesTest.cs
@@ -169,6 +169,7 @@ public virtual void TestRGBSeparationCSWithDCTDecoderAndFunctionType0() {
 
         [NUnit.Framework.Test]
         public virtual void TestRGBSeparationCSWithFlateDecoderAndFunctionType0() {
+            // Android-Conversion-Ignore-Test (TODO DEVSIX-6445 fix different DeflaterOutputStream behavior)
             TestFile("RGBFlateF0.pdf", "Im1", "png");
         }
 

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs
@@ -35,6 +35,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA1AnnotationCheckTest : ExtendedITextTest {
         public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs
@@ -37,6 +37,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA2AnnotationCheckTest : ExtendedITextTest {
         public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs
@@ -29,6 +29,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA2OCPropertiesTest : ExtendedITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs
@@ -37,6 +37,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA4ActionCheckTest : ExtendedITextTest {
         private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs
@@ -40,6 +40,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA4GraphicsCheckTest : ExtendedITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs
@@ -28,6 +28,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA4MiscCheckTest : ExtendedITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs
@@ -39,6 +39,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfA4TransparencyCheckTest : ExtendedITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs
@@ -46,6 +46,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfAFormFieldTest : ExtendedITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
@@ -127,6 +128,7 @@ public virtual void PdfA1DocWithPdfA1ButtonFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1DocWithPdfA1CheckBoxFieldTest() {
             String name = "pdfA1DocWithPdfA1CheckBoxField";
@@ -174,6 +176,7 @@ public virtual void PdfA1DocWithPdfA1ChoiceFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1DocWithPdfA1ComboBoxFieldTest() {
             String name = "pdfA1DocWithPdfA1ComboBoxField";
@@ -197,6 +200,7 @@ public virtual void PdfA1DocWithPdfA1ComboBoxFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         [LogMessage(iText.IO.Logs.IoLogMessageConstant.MULTIPLE_VALUES_ON_A_NON_MULTISELECT_FIELD)]
         public virtual void PdfA1DocWithPdfA1ListFieldTest() {
@@ -224,6 +228,7 @@ public virtual void PdfA1DocWithPdfA1ListFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1DocWithPdfA1PushButtonFieldTest() {
             String name = "pdfA1DocWithPdfA1PushButtonField";
@@ -247,6 +252,7 @@ public virtual void PdfA1DocWithPdfA1PushButtonFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1DocWithPdfA1RadioButtonFieldTest() {
             String name = "pdfA1DocWithPdfA1RadioButtonField";
@@ -300,6 +306,7 @@ public virtual void PdfA1DocWithPdfA1TextFieldTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1DocWithPdfA1SignatureFieldTest() {
             String name = "pdfA1DocWithPdfA1SignatureField";
@@ -359,6 +366,7 @@ public virtual void MergePdfADocWithFormTest() {
             pdfDocToMerge.Close();
             String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_mergePdfADocWithForm.pdf";
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(mergedDocFileName));
+            // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(mergedDocFileName, cmp, DESTINATION_FOLDER
                 , "diff_"));
         }
@@ -470,6 +478,7 @@ public virtual void TestMultipleCombinationsWriteAndReload() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPdf2));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void TestMultipleCombinationsOnDocument() {
             String outPdf = DESTINATION_FOLDER + "testMultipleCombinationsOnDocument.pdf";
@@ -538,6 +547,7 @@ private void MakePdfDocument(String outPdf, String cmp, Action<Document> consume
                 return;
             }
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPdf));
+            // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmp, DESTINATION_FOLDER));
         }
 

diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs
@@ -32,6 +32,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Test.Pdfa;
 
 namespace iText.Pdfa {
+    // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     [NUnit.Framework.Category("IntegrationTest")]
     public class PdfAPushbuttonfieldTest : ExtendedITextTest {
         public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
@@ -76,6 +77,7 @@ public virtual void PdfA1bButtonAppearanceTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPath));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1bButtonAppearanceRegenerateTest() {
             String name = "pdfA1b_ButtonAppearanceRegenerateTest";
@@ -105,6 +107,7 @@ public virtual void PdfA1bButtonAppearanceRegenerateTest() {
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPath));
         }
 
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
         [NUnit.Framework.Test]
         public virtual void PdfA1bButtonAppearanceSetValueTest() {
             String name = "pdfA1b_ButtonAppearanceSetValueTest";
@@ -133,5 +136,6 @@ public virtual void PdfA1bButtonAppearanceSetValueTest() {
                 ));
             NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPath));
         }
+        // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
     }
 }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-905315be861e991e563bb2785adb33575c116f21
+a004864c760befa08e84d9b5932855f9085eb828
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		905315be861e991e563bb2785adb33575c116f21
		a004864c760befa08e84d9b5932855f9085eb828