diff --git a/BUILDING.md b/BUILDING.md index 51c3510b2c..d7e407adc3 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,3 +1,6 @@ + +# Building and testing **iText Community** + To build **iText Community**, you need to build `itextsharp/itextcore/iTextCore.sln`. To run tests, [Ghostscript][1] and [Imagemagick][2] must be installed. Some of the tests compare generated PDF files with template files that show the correct results, and these tools are used to @@ -14,5 +17,17 @@ environment variables. Examples of paths on Windows: If you have a new version of ImageMagick, then there is no compare.exe utility there, wrap the path to magick.exe in quotes and call compare command: ITEXT_MAGICK_COMPARE_EXEC=`"C:\Program Files\ImageMagick-7.0.9-Q16\magick.exe" compare` + +# Deploying iText + +When using **iText Community** in a project and want to deploy it you have to consider a few things for different deployments. + +- **FrameworkDependend**: No additional parameters are required. +- **SelfContained**: No additional parameters are required. +- **PublishSingleFile**: When using `-p:PublishSingleFile=true` you will also need to add `-p:IncludeAllContentForSelfExtract=true`. This is important when using `hyph` or `font-asian` modules. +- **AssemblyTrimming**: Using `-p:PublishTrimmed=true` is currently not supported. + + + [1]: https://www.ghostscript.com/ -[2]: https://www.imagemagick.org/ \ No newline at end of file +[2]: https://www.imagemagick.org/ diff --git a/itext.tests/itext.forms.tests/itext/forms/PdfChoiceFieldTest.cs b/itext.tests/itext.forms.tests/itext/forms/PdfChoiceFieldTest.cs index 31b7cbfa43..364383b52e 100644 --- a/itext.tests/itext.forms.tests/itext/forms/PdfChoiceFieldTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/PdfChoiceFieldTest.cs @@ -56,27 +56,27 @@ public virtual void ChoiceFieldsWithUnicodeTest() { pdfDoc.AddNewPage(); // 规 PdfFormField field = new ChoiceFormFieldBuilder(pdfDoc, "combo1").SetWidgetRectangle(new Rectangle(36, 666 - , 40, 80)).SetOptions(new String[] { "\u89c4", "\u89c9" }).SetConformanceLevel(null).CreateComboBox(). - SetValue("\u89c4"); + , 40, 80)).SetOptions(new String[] { "\u89c4", "\u89c9" }).SetConformance(null).CreateComboBox().SetValue + ("\u89c4"); field.SetFont(font); field.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); form.AddField(field); // 觉 field = new ChoiceFormFieldBuilder(pdfDoc, "combo2").SetWidgetRectangle(new Rectangle(136, 666, 40, 80)).SetOptions - (new String[] { "\u89c4", "\u89c9" }).SetConformanceLevel(null).CreateComboBox(); + (new String[] { "\u89c4", "\u89c9" }).SetConformance(null).CreateComboBox(); field.SetValue("\u89c4").SetFont(font); field.SetValue("\u89c9"); field.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); form.AddField(field); // 规 field = new ChoiceFormFieldBuilder(pdfDoc, "list1").SetWidgetRectangle(new Rectangle(236, 666, 50, 80)).SetOptions - (new String[] { "\u89c4", "\u89c9" }).SetConformanceLevel(null).CreateList().SetValue("\u89c4"); + (new String[] { "\u89c4", "\u89c9" }).SetConformance(null).CreateList().SetValue("\u89c4"); field.SetFont(font); field.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); form.AddField(field); // 觉 field = new ChoiceFormFieldBuilder(pdfDoc, "list2").SetWidgetRectangle(new Rectangle(336, 666, 50, 80)).SetOptions - (new String[] { "\u89c4", "\u89c9" }).SetConformanceLevel(null).CreateList(); + (new String[] { "\u89c4", "\u89c9" }).SetConformance(null).CreateList(); field.SetValue("\u89c4").SetFont(font); field.SetValue("\u89c9"); field.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); @@ -146,7 +146,7 @@ public virtual void MultiSelectByValueTest() { document.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(document, true); PdfChoiceFormField choice = (PdfChoiceFormField)new ChoiceFormFieldBuilder(document, "choice").SetWidgetRectangle - (new Rectangle(336, 666, 50, 80)).SetOptions(new String[] { "one", "two", "three", "four" }).SetConformanceLevel + (new Rectangle(336, 666, 50, 80)).SetOptions(new String[] { "one", "two", "three", "four" }).SetConformance (null).CreateList().SetValue("two").SetFont(null); choice.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); choice.SetMultiSelect(true); diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/CheckBoxFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/CheckBoxFormFieldBuilderTest.cs index f87555b2b0..83ed6992b7 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/CheckBoxFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/CheckBoxFormFieldBuilderTest.cs @@ -70,7 +70,7 @@ public virtual void CreateCheckBoxWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateCheckBoxWithConformanceLevelTest() { PdfButtonFormField checkBoxFormField = new CheckBoxFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle - (DUMMY_RECTANGLE).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateCheckBox(); + (DUMMY_RECTANGLE).SetConformance(PdfConformance.PDF_A_1A).CreateCheckBox(); CompareCheckBoxes(checkBoxFormField, true); } diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/ChoiceFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/ChoiceFormFieldBuilderTest.cs index 618df94428..6a34255c23 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/ChoiceFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/ChoiceFormFieldBuilderTest.cs @@ -110,7 +110,7 @@ public virtual void CreateComboBoxWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateComboBoxWithConformanceLevelTest() { PdfChoiceFormField choiceFormField = new ChoiceFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle - (DUMMY_RECTANGLE).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateComboBox(); + (DUMMY_RECTANGLE).SetConformance(PdfConformance.PDF_A_1A).CreateComboBox(); CompareChoices(new PdfDictionary(), choiceFormField, true); } @@ -150,7 +150,7 @@ public virtual void CreateListWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateListWithConformanceLevelTest() { PdfChoiceFormField choiceFormField = new ChoiceFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle - (DUMMY_RECTANGLE).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateList(); + (DUMMY_RECTANGLE).SetConformance(PdfConformance.PDF_A_1A).CreateList(); PdfDictionary expectedDictionary = new PdfDictionary(); expectedDictionary.Put(PdfName.Ff, new PdfNumber(0)); CompareChoices(expectedDictionary, choiceFormField, true); diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/FormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/FormFieldBuilderTest.cs index f46bd9d142..8802b8d47b 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/FormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/FormFieldBuilderTest.cs @@ -44,16 +44,16 @@ public virtual void ConstructorTest() { public virtual void GetSetConformanceLevelTest() { FormFieldBuilderTest.TestBuilder builder = new FormFieldBuilderTest.TestBuilder(DUMMY_DOCUMENT, DUMMY_NAME ); - builder.SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A); - NUnit.Framework.Assert.AreSame(PdfAConformanceLevel.PDF_A_1A, builder.GetConformanceLevel()); + builder.SetConformance(PdfConformance.PDF_A_1A); + NUnit.Framework.Assert.AreSame(PdfAConformance.PDF_A_1A, builder.GetConformance().GetAConformance()); } [NUnit.Framework.Test] public virtual void GetSetConformanceLevelPdfUATest() { FormFieldBuilderTest.TestBuilder builder = new FormFieldBuilderTest.TestBuilder(DUMMY_DOCUMENT, DUMMY_NAME ); - builder.SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1); - NUnit.Framework.Assert.AreSame(PdfUAConformanceLevel.PDFUA_1, builder.GetConformanceLevel()); + builder.SetConformance(PdfConformance.PDF_UA_1); + NUnit.Framework.Assert.AreSame(PdfUAConformance.PDF_UA_1, builder.GetConformance().GetUAConformance()); } private class TestBuilder : FormFieldBuilder { diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/PushButtonFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/PushButtonFormFieldBuilderTest.cs index aea1a86c96..547338a8e6 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/PushButtonFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/PushButtonFormFieldBuilderTest.cs @@ -69,7 +69,7 @@ public virtual void CreatePushButtonWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreatePushButtonWithConformanceLevelTest() { PdfButtonFormField pushButtonFormField = new PushButtonFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle - (DUMMY_RECTANGLE).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreatePushButton(); + (DUMMY_RECTANGLE).SetConformance(PdfConformance.PDF_A_1A).CreatePushButton(); ComparePushButtons(pushButtonFormField, true); } diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/RadioFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/RadioFormFieldBuilderTest.cs index ee9b742aac..1fa7e95018 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/RadioFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/RadioFormFieldBuilderTest.cs @@ -149,8 +149,8 @@ public virtual void CreateRadioButtonWithoutWidgetThrowsExceptionTest() { public virtual void CreateRadioButtonWithConformanceLevelTest() { RadioFormFieldBuilder builder = new RadioFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME); PdfButtonFormField radioGroup = builder.CreateRadioGroup(); - PdfFormAnnotation radioAnnotation = builder.SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateRadioButton - (DUMMY_APPEARANCE_NAME, DUMMY_RECTANGLE); + PdfFormAnnotation radioAnnotation = builder.SetConformance(PdfConformance.PDF_A_1A).CreateRadioButton(DUMMY_APPEARANCE_NAME + , DUMMY_RECTANGLE); CompareRadioButtons(radioAnnotation, radioGroup, false); } @@ -158,8 +158,8 @@ public virtual void CreateRadioButtonWithConformanceLevelTest() { public virtual void CreateRadioButtonWithConformanceLevelAddedToGroupTest() { RadioFormFieldBuilder builder = new RadioFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME); PdfButtonFormField radioGroup = builder.CreateRadioGroup(); - PdfFormAnnotation radioAnnotation = builder.SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateRadioButton - (DUMMY_APPEARANCE_NAME, DUMMY_RECTANGLE); + PdfFormAnnotation radioAnnotation = builder.SetConformance(PdfConformance.PDF_A_1A).CreateRadioButton(DUMMY_APPEARANCE_NAME + , DUMMY_RECTANGLE); radioGroup.AddKid(radioAnnotation); CompareRadioButtons(radioAnnotation, radioGroup, true); } @@ -235,7 +235,7 @@ private static void CompareRadioButtons(PdfFormAnnotation radioButtonFormField, )); } } - if (radioButtonFormField.pdfConformanceLevel != null) { + if (radioButtonFormField.pdfConformance != null && radioButtonFormField.pdfConformance.IsPdfAOrUa()) { PutIfAbsent(expectedDictionary, PdfName.F, new PdfNumber(PdfAnnotation.PRINT)); } // for the AS key if it's added to the group we expect it to be off or the value if the radiogroup was selected diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/SignatureFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/SignatureFormFieldBuilderTest.cs index e57ba3dc11..a0fb0b6f52 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/SignatureFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/SignatureFormFieldBuilderTest.cs @@ -62,7 +62,7 @@ public virtual void CreateSignatureWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateSignatureWithConformanceLevelTest() { PdfSignatureFormField signatureFormField = new SignatureFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle - (DUMMY_RECTANGLE).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateSignature(); + (DUMMY_RECTANGLE).SetConformance(PdfConformance.PDF_A_1A).CreateSignature(); CompareSignatures(signatureFormField, true); } diff --git a/itext.tests/itext.forms.tests/itext/forms/fields/TextFormFieldBuilderTest.cs b/itext.tests/itext.forms.tests/itext/forms/fields/TextFormFieldBuilderTest.cs index 31986644a4..ff9655fa67 100644 --- a/itext.tests/itext.forms.tests/itext/forms/fields/TextFormFieldBuilderTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/fields/TextFormFieldBuilderTest.cs @@ -65,7 +65,7 @@ public virtual void CreateTextWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateTextWithConformanceLevelTest() { PdfTextFormField textFormField = new TextFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle(DUMMY_RECTANGLE - ).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateText(); + ).SetConformance(PdfConformance.PDF_A_1A).CreateText(); PdfDictionary expectedDictionary = new PdfDictionary(); expectedDictionary.Put(PdfName.Ff, new PdfNumber(0)); CompareTexts(expectedDictionary, textFormField, true); @@ -92,7 +92,7 @@ public virtual void CreateMultilineTextWithoutWidgetTest() { [NUnit.Framework.Test] public virtual void CreateMultilineTextWithConformanceLevelTest() { PdfTextFormField textFormField = new TextFormFieldBuilder(DUMMY_DOCUMENT, DUMMY_NAME).SetWidgetRectangle(DUMMY_RECTANGLE - ).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateMultilineText(); + ).SetConformance(PdfConformance.PDF_A_1A).CreateMultilineText(); PdfDictionary expectedDictionary = new PdfDictionary(); expectedDictionary.Put(PdfName.Ff, new PdfNumber(PdfTextFormField.FF_MULTILINE)); CompareTexts(expectedDictionary, textFormField, true); diff --git a/itext.tests/itext.forms.tests/itext/forms/form/element/CheckBoxTest.cs b/itext.tests/itext.forms.tests/itext/forms/form/element/CheckBoxTest.cs index e9f8073346..1b302c7fc6 100644 --- a/itext.tests/itext.forms.tests/itext/forms/form/element/CheckBoxTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/form/element/CheckBoxTest.cs @@ -113,7 +113,7 @@ public virtual void CreateCheckBoxFactoryDefaultPdfTest() { [NUnit.Framework.Test] public virtual void CreateCheckBoxFactoryPdfATest() { CheckBox checkBox = new CheckBox("test"); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + checkBox.SetPdfConformance(PdfConformance.PDF_A_1B); CheckBoxRenderer renderer = (CheckBoxRenderer)checkBox.GetRenderer(); ICheckBoxRenderingStrategy strategy = renderer.CreateCheckBoxRenderStrategy(); NUnit.Framework.Assert.IsTrue(strategy is PdfACheckBoxRenderingStrategy); @@ -132,7 +132,7 @@ public virtual void CreateCheckBoxFactoryHtmlTest() { public virtual void CreateCheckBoxFactoryHtmlWithPdfATest() { CheckBox checkBox = new CheckBox("test"); checkBox.SetProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + checkBox.SetPdfConformance(PdfConformance.PDF_A_1B); CheckBoxRenderer renderer = (CheckBoxRenderer)checkBox.GetRenderer(); ICheckBoxRenderingStrategy strategy = renderer.CreateCheckBoxRenderStrategy(); NUnit.Framework.Assert.IsTrue(strategy is HtmlCheckBoxRenderingStrategy); @@ -215,17 +215,15 @@ public virtual void BasicCheckBoxDrawingTestPdfAMode() { String cmpPdf = SOURCE_FOLDER + "cmp_basicCheckBoxPdfA.pdf"; using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) { //should be invisble because there is no default border - CheckBox checkBoxUnset = new CheckBox("test").SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + CheckBox checkBoxUnset = new CheckBox("test").SetPdfConformance(PdfConformance.PDF_A_1B); document.Add(checkBoxUnset); - CheckBox checkBoxset = new CheckBox("test").SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + CheckBox checkBoxset = new CheckBox("test").SetPdfConformance(PdfConformance.PDF_A_1B); checkBoxset.SetChecked(true); document.Add(checkBoxset); - CheckBox checkBoxUnsetInteractive = new CheckBox("test1").SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B - ); + CheckBox checkBoxUnsetInteractive = new CheckBox("test1").SetPdfConformance(PdfConformance.PDF_A_1B); checkBoxUnsetInteractive.SetInteractive(true); document.Add(checkBoxUnsetInteractive); - CheckBox checkBoxsetInteractive = new CheckBox("test2").SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B - ); + CheckBox checkBoxsetInteractive = new CheckBox("test2").SetPdfConformance(PdfConformance.PDF_A_1B); checkBoxsetInteractive.SetInteractive(true); checkBoxsetInteractive.SetChecked(true); document.Add(checkBoxsetInteractive); @@ -339,7 +337,7 @@ public virtual void CheckBoxSetCheckTypes() { } ); GenerateCheckBoxes(document, (checkBox) => { - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + checkBox.SetPdfConformance(PdfConformance.PDF_A_1B); checkBox.SetCheckBoxType(enumConstant); } ); @@ -356,7 +354,7 @@ public virtual void SetPdfAConformanceLevel() { foreach (CheckBoxType enumConstant in EnumUtil.GetAllValuesOfEnum()) { GenerateCheckBoxes(document, (checkBox) => { checkBox.SetSize(20); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_3B); + checkBox.SetPdfConformance(PdfConformance.PDF_A_3B); checkBox.SetCheckBoxType(enumConstant); } ); @@ -502,7 +500,7 @@ private void GenerateCheckBoxesForAllRenderingModes(Document document, Action { checkBox.SetProperty(Property.RENDERING_MODE, RenderingMode.DEFAULT_LAYOUT_MODE); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1B); + checkBox.SetPdfConformance(PdfConformance.PDF_A_1B); alterFunction(checkBox); } ); diff --git a/itext.tests/itext.forms.tests/itext/forms/form/renderer/InputFieldRendererTest.cs b/itext.tests/itext.forms.tests/itext/forms/form/renderer/InputFieldRendererTest.cs index 82becc7190..0201c47731 100644 --- a/itext.tests/itext.forms.tests/itext/forms/form/renderer/InputFieldRendererTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/form/renderer/InputFieldRendererTest.cs @@ -87,23 +87,24 @@ public virtual void SetMinMaxWidthBasedOnFixedWidthWithoutAbsoluteWidthOnElement [NUnit.Framework.Test] public virtual void PdfAConformanceLevelTest() { InputFieldRenderer inputFieldRenderer = new InputFieldRenderer(new InputField("")); - NUnit.Framework.Assert.IsNull(inputFieldRenderer.GetConformanceLevel(null)); + NUnit.Framework.Assert.IsNull(inputFieldRenderer.GetConformance(null)); } [NUnit.Framework.Test] public virtual void PdfAConformanceLevelWithDocumentTest() { PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream())); InputFieldRenderer inputFieldRenderer = new InputFieldRenderer(new InputField("")); - NUnit.Framework.Assert.IsNull(inputFieldRenderer.GetConformanceLevel(pdfDocument)); + NUnit.Framework.Assert.IsNotNull(inputFieldRenderer.GetConformance(pdfDocument)); + NUnit.Framework.Assert.IsFalse(inputFieldRenderer.GetConformance(pdfDocument).IsPdfAOrUa()); } [NUnit.Framework.Test] public virtual void PdfAConformanceLevelWithConformanceLevelTest() { PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream())); InputFieldRenderer inputFieldRenderer = new InputFieldRenderer(new InputField("")); - inputFieldRenderer.SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, PdfAConformanceLevel.PDF_A_1B); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_1B, inputFieldRenderer.GetConformanceLevel(pdfDocument - )); + inputFieldRenderer.SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, PdfConformance.PDF_A_1B); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_1B, inputFieldRenderer.GetConformance(pdfDocument).GetAConformance + ()); } [NUnit.Framework.Test] @@ -112,21 +113,21 @@ public virtual void CreateParagraphRendererTest() { IRenderer paragraphRender = inputFieldRendererWithoutPlaceholder.CreateParagraphRenderer(""); NUnit.Framework.Assert.IsTrue(paragraphRender is ParagraphRenderer); InputField inputFieldWithEmptyPlaceholder = new InputField(""); - inputFieldWithEmptyPlaceholder.SetPlaceholder(new _Paragraph_129()); + inputFieldWithEmptyPlaceholder.SetPlaceholder(new _Paragraph_131()); InputFieldRenderer inputFieldRendererWithEmptyPlaceholder = new InputFieldRenderer(inputFieldWithEmptyPlaceholder ); paragraphRender = inputFieldRendererWithEmptyPlaceholder.CreateParagraphRenderer(""); NUnit.Framework.Assert.IsTrue(paragraphRender is ParagraphRenderer); NUnit.Framework.Assert.IsFalse(paragraphRender is InputFieldRendererTest.CustomParagraphRenderer); InputField inputFieldWithPlaceholder = new InputField(""); - inputFieldWithPlaceholder.SetPlaceholder(new _Paragraph_142()); + inputFieldWithPlaceholder.SetPlaceholder(new _Paragraph_144()); InputFieldRenderer inputFieldRendererWithPlaceholder = new InputFieldRenderer(inputFieldWithPlaceholder); paragraphRender = inputFieldRendererWithPlaceholder.CreateParagraphRenderer(""); NUnit.Framework.Assert.IsTrue(paragraphRender is InputFieldRendererTest.CustomParagraphRenderer); } - private sealed class _Paragraph_129 : Paragraph { - public _Paragraph_129() { + private sealed class _Paragraph_131 : Paragraph { + public _Paragraph_131() { } public override IRenderer CreateRendererSubTree() { @@ -134,8 +135,8 @@ public override IRenderer CreateRendererSubTree() { } } - private sealed class _Paragraph_142 : Paragraph { - public _Paragraph_142() { + private sealed class _Paragraph_144 : Paragraph { + public _Paragraph_144() { } public override bool IsEmpty() { diff --git a/itext.tests/itext.forms.tests/itext/forms/form/renderer/SelectFieldListBoxRendererTest.cs b/itext.tests/itext.forms.tests/itext/forms/form/renderer/SelectFieldListBoxRendererTest.cs index f88442ac82..db92f8be42 100644 --- a/itext.tests/itext.forms.tests/itext/forms/form/renderer/SelectFieldListBoxRendererTest.cs +++ b/itext.tests/itext.forms.tests/itext/forms/form/renderer/SelectFieldListBoxRendererTest.cs @@ -49,22 +49,23 @@ public virtual void AllowLastYLineRecursiveExtractionTest() { [NUnit.Framework.Test] public virtual void PdfAConformanceLevelTest() { SelectFieldListBoxRenderer renderer = new SelectFieldListBoxRenderer(new ListBoxField("", 1, false)); - NUnit.Framework.Assert.IsNull(renderer.GetConformanceLevel(null)); + NUnit.Framework.Assert.IsNull(renderer.GetConformance(null)); } [NUnit.Framework.Test] public virtual void PdfAConformanceLevelWithDocumentTest() { PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream())); SelectFieldListBoxRenderer renderer = new SelectFieldListBoxRenderer(new ListBoxField("", 1, false)); - NUnit.Framework.Assert.IsNull(renderer.GetConformanceLevel(pdfDocument)); + NUnit.Framework.Assert.IsNotNull(renderer.GetConformance(pdfDocument)); + NUnit.Framework.Assert.IsFalse(renderer.GetConformance(pdfDocument).IsPdfAOrUa()); } [NUnit.Framework.Test] public virtual void PdfAConformanceLevelWithConformanceLevelTest() { PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream())); SelectFieldListBoxRenderer renderer = new SelectFieldListBoxRenderer(new ListBoxField("", 1, false)); - renderer.SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, PdfAConformanceLevel.PDF_A_1B); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_1B, renderer.GetConformanceLevel(pdfDocument)); + renderer.SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, PdfConformance.PDF_A_1B); + NUnit.Framework.Assert.AreEqual(PdfConformance.PDF_A_1B, renderer.GetConformance(pdfDocument)); } private class CustomSelectFieldListBoxRenderer : SelectFieldListBoxRenderer { diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceLevelTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceTest.cs similarity index 65% rename from itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceLevelTest.cs rename to itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceTest.cs index cf1fb3eef2..648eaaa978 100644 --- a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceLevelTest.cs +++ b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfAConformanceTest.cs @@ -26,23 +26,21 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Kernel.Pdf { [NUnit.Framework.Category("UnitTest")] - public class PdfAConformanceLevelTest : ExtendedITextTest { + public class PdfAConformanceTest : ExtendedITextTest { [NUnit.Framework.Test] public virtual void GetConformanceTest() { - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_4, PdfAConformanceLevel.GetConformanceLevel("4" - , null)); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_4E, PdfAConformanceLevel.GetConformanceLevel("4" - , "E")); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_4F, PdfAConformanceLevel.GetConformanceLevel("4" - , "F")); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_4, PdfConformance.GetAConformance("4", null)); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_4E, PdfConformance.GetAConformance("4", "E")); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_4F, PdfConformance.GetAConformance("4", "F")); } [NUnit.Framework.Test] public virtual void GetXmpConformanceNullTest() { XMPMeta meta = new XMPMetaImpl(); meta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, "4"); - PdfAConformanceLevel level = PdfAConformanceLevel.GetConformanceLevel(meta); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_4, level); + PdfConformance level = PdfConformance.GetConformance(meta); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_4, level.GetAConformance()); + NUnit.Framework.Assert.AreEqual(PdfConformance.PDF_A_4, level); } [NUnit.Framework.Test] @@ -50,8 +48,9 @@ public virtual void GetXmpConformanceBTest() { XMPMeta meta = new XMPMetaImpl(); meta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, "2"); meta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE, "B"); - PdfAConformanceLevel level = PdfAConformanceLevel.GetConformanceLevel(meta); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_2B, level); + PdfConformance level = PdfConformance.GetConformance(meta); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_2B, level.GetAConformance()); + NUnit.Framework.Assert.AreEqual(PdfConformance.PDF_A_2B, level); } } } diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentTest.cs index 32c9b14ac2..15b1e5a27d 100644 --- a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentTest.cs +++ b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentTest.cs @@ -526,7 +526,8 @@ public virtual void GetDiContainer() { [NUnit.Framework.Test] public virtual void GetDefaultConformanceLevelTest() { PdfDocument document = new PdfDocument(new PdfWriter(new MemoryStream())); - NUnit.Framework.Assert.IsNull(document.GetConformanceLevel()); + NUnit.Framework.Assert.IsNotNull(document.GetConformance()); + NUnit.Framework.Assert.IsFalse(document.GetConformance().IsPdfAOrUa()); } //TODO DEVSIX-8490 remove this test when implemented diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentUnitTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentUnitTest.cs index 7b9d17029d..ceda1444be 100644 --- a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentUnitTest.cs +++ b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfDocumentUnitTest.cs @@ -204,7 +204,7 @@ public virtual void GetDocumentInfoInitializationTest() { [NUnit.Framework.Test] public virtual void GetPdfAConformanceLevelInitializationTest() { PdfDocument pdfDocument = new PdfDocument(new PdfReader(SOURCE_FOLDER + "pdfWithMetadata.pdf")); - NUnit.Framework.Assert.IsNotNull(pdfDocument.reader.GetPdfAConformanceLevel()); + NUnit.Framework.Assert.IsTrue(pdfDocument.reader.GetPdfConformance().IsPdfAOrUa()); pdfDocument.Close(); } diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfReaderTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfReaderTest.cs index 9e93faebaa..3c871f87c7 100644 --- a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfReaderTest.cs +++ b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfReaderTest.cs @@ -2056,17 +2056,17 @@ private void ReadingNotCompletedTest(PdfReader reader) { } [NUnit.Framework.Test] - public virtual void GetPdfAConformanceLevelPdfDocumentNotReadTest() { + public virtual void GetPdfAConformancePdfDocumentNotReadTest() { PdfReader getModifiedFileIdReader = PdfDocumentNotReadTestInit(); - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfException), () => getModifiedFileIdReader.GetPdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfException), () => getModifiedFileIdReader.GetPdfConformance ()); NUnit.Framework.Assert.AreEqual(KernelExceptionMessageConstant.DOCUMENT_HAS_NOT_BEEN_READ_YET, e.Message); } [NUnit.Framework.Test] - public virtual void GetPdfAConformanceLevelNoMetadataTest() { + public virtual void GetPdfConformanceNoMetadataTest() { PdfDocument pdfDoc = new PdfDocument(new PdfReader(new MemoryStream(CreatePdfDocumentForTest()))); - NUnit.Framework.Assert.IsNull(pdfDoc.GetReader().GetPdfAConformanceLevel()); + NUnit.Framework.Assert.IsFalse(pdfDoc.GetReader().GetPdfConformance().IsPdfAOrUa()); } [NUnit.Framework.Test] @@ -2419,7 +2419,7 @@ public virtual void TokensPositionIsNotUpdatedWhileReadingLengthTest() { } [NUnit.Framework.Test] - public virtual void ConformanceLevelCacheTest() { + public virtual void ConformanceCacheTest() { String filename = DESTINATION_FOLDER + "simpleDoc.pdf"; PdfDocument pdfDoc = new PdfDocument(CompareTool.CreateTestPdfWriter(filename)); XMPMeta xmp = XMPMetaFactory.Create(); @@ -2431,7 +2431,7 @@ public virtual void ConformanceLevelCacheTest() { PdfReaderTest.TestPdfDocumentCache pdfTestDoc = new PdfReaderTest.TestPdfDocumentCache(this, CompareTool.CreateOutputReader (filename)); for (int i = 0; i < 1000; ++i) { - pdfTestDoc.GetReader().GetPdfAConformanceLevel(); + pdfTestDoc.GetReader().GetPdfConformance(); } NUnit.Framework.Assert.AreEqual(1, pdfTestDoc.GetCounter()); } @@ -2618,6 +2618,14 @@ public virtual void StartxrefNotFoundCauseTest() { NUnit.Framework.Assert.IsTrue(pdfReader.HasRebuiltXref(), "Need rebuildXref()"); } + [NUnit.Framework.Test] + public virtual void ReadAandUaDocumentTest() { + using (PdfDocument pdfDoc = new PdfDocument(new PdfReader(SOURCE_FOLDER + "bothAandUa.pdf"))) { + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_2B, pdfDoc.GetConformance().GetAConformance()); + NUnit.Framework.Assert.AreEqual(PdfUAConformance.PDF_UA_1, pdfDoc.GetConformance().GetUAConformance()); + } + } + private static PdfDictionary GetTestPdfDictionary() { Dictionary tmpMap = new Dictionary(); tmpMap.Put(new PdfName("b"), new PdfName("c")); diff --git a/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfReaderTest/bothAandUa.pdf b/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfReaderTest/bothAandUa.pdf new file mode 100644 index 0000000000..a5703e8d40 Binary files /dev/null and b/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfReaderTest/bothAandUa.pdf differ diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AcroFormCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AcroFormCheckTest.cs index defcc479c2..ee4d8522b9 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AcroFormCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AcroFormCheckTest.cs @@ -49,8 +49,8 @@ public static void BeforeClass() { public virtual void AcroFormCheck01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); acroForm.Put(PdfName.NeedAppearances, new PdfBoolean(true)); @@ -66,8 +66,8 @@ public virtual void AcroFormCheck02() { String cmpPdf = cmpFolder + "cmp_pdfA1b_acroFormCheck02.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); acroForm.Put(PdfName.NeedAppearances, new PdfBoolean(false)); @@ -82,8 +82,8 @@ public virtual void AcroFormCheck03() { String cmpPdf = cmpFolder + "cmp_pdfA1b_acroFormCheck03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); doc.GetCatalog().Put(PdfName.AcroForm, acroForm); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1ActionCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1ActionCheckTest.cs index 841ff80464..f3557354f3 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1ActionCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1ActionCheckTest.cs @@ -39,8 +39,8 @@ public class PdfA1ActionCheckTest : ExtendedITextTest { public virtual void ActionCheck01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Launch); @@ -54,8 +54,8 @@ public virtual void ActionCheck01() { public virtual void ActionCheck02() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Hide); @@ -69,8 +69,8 @@ public virtual void ActionCheck02() { public virtual void ActionCheck03() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Sound); @@ -84,8 +84,8 @@ public virtual void ActionCheck03() { public virtual void ActionCheck04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Movie); @@ -99,8 +99,8 @@ public virtual void ActionCheck04() { public virtual void ActionCheck05() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.ResetForm); @@ -114,8 +114,8 @@ public virtual void ActionCheck05() { public virtual void ActionCheck06() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.ImportData); @@ -129,8 +129,8 @@ public virtual void ActionCheck06() { public virtual void ActionCheck07() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.JavaScript); @@ -144,8 +144,8 @@ public virtual void ActionCheck07() { public virtual void ActionCheck08() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Named); @@ -160,8 +160,8 @@ public virtual void ActionCheck08() { public virtual void ActionCheck09() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); page.SetAdditionalAction(PdfName.C, PdfAction.CreateJavaScript("js")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -173,8 +173,8 @@ public virtual void ActionCheck09() { public virtual void ActionCheck10() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.SetState); @@ -188,8 +188,8 @@ public virtual void ActionCheck10() { public virtual void ActionCheck11() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().SetAdditionalAction(PdfName.C, PdfAction.CreateJavaScript("js")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs index 787f4b324b..83669ab351 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1AnnotationCheckTest.cs @@ -55,8 +55,8 @@ public static void BeforeClass() { public virtual void AnnotationCheckTest01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfAnnotation annot = new PdfFileAttachmentAnnotation(rect); @@ -70,8 +70,8 @@ public virtual void AnnotationCheckTest01() { public virtual void AnnotationCheckTest02() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfMarkupAnnotation annot = new PdfTextAnnotation(rect); @@ -87,8 +87,8 @@ public virtual void AnnotationCheckTest02() { public virtual void AnnotationCheckTest03() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfMarkupAnnotation annot = new PdfTextAnnotation(rect); @@ -103,8 +103,8 @@ public virtual void AnnotationCheckTest03() { public virtual void AnnotationCheckTest04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfMarkupAnnotation annot = new PdfTextAnnotation(rect); @@ -120,8 +120,8 @@ public virtual void AnnotationCheckTest04() { public virtual void AnnotationCheckTest05() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfAnnotation annot = new PdfWidgetAnnotation(rect); @@ -139,8 +139,8 @@ public virtual void AnnotationCheckTest05() { public virtual void AnnotationCheckTest06() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfAnnotation annot = new PdfWidgetAnnotation(rect); @@ -158,8 +158,8 @@ public virtual void AnnotationCheckTest07() { String cmpPdf = cmpFolder + "cmp_pdfA1b_annotationCheckTest07.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 100, 100); PdfMarkupAnnotation annot = new PdfTextAnnotation(rect); @@ -177,8 +177,8 @@ public virtual void AnnotationCheckTest08() { String cmpPdf = cmpFolder + "cmp_pdfA1a_annotationCheckTest08.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_1_4)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); PdfPage page = doc.AddNewPage(); @@ -198,8 +198,8 @@ public virtual void AnnotationCheckTest09() { String cmpPdf = cmpFolder + "cmp_pdfA1a_annotationCheckTest09.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); PdfPage page = doc.AddNewPage(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1CanvasCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1CanvasCheckTest.cs index 8475a5beac..f07507d501 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1CanvasCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1CanvasCheckTest.cs @@ -51,7 +51,7 @@ public virtual void CanvasCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); for (int i = 0; i < 28; i++) { @@ -71,7 +71,7 @@ public virtual void CanvasCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); for (int i = 0; i < 28; i++) { @@ -93,7 +93,7 @@ public virtual void CanvasCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetRenderingIntent diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1EmbeddedFilesCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1EmbeddedFilesCheckTest.cs index 30295e1abf..4aa69c01f2 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1EmbeddedFilesCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1EmbeddedFilesCheckTest.cs @@ -40,7 +40,7 @@ public virtual void FileSpecCheckTest01() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); PdfDictionary fileNames = new PdfDictionary(); pdfDocument.GetCatalog().Put(PdfName.Names, fileNames); PdfDictionary embeddedFiles = new PdfDictionary(); @@ -63,7 +63,7 @@ public virtual void FileSpecCheckTest02() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); PdfStream stream = new PdfStream(); pdfDocument.GetCatalog().Put(new PdfName("testStream"), stream); PdfFileSpec spec = PdfFileSpec.CreateEmbeddedFileSpec(pdfDocument, sourceFolder + "sample.wav", "sample.wav" @@ -81,7 +81,7 @@ public virtual void FileSpecCheckTest03() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); PdfStream stream = new PdfStream(); pdfDocument.GetCatalog().Put(new PdfName("testStream"), stream); PdfFileSpec spec = PdfFileSpec.CreateEmbeddedFileSpec(pdfDocument, sourceFolder + "sample.wav", "sample.wav" diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1GraphicsTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1GraphicsTest.cs index d699d8b3f4..5d4899393a 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1GraphicsTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1GraphicsTest.cs @@ -55,7 +55,7 @@ public virtual void ColorCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetFillColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); @@ -82,7 +82,7 @@ public virtual void ColorCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetFillColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); @@ -98,7 +98,7 @@ public virtual void ColorCheckTest2() { [NUnit.Framework.Test] public virtual void ColorCheckTest3() { PdfWriter writer = new PdfWriter(new MemoryStream()); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, null); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, null); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetFillColor(ColorConstants.GREEN); @@ -119,7 +119,7 @@ public virtual void ColorCheckTest4() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetFillColor(ColorConstants.GREEN); @@ -137,7 +137,7 @@ public virtual void EgsCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetExtGState(new @@ -155,7 +155,7 @@ public virtual void EgsCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetExtGState(new PdfExtGState().SetTransferFunction2(PdfName.Default)); @@ -170,7 +170,7 @@ public virtual void EgsCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetExtGState(new @@ -186,7 +186,7 @@ public virtual void EgsCheckTest4() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetExtGState(new @@ -202,7 +202,7 @@ public virtual void TransparencyCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfFormXObject xObject = new PdfFormXObject(new Rectangle(100, 100)); @@ -222,7 +222,7 @@ public virtual void TransparencyCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetExtGState(new @@ -240,7 +240,7 @@ public virtual void TransparencyCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.SetExtGState(new PdfExtGState().SetSoftMask(PdfName.None)); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1LayoutListTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1LayoutListTest.cs index 06dc341c54..241cc495d2 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1LayoutListTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1LayoutListTest.cs @@ -54,8 +54,7 @@ public virtual void ListTest01() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_1B, outputIntent - ); + PdfADocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_1B, outputIntent); Document doc = new Document(pdfDocument); pdfDocument.SetTagged(); PdfFont textfont = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", PdfEncodings.WINANSI, PdfFontFactory.EmbeddingStrategy diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1bCheckfieldAppearanceTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1bCheckfieldAppearanceTest.cs index 0b9d6aed35..a23786c046 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1bCheckfieldAppearanceTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA1bCheckfieldAppearanceTest.cs @@ -57,13 +57,13 @@ public virtual void PdfA1bCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1B).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -80,13 +80,13 @@ public virtual void PdfA1bCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1B).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AcroFormCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AcroFormCheckTest.cs index a96e008205..c7d65c4289 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AcroFormCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AcroFormCheckTest.cs @@ -49,8 +49,8 @@ public static void BeforeClass() { public virtual void AcroFormCheck01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); acroForm.Put(PdfName.NeedAppearances, new PdfBoolean(true)); @@ -69,8 +69,8 @@ public virtual void AcroFormCheck02() { String cmpPdf = cmpFolder + "cmp_pdfA2b_acroFormCheck02.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); acroForm.Put(PdfName.NeedAppearances, new PdfBoolean(false)); @@ -85,8 +85,8 @@ public virtual void AcroFormCheck03() { String cmpPdf = cmpFolder + "cmp_pdfA2b_acroFormCheck03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); doc.GetCatalog().Put(PdfName.AcroForm, acroForm); @@ -98,8 +98,8 @@ public virtual void AcroFormCheck03() { public virtual void AcroFormCheck04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary acroForm = new PdfDictionary(); acroForm.Put(PdfName.XFA, new PdfArray()); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2ActionCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2ActionCheckTest.cs index ac9bf936b1..f311f5cb69 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2ActionCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2ActionCheckTest.cs @@ -48,8 +48,8 @@ public static void BeforeClass() { public virtual void ActionCheck01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Launch); @@ -63,8 +63,8 @@ public virtual void ActionCheck01() { public virtual void ActionCheck02() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Hide); @@ -78,8 +78,8 @@ public virtual void ActionCheck02() { public virtual void ActionCheck03() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Sound); @@ -93,8 +93,8 @@ public virtual void ActionCheck03() { public virtual void ActionCheck04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Movie); @@ -108,8 +108,8 @@ public virtual void ActionCheck04() { public virtual void ActionCheck05() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.ResetForm); @@ -123,8 +123,8 @@ public virtual void ActionCheck05() { public virtual void ActionCheck06() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.ImportData); @@ -138,8 +138,8 @@ public virtual void ActionCheck06() { public virtual void ActionCheck07() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.JavaScript); @@ -153,8 +153,8 @@ public virtual void ActionCheck07() { public virtual void ActionCheck08() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Named); @@ -169,8 +169,8 @@ public virtual void ActionCheck08() { public virtual void ActionCheck09() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.SetOCGState); @@ -184,8 +184,8 @@ public virtual void ActionCheck09() { public virtual void ActionCheck10() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Rendition); @@ -199,8 +199,8 @@ public virtual void ActionCheck10() { public virtual void ActionCheck11() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Trans); @@ -214,8 +214,8 @@ public virtual void ActionCheck11() { public virtual void ActionCheck12() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.GoTo3DView); @@ -229,8 +229,8 @@ public virtual void ActionCheck12() { public virtual void ActionCheck13() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); page.SetAdditionalAction(PdfName.C, PdfAction.CreateJavaScript("js")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -242,8 +242,8 @@ public virtual void ActionCheck13() { public virtual void ActionCheck14() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().SetAdditionalAction(PdfName.C, PdfAction.CreateJavaScript("js")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -257,8 +257,8 @@ public virtual void ActionCheck15() { String cmpPdf = sourceFolder + "cmp/PdfA2ActionCheckTest/cmp_pdfA2b_actionCheck15.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.GetOutlines(true); PdfOutline @out = doc.GetOutlines(false); @out.AddOutline("New").AddAction(PdfAction.CreateGoTo("TestDest")); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs index 606893f93b..8b0304046f 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2AnnotationCheckTest.cs @@ -58,8 +58,8 @@ public static void BeforeClass() { public virtual void AnnotationCheckTest01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfFileAttachmentAnnotation(rect); @@ -75,8 +75,8 @@ public virtual void AnnotationCheckTest02() { String cmpPdf = cmpFolder + "cmp_pdfA2b_annotationCheckTest02.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfPopupAnnotation(rect); @@ -91,8 +91,8 @@ public virtual void AnnotationCheckTest03() { String cmpPdf = cmpFolder + "cmp_pdfA2b_annotationCheckTest03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 100, 0, 0); PdfAnnotation annot = new PdfWidgetAnnotation(rect); @@ -107,8 +107,8 @@ public virtual void AnnotationCheckTest03() { public virtual void AnnotationCheckTest04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfWidgetAnnotation(rect); @@ -124,8 +124,8 @@ public virtual void AnnotationCheckTest04() { public virtual void AnnotationCheckTest05() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfTextAnnotation(rect); @@ -140,8 +140,8 @@ public virtual void AnnotationCheckTest05() { public virtual void AnnotationCheckTest06() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfTextAnnotation(rect); @@ -156,8 +156,8 @@ public virtual void AnnotationCheckTest06() { public virtual void AnnotationCheckTest07() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); Rectangle formRect = new Rectangle(400, 100); @@ -176,8 +176,8 @@ public virtual void AnnotationCheckTest07() { public virtual void AnnotationCheckTest08() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); Rectangle formRect = new Rectangle(400, 100); @@ -196,8 +196,8 @@ public virtual void AnnotationCheckTest08() { public virtual void AnnotationCheckTest09() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); PdfAnnotation annot = new PdfWidgetAnnotation(rect); @@ -216,8 +216,8 @@ public virtual void AnnotationCheckTest10() { String cmpPdf = cmpFolder + "cmp_pdfA2b_annotationCheckTest10.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); Rectangle formRect = new Rectangle(400, 100); @@ -236,8 +236,8 @@ public virtual void AnnotationCheckTest11() { String cmpPdf = cmpFolder + "cmp_pdfA2b_annotationCheckTest11.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); Rectangle rect = new Rectangle(100, 650, 400, 100); Rectangle formRect = new Rectangle(400, 100); @@ -258,8 +258,8 @@ public virtual void AnnotationCheckTest12() { String cmpPdf = cmpFolder + "cmp_pdfA1a_annotationCheckTest12.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); PdfPage page = doc.AddNewPage(); @@ -278,8 +278,8 @@ public virtual void AnnotationCheckTest12() { public virtual void AnnotationCheckTest13() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); PdfPage page = doc.AddNewPage(); @@ -299,8 +299,8 @@ public virtual void AnnotationCheckTest14() { String cmpPdf = cmpFolder + "cmp_pdfA2a_annotationCheckTest14.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); PdfPage page = doc.AddNewPage(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CanvasCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CanvasCheckTest.cs index 0302fe6b61..0bba715c5c 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CanvasCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CanvasCheckTest.cs @@ -50,7 +50,7 @@ public virtual void CanvasCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -72,7 +72,7 @@ public virtual void CanvasCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); for (int i = 0; i < 28; i++) { @@ -94,7 +94,7 @@ public virtual void CanvasCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(pdfDocument.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetRenderingIntent diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CatalogCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CatalogCheckTest.cs index 9e617e09f7..647519e862 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CatalogCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2CatalogCheckTest.cs @@ -53,8 +53,8 @@ public virtual void CatalogCheck03() { String cmpPdf = cmpFolder + "cmp_pdfA2b_catalogCheck03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -79,8 +79,8 @@ public virtual void CatalogCheck03() { public virtual void CatalogCheck04() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -105,8 +105,8 @@ public virtual void CatalogCheck05() { String cmpPdf = cmpFolder + "cmp_pdfA2b_catalogCheck05.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2EmbeddedFilesCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2EmbeddedFilesCheckTest.cs index 640b7699c3..8c8225f9ba 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2EmbeddedFilesCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2EmbeddedFilesCheckTest.cs @@ -60,7 +60,7 @@ public virtual void FileSpecNonConformingTest01() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -83,7 +83,7 @@ public virtual void FileSpecCheckTest02() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -110,7 +110,7 @@ public virtual void FileSpecCheckTest03() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2GraphicsCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2GraphicsCheckTest.cs index 96ed8b3eb5..d5f8a2912c 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2GraphicsCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2GraphicsCheckTest.cs @@ -58,7 +58,7 @@ public virtual void ColorCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { float[] whitePoint = new float[] { 0.9505f, 1f, 1.089f }; float[] gamma = new float[] { 2.2f, 2.2f, 2.2f }; float[] matrix = new float[] { 0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f @@ -78,7 +78,7 @@ public virtual void ColorCheckTest2() { String outPdf = destinationFolder + "pdfA2b_colorCheckTest2.pdf"; String cmpPdf = cmpFolder + "cmp_pdfA2b_colorCheckTest2.pdf"; PdfWriter writer = new PdfWriter(outPdf); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, null)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, null)) { float[] whitePoint = new float[] { 0.9505f, 1f, 1.089f }; float[] gamma = new float[] { 2.2f, 2.2f, 2.2f }; float[] matrix = new float[] { 0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f @@ -104,7 +104,7 @@ public virtual void ColorCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SetFillColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom()); @@ -124,7 +124,7 @@ public virtual void ColorCheckTest4() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SetFillColor(ColorConstants.BLUE); canvas.SetStrokeColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); @@ -148,7 +148,7 @@ public virtual void ColorCheckTest5() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); String shortText = "text"; PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED @@ -173,7 +173,7 @@ public virtual void ColorCheckTest6() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); String shortText = "text"; PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED @@ -196,7 +196,7 @@ public virtual void ColorCheckTest7() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); String shortText = "text"; PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED @@ -216,7 +216,7 @@ public virtual void ColorCheckTest7() { [NUnit.Framework.Test] public virtual void DefaultTextColorCheckTest() { String outPdf = destinationFolder + "defaultColorCheck.pdf"; - PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_2B, null); + PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_2B, null); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -233,7 +233,7 @@ public virtual void DefaultTextColorCheckTest() { public virtual void DefaultTextColorCheckForInvisibleTextTest() { String outPdf = destinationFolder + "defaultColorCheckInvisibleText.pdf"; String cmpPdf = cmpFolder + "cmp_pdfA2b_defaultColorCheckInvisibleText.pdf"; - PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_2B, null); + PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_2B, null); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -248,7 +248,7 @@ public virtual void DefaultTextColorCheckForInvisibleTextTest() { [NUnit.Framework.Test] public virtual void DefaultStrokeColorCheckTest() { String outPdf = destinationFolder + "defaultColorCheck.pdf"; - PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_2B, null); + PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_2B, null); PdfPage page = pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(page); canvas.SaveState(); @@ -275,7 +275,7 @@ public virtual void EgsCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => canvas.SetExtGState(new @@ -292,7 +292,7 @@ public virtual void EgsCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary dict = new PdfDictionary(); @@ -311,7 +311,7 @@ public virtual void ImageCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.AddImageAt(ImageDataFactory.Create(sourceFolder + "jpeg2000/p0_01.j2k"), 300, 300, false); @@ -326,7 +326,7 @@ public virtual void ImageCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.AddImageAt(ImageDataFactory.Create(sourceFolder + "jpeg2000/file5.jp2"), 300, 300, false); @@ -341,7 +341,7 @@ public virtual void ImageCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); canvas.AddImageAt(ImageDataFactory.Create(sourceFolder + "jpeg2000/file7.jp2"), 300, 300, false); @@ -369,7 +369,7 @@ public virtual void ImageCheckTest4() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas; for (int i = 1; i < 5; ++i) { canvas = new PdfCanvas(doc.AddNewPage()); @@ -390,7 +390,7 @@ public virtual void ImageCheckTest4() { [NUnit.Framework.Test] public virtual void TransparencyCheckTest1() { PdfWriter writer = new PdfWriter(new MemoryStream()); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, null); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, null); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SaveState(); canvas.SetExtGState(new PdfExtGState().SetBlendMode(PdfName.Darken)); @@ -415,7 +415,7 @@ public virtual void TransparencyCheckTest2() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SaveState(); canvas.SetExtGState(new PdfExtGState().SetBlendMode(PdfName.Darken)); @@ -437,7 +437,7 @@ public virtual void TransparencyCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, outputIntent)) { PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SaveState(); canvas.SetExtGState(new PdfExtGState().SetBlendMode(PdfName.Darken)); @@ -456,8 +456,8 @@ public virtual void TransparencyCheckTest3() { public virtual void ColourSpaceTest01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a stream @@ -478,8 +478,8 @@ public virtual void ColourSpaceTest01() { public virtual void ColourSpaceTest02() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary @@ -500,8 +500,8 @@ public virtual void ColourSpaceTest02() { public virtual void ColourSpaceTest03() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary @@ -529,8 +529,8 @@ public virtual void ColourSpaceTest03() { public virtual void ColourSpaceWithoutColourantsTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary @@ -560,8 +560,8 @@ public virtual void ColourSpaceWithoutColourantsTest() { public virtual void ColourSpaceWithoutAttributesTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2LayoutOcgTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2LayoutOcgTest.cs index 39cd27cbae..f7ccae7b05 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2LayoutOcgTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2LayoutOcgTest.cs @@ -54,7 +54,7 @@ public virtual void CheckIfOcgForPdfA2Works() { Stream colorStream = FileUtil.GetInputStreamForFile(sourceFolder + "color/sRGB_CS_profile.icm"); String outFileName = destinationFolder + fileName; String cmpFileName = sourceFolder + "cmp/PdfA2LayoutOcgTest/cmp_" + fileName; - PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outFileName), PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent + PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outFileName), PdfAConformance.PDF_A_2A, new PdfOutputIntent ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", colorStream)); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs index 8699b9e6fa..75afad3ed6 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2OCPropertiesTest.cs @@ -49,8 +49,8 @@ public virtual void CheckNameEntryShouldBeUniqueBetweenDefaultAndAdditionalConfi String outPdf = DESTINATION_FOLDER + "pdfA2b_ocPropertiesCheck01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -72,8 +72,8 @@ public virtual void CheckAsKeyInContentConfigDictTest() { String outPdf = DESTINATION_FOLDER + "pdfA2b_ocPropertiesCheck02.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfArray configs = new PdfArray(); @@ -93,8 +93,8 @@ public virtual void CheckNameEntryShouldBeUniqueBetweenAdditionalConfigsTest() { String outPdf = DESTINATION_FOLDER + "pdfA2b_ocPropertiesCheck03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -119,8 +119,8 @@ public virtual void CheckOCCDContainNameTest() { String outPdf = DESTINATION_FOLDER + "pdfA2b_ocPropertiesCheck04.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -144,8 +144,8 @@ public virtual void CheckOrderArrayContainsReferencesToAllOCGsTest() { String outPdf = DESTINATION_FOLDER + "pdfA2b_ocPropertiesCheck05.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); @@ -179,8 +179,8 @@ public virtual void CheckDocWithOCGsWithoutOptionalOrderEntryTest() { String cmpPdf = SOURCE_FOLDER + "cmp_pdfA2b_ocPropertiesCheck06.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2PageCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2PageCheckTest.cs index fddc1fa141..9a19549465 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2PageCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA2PageCheckTest.cs @@ -38,8 +38,8 @@ public class PdfA2PageCheckTest : ExtendedITextTest { public virtual void CatalogCheck01() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream()); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); page.GetPdfObject().Put(PdfName.PresSteps, new PdfDictionary()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3CatalogCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3CatalogCheckTest.cs index a197eca791..101ebc0e40 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3CatalogCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3CatalogCheckTest.cs @@ -51,8 +51,8 @@ public virtual void CatalogCheck01() { String cmpPdf = cmpFolder + "cmp_pdfA3b_catalogCheck01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary ocProperties = new PdfDictionary(); PdfDictionary d = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3EmbeddedFilesCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3EmbeddedFilesCheckTest.cs index 60f2aa0e4a..42b7230f05 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3EmbeddedFilesCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA3EmbeddedFilesCheckTest.cs @@ -54,7 +54,7 @@ public virtual void FileSpecCheckTest01() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -79,7 +79,7 @@ public virtual void FileSpecCheckTest02() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -104,7 +104,7 @@ public virtual void FileSpecCheckTest03() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -126,7 +126,7 @@ public virtual void FileSpecCheckTest04() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, outputIntent); + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, outputIntent); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs index c84e17407c..fbd1ef4ca6 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4ActionCheckTest.cs @@ -55,7 +55,7 @@ public static void BeforeClass() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_LAUNCH_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { doc.GetFirstPage().SetAdditionalAction(PdfName.O, PdfAction.CreateLaunch(new PdfStringFS("launch.sh"))); } @@ -67,7 +67,7 @@ public virtual void PdfA4ForbiddenActions_LAUNCH_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_SOUND_ActionToPage_Test() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { Stream @is = null; try { @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sample.aif"); @@ -92,7 +92,7 @@ public virtual void PdfA4ForbiddenActions_SOUND_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_MOVIE_ActionToPage_Test() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { doc.AddNewPage().SetAdditionalAction(PdfName.O, PdfAction.CreateMovie(null, "Some movie", PdfName.Play)); } ); @@ -105,7 +105,7 @@ public virtual void PdfA4ForbiddenActions_MOVIE_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_RESETFORM_ActionToPage_Test() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { CheckBox checkBox = new CheckBox("test"); checkBox.SetChecked(true); Document document = new Document(doc); @@ -121,7 +121,7 @@ public virtual void PdfA4ForbiddenActions_RESETFORM_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_IMPORTDATA_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { doc.AddNewPage(); PdfDictionary openActions = new PdfDictionary(); @@ -136,7 +136,7 @@ public virtual void PdfA4ForbiddenActions_IMPORTDATA_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_HIDE_ActionToPage_Test() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { PdfAnnotation[] annotations = new PdfAnnotation[] { new PdfLineAnnotation(new Rectangle(10, 10, 200, 200), new float[] { 50, 750, 50, 750 }), new PdfLineAnnotation(new Rectangle(200, 200, 200, 200), new float[ ] { 50, 750, 50, 750 }) }; @@ -152,7 +152,7 @@ public virtual void PdfA4ForbiddenActions_HIDE_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_RENDITION_ActionToPage_Test() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { doc.AddNewPage().SetAdditionalAction(PdfName.O, PdfAction.CreateRendition("empty", PdfFileSpec.CreateEmbeddedFileSpec (doc, null, "bing", "bing", new PdfDictionary(), PdfName.AllOn), "something", new PdfCircleAnnotation( new Rectangle(10, 10, 200, 200)))); @@ -166,7 +166,7 @@ public virtual void PdfA4ForbiddenActions_RENDITION_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_TRANS_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { PdfDictionary openActions = new PdfDictionary(); openActions.Put(PdfName.S, PdfName.Trans); @@ -179,7 +179,7 @@ public virtual void PdfA4ForbiddenActions_TRANS_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_SETSTATE_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.SetState); @@ -192,7 +192,7 @@ public virtual void PdfA4ForbiddenActions_SETSTATE_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_NOOP_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.NoOp); @@ -205,7 +205,7 @@ public virtual void PdfA4ForbiddenActions_NOOP_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_SETOCGSTATE_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { doc.AddNewPage().SetAdditionalAction(PdfName.O, PdfAction.CreateSetOcgState(new List()) ); @@ -217,7 +217,7 @@ public virtual void PdfA4ForbiddenActions_SETOCGSTATE_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4ForbiddenActions_GOTO3DVIEW_ActionToPage_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.GoTo3DView); @@ -231,7 +231,7 @@ public virtual void PdfA4ForbiddenActions_GOTO3DVIEW_ActionToPage_Test() { [NUnit.Framework.Test] public virtual void PdfA4_SETOCGSTATE_InCatalog_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { doc.GetCatalog().SetAdditionalAction(PdfName.O, PdfAction.CreateSetOcgState(new List()) ); } @@ -246,7 +246,7 @@ public virtual void PdfA4_SETOCGSTATE_InCatalog_Test() { [NUnit.Framework.Test] public virtual void PdfA4_SETOCGSTATE_Annotation_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { doc.AddNewPage().AddAnnotation(ConstructAnnotationWithAction(PdfName.SetOCGState)); } ); @@ -261,7 +261,7 @@ public virtual void PdfA4_SETOCGSTATE_Annotation_Test() { public virtual void PdfA4E_SETOCGSTATE_Annotation_Test() { String outPdf = DESTINATION_FOLDER + "pdfA4ESetOCGStateAnnotation.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4ESetOCGStateAnnotation.pdf"; - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4E, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4E, outPdf, (doc) => { doc.AddNewPage().AddAnnotation(ConstructAnnotationWithAction(PdfName.SetOCGState)); } ); @@ -271,7 +271,7 @@ public virtual void PdfA4E_SETOCGSTATE_Annotation_Test() { [NUnit.Framework.Test] public virtual void PdfA4_SETGOTO3DVIEW_Annotation_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { doc.AddNewPage().AddAnnotation(ConstructAnnotationWithAction(PdfName.GoTo3DView)); } ); @@ -286,7 +286,7 @@ public virtual void PdfA4_SETGOTO3DVIEW_Annotation_Test() { public virtual void PdfA4E_GOTO3DVIEW_Annotation_Test() { String outPdf = DESTINATION_FOLDER + "pdfA4ESetGoto3DViewAnnotation.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4EGoto3DViewAnnotation.pdf"; - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4E, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4E, outPdf, (doc) => { doc.AddNewPage().AddAnnotation(ConstructAnnotationWithAction(PdfName.GoTo3DView)); } ); @@ -299,7 +299,7 @@ public virtual void PdfA4_AllowedNamedActions_Test() { String cmpPdf = CMP_FOLDER + "cmp_pdfA4AllowedNamedActions.pdf"; IList annots = JavaUtil.ArraysAsList(PdfName.NextPage, PdfName.PrevPage, PdfName.FirstPage, PdfName .LastPage); - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, outPdf, (doc) => { PdfPage page = doc.GetFirstPage(); foreach (PdfName annot in annots) { PdfAnnotation annotation = ConstructAnnotationWithAction(new PdfName("")); @@ -317,7 +317,7 @@ public virtual void PdfA4_SpecialAllowedAction_Test() { String cmpPdf = CMP_FOLDER + "cmp_pdfA4SpecialAllowedAction.pdf"; IList annots = JavaUtil.ArraysAsList(PdfName.GoToR, PdfName.GoToE, PdfName.URI, PdfName.SubmitForm ); - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, outPdf, (doc) => { PdfPage page = doc.GetFirstPage(); foreach (PdfName annot in annots) { PdfAnnotation annotation = ConstructAnnotationWithAction(annot); @@ -331,7 +331,7 @@ public virtual void PdfA4_SpecialAllowedAction_Test() { [NUnit.Framework.Test] public virtual void PdfA4F_SETOCGSTATE_InCatalog_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4F, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4F, null, (doc) => { doc.GetCatalog().SetAdditionalAction(PdfName.O, PdfAction.CreateSetOcgState(new List()) ); } @@ -346,7 +346,7 @@ public virtual void PdfA4F_SETOCGSTATE_InCatalog_Test() { [NUnit.Framework.Test] public virtual void PdfA4E_SETOCGSTATE_InCatalog_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4E, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4E, null, (doc) => { doc.GetCatalog().SetAdditionalAction(PdfName.O, PdfAction.CreateSetOcgState(new List()) ); } @@ -361,7 +361,7 @@ public virtual void PdfA4E_SETOCGSTATE_InCatalog_Test() { [NUnit.Framework.Test] public virtual void PdfA4_GOTO3DVIEW_InCatalog_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.GoTo3DView); doc.GetCatalog().SetAdditionalAction(PdfName.O, new PdfAction(action)); @@ -377,7 +377,7 @@ public virtual void PdfA4_GOTO3DVIEW_InCatalog_Test() { [NUnit.Framework.Test] public virtual void PdfA4F_GOTO3DView_InCatalog_Test() { Exception pdfa4Exception = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4F, null, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4F, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.GoTo3DView); doc.GetCatalog().SetAdditionalAction(PdfName.O, new PdfAction(action)); @@ -391,7 +391,7 @@ public virtual void PdfA4F_GOTO3DView_InCatalog_Test() { [NUnit.Framework.Test] public virtual void PdfA4E_GOTO3DView_InCatalog_Test() { - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => GeneratePdfADocument(PdfAConformance .PDF_A_4E, null, (doc) => { PdfDictionary action = new PdfDictionary(); action.Put(PdfName.S, PdfName.GoTo3DView); @@ -406,7 +406,7 @@ public virtual void PdfA4E_GOTO3DView_InCatalog_Test() { public virtual void PdfA4AAEntriesAllowedInAADocumentCatalog_Test() { String outPdf = DESTINATION_FOLDER + "pdfA4AAEntriesAllowedInAADocumentCatalog.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AAEntriesAllowedInAADocumentCatalog.pdf"; - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, outPdf, (doc) => { PdfDictionary allowedAA = new PdfDictionary(); allowedAA.Put(PdfName.E, new PdfName("HELLO")); allowedAA.Put(PdfName.X, new PdfName("HELLO")); @@ -424,7 +424,7 @@ public virtual void PdfA4AAEntriesAllowedInAADocumentCatalog_Test() { public virtual void PdfA4AAEntriesAllowedInAAPage_Test() { String outPdf = DESTINATION_FOLDER + "pdfA4AAEntriesAllowedInAAPage.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AAEntriesAllowedInAAPage.pdf"; - GeneratePdfADocument(PdfAConformanceLevel.PDF_A_4, outPdf, (doc) => { + GeneratePdfADocument(PdfAConformance.PDF_A_4, outPdf, (doc) => { PdfDictionary allowedAA = new PdfDictionary(); allowedAA.Put(PdfName.E, new PdfName("HELLO")); allowedAA.Put(PdfName.X, new PdfName("HELLO")); @@ -460,14 +460,14 @@ private void CompareResult(String outPdf, String cmpPdf) { } } - private void GeneratePdfADocument(PdfAConformanceLevel conformanceLevel, String outPdf, System.Action consumer) { + private void GeneratePdfADocument(PdfAConformance conformance, String outPdf, System.Action consumer + ) { String filename = DESTINATION_FOLDER + Guid.NewGuid().ToString() + ".pdf"; if (outPdf != null) { filename = outPdf; } PdfWriter writer = new PdfWriter(filename, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, conformanceLevel, new PdfOutputIntent("Custom", "", "http://www.color.org" + PdfADocument doc = new PdfADocument(writer, conformance, new PdfOutputIntent("Custom", "", "http://www.color.org" , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) ); doc.AddNewPage(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4AnnotationCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4AnnotationCheckTest.cs index c50a00c68e..f07d22ca2b 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4AnnotationCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4AnnotationCheckTest.cs @@ -54,7 +54,7 @@ public static void BeforeClass() { public virtual void PdfA4ForbiddenAnnotations1Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfFileAttachmentAnnotation(new Rectangle(100, 100, 100, 100)); page.AddAnnotation(annot); @@ -67,7 +67,7 @@ public virtual void PdfA4ForbiddenAnnotations1Test() { public virtual void PdfA4ForbiddenAnnotations2Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfSoundAnnotation(new Rectangle(100, 100, 100, 100), new PdfStream()); page.AddAnnotation(annot); @@ -80,7 +80,7 @@ public virtual void PdfA4ForbiddenAnnotations2Test() { public virtual void PdfA4ForbiddenAnnotations3Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new Pdf3DAnnotation(new Rectangle(100, 100, 100, 100), new PdfArray()); page.AddAnnotation(annot); @@ -94,7 +94,7 @@ public virtual void PdfA4AllowedAnnotations1Test() { String outPdf = DESTINATION_FOLDER + "pdfA4AllowedAnnotations1Test.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AllowedAnnotations1Test.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfLinkAnnotation(new Rectangle(100, 100, 100, 100)); annot.SetFlag(PdfAnnotation.PRINT); @@ -108,7 +108,7 @@ public virtual void PdfA4AllowedAnnotations1Test() { public virtual void PdfA4eForbiddenAnnotations1Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfFileAttachmentAnnotation(new Rectangle(100, 100, 100, 100)); page.AddAnnotation(annot); @@ -121,7 +121,7 @@ public virtual void PdfA4eForbiddenAnnotations1Test() { public virtual void PdfA4eForbiddenAnnotations2Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfSoundAnnotation(new Rectangle(100, 100, 100, 100), new PdfStream()); page.AddAnnotation(annot); @@ -135,7 +135,7 @@ public virtual void PdfA4eAllowedAnnotations1Test() { String outPdf = DESTINATION_FOLDER + "pdfA4eAllowedAnnotations1Test.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4eAllowedAnnotations1Test.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfLinkAnnotation(new Rectangle(100, 100, 100, 100)); annot.SetFlag(PdfAnnotation.PRINT); @@ -150,7 +150,7 @@ public virtual void PdfA4eAllowedAnnotations2Test() { String outPdf = DESTINATION_FOLDER + "pdfA4eAllowedAnnotations2Test.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4eAllowedAnnotations2Test.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); PdfStream stream3D = new PdfStream(doc, FileUtil.GetInputStreamForFile(CMP_FOLDER + "teapot.u3d")); stream3D.Put(PdfName.Type, PdfName._3D); @@ -177,7 +177,7 @@ public virtual void PdfA4eAllowedAnnotations2Test() { public virtual void PdfA4fForbiddenAnnotations1Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfSoundAnnotation(new Rectangle(100, 100, 100, 100), new PdfStream()); @@ -191,7 +191,7 @@ public virtual void PdfA4fForbiddenAnnotations1Test() { public virtual void PdfA4fForbiddenAnnotations2Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new Pdf3DAnnotation(new Rectangle(100, 100, 100, 100), new PdfArray()); @@ -205,7 +205,7 @@ public virtual void PdfA4fForbiddenAnnotations2Test() { public virtual void PdfA4fForbiddenAnnotations3Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfScreenAnnotation(new Rectangle(100, 100, 100, 100)); @@ -219,7 +219,7 @@ public virtual void PdfA4fForbiddenAnnotations3Test() { public virtual void PdfA4fForbiddenAnnotations4Test() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfTextAnnotation(new Rectangle(100, 100, 100, 100)); @@ -235,7 +235,7 @@ public virtual void PdfA4fAllowedAnnotations1Test() { String outPdf = DESTINATION_FOLDER + "pdfA4fAllowedAnnotations1Test.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4fAllowedAnnotations1Test.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfFileAttachmentAnnotation(new Rectangle(100, 100, 100, 100)); @@ -252,7 +252,7 @@ public virtual void PdfA4fAllowedAnnotations2Test() { String outPdf = DESTINATION_FOLDER + "pdfA4fAllowedAnnotations2Test.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4fAllowedAnnotations2Test.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfLinkAnnotation(new Rectangle(100, 100, 100, 100)); @@ -268,7 +268,7 @@ public virtual void PdfA4AllowedAnnotWithoutApTest() { String outPdf = DESTINATION_FOLDER + "pdfA4AllowedAnnotWithoutApTest.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AllowedAnnotWithoutApTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfA4AnnotationCheckTest.PdfProjectionAnnotation(new Rectangle(100, 100, 100, 100 )); @@ -283,7 +283,7 @@ public virtual void PdfA4AllowedAnnotWithoutApTest() { public virtual void PdfA4ForbiddenAKeyWidgetAnnotationTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfWidgetAnnotation(new Rectangle(100, 100, 100, 100)); @@ -300,7 +300,7 @@ public virtual void PdfA4AllowedAAKeyWidgetAnnotationTest() { String outPdf = DESTINATION_FOLDER + "pdfA4AllowedAAKeyWidgetAnnotationTest.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AllowedAAKeyWidgetAnnotationTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent())) { PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfWidgetAnnotation(new Rectangle(100, 100, 100, 100)); annot.GetPdfObject().Put(PdfName.AA, (new PdfAction()).GetPdfObject()); @@ -315,7 +315,7 @@ public virtual void PdfA4AllowedAAKeyWidgetAnnotationTest() { public virtual void PdfA4BtnAppearanceContainsNStreamWidgetAnnotationTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfWidgetAnnotation(new Rectangle(100, 100, 100, 100)); @@ -332,7 +332,7 @@ public virtual void PdfA4BtnAppearanceContainsNStreamWidgetAnnotationTest() { public virtual void PdfA4AppearanceContainsNDictWidgetAnnotationTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfWidgetAnnotation(new Rectangle(100, 100, 100, 100)); @@ -349,7 +349,7 @@ public virtual void PdfA4AppearanceContainsNDictWidgetAnnotationTest() { public virtual void PdfA4AppearanceContainsOtherKeyWidgetAnnotationTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); AddSimpleEmbeddedFile(doc); PdfAnnotation annot = new PdfWidgetAnnotation(new Rectangle(100, 100, 100, 100)); @@ -367,7 +367,7 @@ public virtual void PdfA4ForbiddenAAKeyAnnotationTest() { String outPdf = DESTINATION_FOLDER + "pdfA4ForbiddenAAKeyAnnotationTest.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4ForbiddenAAKeyAnnotationTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); PdfPage page = doc.AddNewPage(); PdfAnnotation annot = new PdfLinkAnnotation(new Rectangle(100, 100, 100, 100)); PdfDictionary dict = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4CatalogCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4CatalogCheckTest.cs index 3ac4cabcc5..3fb4f7826f 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4CatalogCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4CatalogCheckTest.cs @@ -57,8 +57,8 @@ public virtual void CreateSimpleDocTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck01.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.Close(); NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPdf)); @@ -71,8 +71,8 @@ public virtual void CreateSimpleTaggedDocTest() { String cmpPdf = sourceFolder + "cmp/PdfA4CatalogCheckTest/cmp_pdfA4_tagged.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument pdfDoc = (PdfADocument)new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent - ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)).SetTagged(); + PdfADocument pdfDoc = (PdfADocument)new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent( + "Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)).SetTagged(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); Document document = new Document(pdfDoc); @@ -94,8 +94,8 @@ public virtual void InvalidCatalogVersionCheckTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck02.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().Put(PdfName.Version, new PdfString("1.7")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -113,8 +113,8 @@ public virtual void EncryptInTrailerTest() { (userPassword, ownerPassword, permissions, EncryptionConstants.ENCRYPTION_AES_256).SetFullCompressionMode (false)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.KEYWORD_ENCRYPT_SHALL_NOT_BE_USED_IN_THE_TRAILER_DICTIONARY @@ -131,8 +131,8 @@ public virtual void EncryptedDocumentTest() { (userPassword, ownerPassword, permissions, EncryptionConstants.ENCRYPTION_AES_256).SetFullCompressionMode (true)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.KEYWORD_ENCRYPT_SHALL_NOT_BE_USED_IN_THE_TRAILER_DICTIONARY @@ -144,8 +144,8 @@ public virtual void AbsentPieceInfoTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck04.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfDictionary info = new PdfDictionary(); String timeValue = "D:19860426012347+04'00'"; @@ -162,8 +162,8 @@ public virtual void ValidCatalogCheckTest() { String cmpPdf = sourceFolder + "cmp/PdfA4CatalogCheckTest/cmp_pdfA4_catalogCheck05.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().Put(PdfName.PieceInfo, new PdfDictionary()); doc.Close(); @@ -179,8 +179,8 @@ public virtual void InvalidInfoTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck05.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetTrailer().Put(PdfName.Info, new PdfDictionary()); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -204,8 +204,8 @@ public virtual void InvalidVersionInCatalogTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck06.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().Put(PdfName.Version, new PdfString("1.7")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -218,8 +218,8 @@ public virtual void CorruptedVersionInCatalogTest() { String outPdf = destinationFolder + "pdfA4_catalogCheck07.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); doc.GetCatalog().Put(PdfName.Version, new PdfString("2ae")); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); @@ -244,7 +244,7 @@ public virtual void CheckReferenceXObject() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfFormXObject xObject = new PdfFormXObject(new Rectangle(100, 100)); @@ -264,7 +264,7 @@ public virtual void CheckOpiInXObject() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfFormXObject xObject = new PdfFormXObject(new Rectangle(100, 100)); @@ -285,7 +285,7 @@ public virtual void ValidFormXObjectTest() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfFormXObject xObject = new PdfFormXObject(new Rectangle(100, 100)); @@ -304,9 +304,8 @@ public virtual void ValidFormXObjectTest() { public virtual void CreateInvalidPdfAVersionNumberWithPDFA4() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_7)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION @@ -317,9 +316,8 @@ public virtual void CreateInvalidPdfAVersionNumberWithPDFA4() { public virtual void CreateInvalidPdfAVersionNumberWithPDFA4F() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_7)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION @@ -330,9 +328,8 @@ public virtual void CreateInvalidPdfAVersionNumberWithPDFA4F() { public virtual void CreateInvalidPdfAVersionNumberWithPDFA4E() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_7)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION @@ -343,9 +340,8 @@ public virtual void CreateInvalidPdfAVersionNumberWithPDFA4E() { public virtual void CreateInvalidPdfAVersion16NumberWithPDFA4() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_6)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION @@ -356,9 +352,8 @@ public virtual void CreateInvalidPdfAVersion16NumberWithPDFA4() { public virtual void CreateInvalidPdfAVersion13NumberWithPDFA4F() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_3)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION @@ -369,9 +364,8 @@ public virtual void CreateInvalidPdfAVersion13NumberWithPDFA4F() { public virtual void CreateInvalidPdfAVersionNumber17WithPDFA4E() { PdfWriter writer = new PdfWriter(new PdfWriter(new MemoryStream()), new WriterProperties().SetPdfVersion(PdfVersion .PDF_1_7)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"))); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4EmbeddedFilesCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4EmbeddedFilesCheckTest.cs index aba70cebce..5939173f61 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4EmbeddedFilesCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4EmbeddedFilesCheckTest.cs @@ -47,7 +47,7 @@ public static void BeforeClass() { public virtual void PdfA4fWithoutEmbeddedFilesTest() { String outPdf = DESTINATION_FOLDER + "pdfA4fWithoutEmbeddedFilesTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); doc.AddNewPage(); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => doc.Close()); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.NAME_DICTIONARY_SHALL_CONTAIN_EMBEDDED_FILES_KEY @@ -58,7 +58,7 @@ public virtual void PdfA4fWithoutEmbeddedFilesTest() { public virtual void PdfA4fWithEmbeddedFilesWithoutFTest() { String outPdf = DESTINATION_FOLDER + "pdfA4fWithEmbeddedFilesWithoutFTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); doc.AddNewPage(); PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); @@ -74,7 +74,7 @@ public virtual void PdfA4fWithEmbeddedFilesWithoutFTest() { public virtual void PdfA4fWithEmbeddedFilesWithoutUFTest() { String outPdf = DESTINATION_FOLDER + "pdfA4fWithEmbeddedFilesWithoutUFTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); doc.AddNewPage(); PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); @@ -90,7 +90,7 @@ public virtual void PdfA4fWithEmbeddedFilesWithoutUFTest() { public virtual void PdfA4fWithEmbeddedFilesWithoutAFRTest() { String outPdf = DESTINATION_FOLDER + "pdfA4fWithEmbeddedFilesWithoutAFRTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4F, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4F, CreateOutputIntent()); doc.AddNewPage(); PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); @@ -106,7 +106,7 @@ public virtual void PdfA4fWithEmbeddedFilesWithoutAFRTest() { public virtual void PdfA4eWithEmbeddedFilesWithoutFTest() { String outPdf = DESTINATION_FOLDER + "pdfA4eWithEmbeddedFilesWithoutFTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, CreateOutputIntent()); doc.AddNewPage(); PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); @@ -122,7 +122,7 @@ public virtual void PdfA4eWithEmbeddedFilesWithoutFTest() { public virtual void PdfA4WithEmbeddedFilesWithoutAFRTest() { String outPdf = DESTINATION_FOLDER + "pdfA4WithEmbeddedFilesWithoutAFRTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); doc.AddNewPage(); PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs index 89aae8bfd4..d60247b525 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4GraphicsCheckTest.cs @@ -64,7 +64,7 @@ public virtual void ValidHalftoneTest() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary colourantHalftone = new PdfDictionary(); @@ -89,7 +89,7 @@ public virtual void ValidHalftoneType1Test() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary halftone = new PdfDictionary(); @@ -110,7 +110,7 @@ public virtual void ValidHalftoneTest2() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary colourantHalftone = new PdfDictionary(); @@ -137,7 +137,7 @@ public virtual void ValidHalftoneTest3() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary colourantHalftone = new PdfDictionary(); @@ -163,7 +163,7 @@ public virtual void InvalidHalftoneTest1() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary halftone = new PdfDictionary(); @@ -183,7 +183,7 @@ public virtual void InvalidHalftoneTest2() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary halftone = new PdfDictionary(); @@ -224,7 +224,7 @@ public virtual void ColorCheckTest1() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { float[] whitePoint = new float[] { 0.9505f, 1f, 1.089f }; float[] gamma = new float[] { 2.2f, 2.2f, 2.2f }; float[] matrix = new float[] { 0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f @@ -244,7 +244,7 @@ public virtual void ColorCheckTest2() { String outPdf = DESTINATION_FOLDER + "pdfA4_colorCheckTest2.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colorCheckTest2.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null)) { float[] whitePoint = new float[] { 0.9505f, 1f, 1.089f }; float[] gamma = new float[] { 2.2f, 2.2f, 2.2f }; float[] matrix = new float[] { 0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f @@ -271,7 +271,7 @@ public virtual void ColorCheckTest3() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SetFillColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); canvas.MoveTo(doc.GetDefaultPageSize().GetLeft(), doc.GetDefaultPageSize().GetBottom()); @@ -291,7 +291,7 @@ public virtual void ColorCheckTest4() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SetFillColor(ColorConstants.BLUE); canvas.SetStrokeColor(new DeviceCmyk(0.1f, 0.1f, 0.1f, 0.1f)); @@ -317,7 +317,7 @@ public virtual void ColorCheckTest5() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = doc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -347,7 +347,7 @@ public virtual void ColorCheckTest6() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); String shortText = "text"; PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy. @@ -372,7 +372,7 @@ public virtual void ColorCheckTest7() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = doc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -402,7 +402,7 @@ public virtual void ColorCheckTest8() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); String shortText = "text"; PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy. @@ -427,7 +427,7 @@ public virtual void ColorCheckTest9() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = doc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -451,7 +451,7 @@ public virtual void ColorCheckTest10() { String outPdf = DESTINATION_FOLDER + "pdfA4_colorCheckTest10.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colorCheckTest10.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // Add page blending colorspace PdfTransparencyGroup transparencyGroup = new PdfTransparencyGroup(); @@ -471,7 +471,7 @@ public virtual void ColorCheckTest11() { String outPdf = DESTINATION_FOLDER + "pdfA4_colorCheckTest11.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colorCheckTest11.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // Add page blending colorspace PdfTransparencyGroup transparencyGroup = new PdfTransparencyGroup(); @@ -504,7 +504,7 @@ public virtual void ColorCheckTest12() { String outPdf = DESTINATION_FOLDER + "pdfA4_colorCheckTest12.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colorCheckTest12.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // Add page blending colorspace PdfTransparencyGroup transparencyGroup = new PdfTransparencyGroup(); @@ -523,7 +523,7 @@ public virtual void ColorCheckTest12() { public virtual void DefaultTextColorCheckTest() { String outPdf = DESTINATION_FOLDER + "defaultColorCheck.pdf"; PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -541,7 +541,7 @@ public virtual void DefaultTextColorCheckWithPageOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "defaultTextColorCheckWithPageOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_defaultTextColorCheckWithPageOutputIntent.pdf"; PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -560,7 +560,7 @@ public virtual void DefaultTextColorCheckForInvisibleTextTest() { String outPdf = DESTINATION_FOLDER + "pdfA4_defaultColorCheckInvisibleText.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_defaultColorCheckInvisibleText.pdf"; PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -576,7 +576,7 @@ public virtual void DefaultTextColorCheckForInvisibleTextTest() { public virtual void DefaultStrokeColorCheckTest() { String outPdf = DESTINATION_FOLDER + "defaultColorCheck.pdf"; PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfPage page = pdfDocument.AddNewPage(); PdfCanvas canvas = new PdfCanvas(page); canvas.SaveState(); @@ -605,7 +605,7 @@ public virtual void ColorCheckWithDuplicatedCmykColorspaceTest1() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -627,7 +627,7 @@ public virtual void ColorCheckWithDuplicatedCmykColorspaceTest2() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); // Add page blending colorspace PdfTransparencyGroup transparencyGroup = new PdfTransparencyGroup(); @@ -654,7 +654,7 @@ public virtual void ColorCheckWithDuplicatedCmykColorspaceTest3() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); // Add page blending colorspace PdfTransparencyGroup transparencyGroup = new PdfTransparencyGroup(); @@ -690,7 +690,7 @@ public virtual void ColorCheckWithDuplicatedCmykColorspaceTest4() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(page); // Create color @@ -729,7 +729,7 @@ public virtual void ColorCheckWithDuplicatedRgbColorspaceTest() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(page); // Create color @@ -748,7 +748,7 @@ public virtual void ColorCheckWithDuplicatedRgbAndCmykColorspaceTest() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -772,7 +772,7 @@ public virtual void ColorCheckWithDuplicated2CmykColorspacesTest() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent); PdfPage page = pdfDoc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -794,8 +794,8 @@ public virtual void ColourSpaceTest01() { String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colourSpaceTest01.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a stream @@ -819,8 +819,8 @@ public virtual void ColourSpaceTest02() { String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colourSpaceTest02.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary @@ -844,8 +844,8 @@ public virtual void ColourSpaceTest03() { String cmpPdf = CMP_FOLDER + "cmp_pdfA4_colourSpaceTest03.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfColorSpace alternateSpace = new PdfDeviceCs.Rgb(); //Tint transformation function is a dictionary @@ -875,7 +875,7 @@ public virtual void ImageFailureTest() { String outPdf = DESTINATION_FOLDER + "imageFailure.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_imageFailure.pdf"; PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // This should suppress transparency issue page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile @@ -896,7 +896,7 @@ public virtual void ImageTest() { String outPdf = DESTINATION_FOLDER + "pdfA4_image.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_image.pdf"; PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // This should suppress transparency and device RGB page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil @@ -914,7 +914,7 @@ public virtual void ImageTest() { public virtual void ImageJpeg20002ColorChannelsTest() { String outPdf = DESTINATION_FOLDER + "pdfA4_jpeg2000.pdf"; PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // This should suppress transparency and device RGB page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil @@ -934,7 +934,7 @@ public virtual void ImageJpeg2000Test() { String outPdf = DESTINATION_FOLDER + "pdfA4_jpeg2000.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4_jpeg2000.pdf"; PdfDocument pdfDoc = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); // This should suppress transparency and device RGB page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil @@ -953,7 +953,7 @@ public virtual void PdfA4AnnotationsNoOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "pdfA4AnnotationsNoOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AnnotationsNoOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); PdfAnnotation annot = new PdfCircleAnnotation(new Rectangle(100, 100, 100, 100)); annot.SetFlag(PdfAnnotation.PRINT); @@ -974,7 +974,7 @@ public virtual void PdfA4AnnotationsWrongPageOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "pdfA4AnnotationsWrongPageOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AnnotationsWrongPageOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "cmyk", FileUtil.GetInputStreamForFile (SOURCE_FOLDER + "USWebUncoated.icc"))); @@ -999,7 +999,7 @@ public virtual void PdfA4AnnotationsCorrectPageOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "pdfA4AnnotationsCorrectPageOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4AnnotationsCorrectPageOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); page.AddOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil .GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"))); @@ -1023,7 +1023,7 @@ public virtual void DestOutputIntentProfileNotAllowedTest() { String outPdf = DESTINATION_FOLDER + "pdfA4DestOutputIntentProfileNotAllowed.pdf"; String isoFilePath = SOURCE_FOLDER + "ISOcoated_v2_300_bas.icc"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(isoFilePath)); byte[] manipulatedBytes = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII ).Replace("prtr", "not_def").GetBytes(System.Text.Encoding.ASCII); @@ -1041,7 +1041,7 @@ public virtual void DestOutputIntentProfileNotAllowedInPageTest() { String outPdf = DESTINATION_FOLDER + "pdfA4DestOutputIntentProfileNotAllowedInPage.pdf"; String isoFilePath = SOURCE_FOLDER + "ISOcoated_v2_300_bas.icc"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(isoFilePath)); byte[] manipulatedBytes = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII @@ -1060,7 +1060,7 @@ public virtual void DestOutputIntentColorSpaceNotAllowedTest() { String outPdf = DESTINATION_FOLDER + "pdfA4DestOutputIntentProfileNotAllowed.pdf"; String isoFilePath = SOURCE_FOLDER + "ISOcoated_v2_300_bas.icc"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(isoFilePath)); byte[] manipulatedBytes = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII ).Replace("CMYK", "not_def").GetBytes(System.Text.Encoding.ASCII); @@ -1078,7 +1078,7 @@ public virtual void DestOutputIntentColorSpaceNotAllowedInPageTest() { String outPdf = DESTINATION_FOLDER + "pdfA4DestOutputIntentProfileNotAllowedInPage.pdf"; String isoFilePath = SOURCE_FOLDER + "ISOcoated_v2_300_bas.icc"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfPage page = pdfDoc.AddNewPage(); byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(isoFilePath)); byte[] manipulatedBytes = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII @@ -1095,9 +1095,9 @@ public virtual void DestOutputIntentColorSpaceNotAllowedInPageTest() { [NUnit.Framework.Test] public virtual void DestOutputIntentRefNotAllowedTest() { String outPdf = DESTINATION_FOLDER + "PdfWithOutputIntentProfileRef.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; + PdfAConformance conformance = PdfAConformance.PDF_A_4; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument pdfADocument = new PdfADocument(writer, conformanceLevel, new PdfOutputIntent("Custom", "", "http://www.color.org" + PdfADocument pdfADocument = new PdfADocument(writer, conformance, new PdfOutputIntent("Custom", "", "http://www.color.org" , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) ); PdfPage page = pdfADocument.AddNewPage(); @@ -1118,7 +1118,7 @@ private void TestWithColourant(PdfName color) { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, outputIntent)) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, outputIntent)) { doc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(doc.GetLastPage()); PdfDictionary colourantHalftone = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs index 23ce39c9c4..880facc197 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4MiscCheckTest.cs @@ -49,7 +49,7 @@ public virtual void PdfA4CheckThatAsKeyIsAllowedTest() { String outPdf = DESTINATION_FOLDER + "pdfA4CheckThatAsKeyIsAllowedTest.pdf"; String cmpPdf = CMP_FOLDER + "cmp_pdfA4CheckThatAsKeyIsAllowedTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent())) { doc.AddNewPage(); PdfArray configs = new PdfArray(); PdfDictionary config = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs index 3c4f4b82f3..36c821d295 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfA4TransparencyCheckTest.cs @@ -61,7 +61,7 @@ public virtual void TextTransparencyPageOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "textTransparencyPageOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_textTransparencyPageOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page1 = pdfDocument.AddNewPage(); @@ -84,7 +84,7 @@ public virtual void TextTransparencyPageOutputIntentTest() { public virtual void TextTransparencyPageWrongOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "textTransparencyPageWrongOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfDocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfDocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfOutputIntent outputIntent = CreateOutputIntent(); @@ -108,7 +108,7 @@ public virtual void TransparentTextWithGroupColorSpaceTest() { String outPdf = DESTINATION_FOLDER + "transparencyAndCS.pdf"; String cmpPdf = CMP_FOLDER + "cmp_transparencyAndCS.pdf"; PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion - .PDF_2_0)), PdfAConformanceLevel.PDF_A_4, null); + .PDF_2_0)), PdfAConformance.PDF_A_4, null); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); Stream streamGray = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "BlackWhite.icc"); @@ -139,7 +139,7 @@ public virtual void TransparentTextWithGroupColorSpaceTest() { public virtual void BlendModeTest() { PdfWriter writer = new PdfWriter(new MemoryStream(), new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0 )); - using (PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent())) { + using (PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent())) { PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); canvas.SaveState(); canvas.SetExtGState(new PdfExtGState().SetBlendMode(PdfName.Darken)); @@ -159,7 +159,7 @@ public virtual void BlendModeTest() { public virtual void BlendModeAnnotationTest() { PdfWriter writer = new PdfWriter(new MemoryStream(), new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0 )); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null); PdfFormXObject formXObject = new PdfFormXObject(new Rectangle(100f, 100f)); iText.Layout.Canvas canvas = new iText.Layout.Canvas(formXObject, doc); canvas.GetPdfCanvas().Circle(50f, 50f, 40f); @@ -180,7 +180,7 @@ public virtual void BlendModeAnnotationOutputIntentTest() { String outPdf = DESTINATION_FOLDER + "blendModeAnnotationOutputIntent.pdf"; String cmpPdf = CMP_FOLDER + "cmp_blendModeAnnotationOutputIntent.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - using (PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, null)) { + using (PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, null)) { PdfFormXObject formXObject = new PdfFormXObject(new Rectangle(100f, 100f)); iText.Layout.Canvas canvas = new iText.Layout.Canvas(formXObject, doc); canvas.GetPdfCanvas().Circle(50f, 50f, 40f); @@ -200,7 +200,7 @@ public virtual void BlendModeAnnotationOutputIntentTest() { public virtual void ForbiddenBlendModeAnnotationTest() { PdfWriter writer = new PdfWriter(new ByteArrayOutputStream(), new WriterProperties().SetPdfVersion(PdfVersion .PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, CreateOutputIntent()); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, CreateOutputIntent()); PdfFormXObject formXObject = new PdfFormXObject(new Rectangle(0f, 0f)); PdfAnnotation annotation = new PdfPopupAnnotation(new Rectangle(0f, 0f)); annotation.SetNormalAppearance(formXObject.GetPdfObject()); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAgnosticPdfDocumentUnitTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAgnosticPdfDocumentUnitTest.cs index 343ba0b80c..62f03dac94 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAgnosticPdfDocumentUnitTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAgnosticPdfDocumentUnitTest.cs @@ -56,7 +56,8 @@ public virtual void LoadPdfDocumentTest() { pdfDoc.CheckIsoConformance(validationContext); // Does nothing for PdfDocument NUnit.Framework.Assert.IsFalse(pdfDoc.GetPageFactoryPublic() is PdfAPageFactory); - NUnit.Framework.Assert.IsNull(pdfDoc.GetConformanceLevel()); + NUnit.Framework.Assert.IsNotNull(pdfDoc.GetConformance()); + NUnit.Framework.Assert.IsFalse(pdfDoc.GetConformance().IsPdfAOrUa()); pdfDoc.UpdateXmpMetadataPublic(); XMPMeta xmpMeta = pdfDoc.GetXmpMetadata(true); NUnit.Framework.Assert.IsNull(xmpMeta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART)); @@ -81,7 +82,7 @@ public virtual void LoadPdfADocumentTest() { NUnit.Framework.Assert.IsFalse(pdfADoc.GetPage(1).GetPdfObject().IsFlushed()); IValidationContext validationContext = new PdfDocumentValidationContext(pdfADoc, new List()); pdfADoc.CheckIsoConformance(validationContext); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_2B, pdfADoc.GetConformanceLevel()); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_2B, pdfADoc.GetConformance().GetAConformance()); NUnit.Framework.Assert.IsTrue(pdfADoc.GetPageFactoryPublic() is PdfAPageFactory); pdfADoc.UpdateXmpMetadataPublic(); XMPMeta xmpMeta = pdfADoc.GetXmpMetadata(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAppendModeTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAppendModeTest.cs index f30c80fdca..8626cf3da2 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAppendModeTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAAppendModeTest.cs @@ -72,8 +72,8 @@ public virtual void AddPageInAppendModeTest() { private static void CreateInputPdfADocument(String docName) { PdfWriter writer = new PdfWriter(docName); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfABarcodeTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfABarcodeTest.cs index 7d45feb21c..987742fc9a 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfABarcodeTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfABarcodeTest.cs @@ -171,8 +171,8 @@ private void FillBarcode1D(Barcode1D barcode1D, String code) { private Document CreatePdfATaggedDocument(String outPdf) { PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", + "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); Document doc = new Document(pdfDocument); pdfDocument.SetTagged(); return doc; diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfACheckfieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfACheckfieldTest.cs index 7f561d2a3a..5179d19d90 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfACheckfieldTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfACheckfieldTest.cs @@ -57,15 +57,15 @@ public virtual void PdfA1aCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1A).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -82,15 +82,15 @@ public virtual void PdfA1aCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1A).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1A).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -107,13 +107,13 @@ public virtual void PdfA1bCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1B).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -130,13 +130,13 @@ public virtual void PdfA1bCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_1B).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -153,15 +153,15 @@ public virtual void PdfA2aCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2A).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2A).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -178,15 +178,15 @@ public virtual void PdfA2aCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2A).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2A).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -203,13 +203,13 @@ public virtual void PdfA2bCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2B).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2B).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -226,13 +226,13 @@ public virtual void PdfA2bCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2B).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2B).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -249,13 +249,13 @@ public virtual void PdfA2uCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2U, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2U, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2U).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2U).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -272,13 +272,13 @@ public virtual void PdfA2uCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2U, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2U, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_2U).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_2U).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -295,15 +295,15 @@ public virtual void PdfA3aCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3A).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3A).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -320,15 +320,15 @@ public virtual void PdfA3aCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3A, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3A, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3A).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3A).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -345,13 +345,13 @@ public virtual void PdfA3bCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3B).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3B).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -368,13 +368,13 @@ public virtual void PdfA3bCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3B).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3B).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -391,13 +391,13 @@ public virtual void PdfA3uCheckFieldOffAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3U, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3U, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3U).CreateCheckBox - ().SetValue("Off"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3U).CreateCheckBox().SetValue + ("Off"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); @@ -414,13 +414,13 @@ public virtual void PdfA3uCheckFieldOnAppearanceTest() { String diff = "diff_" + name + "_"; PdfWriter writer = new PdfWriter(outPath); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3U, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3U, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); doc.AddNewPage(); PdfAcroForm form = PdfFormCreator.GetAcroForm(doc, true); PdfFormField chk = new CheckBoxFormFieldBuilder(doc, "name").SetWidgetRectangle(new Rectangle(100, 500, 50 - , 50)).SetCheckType(CheckBoxType.CHECK).SetConformanceLevel(PdfAConformanceLevel.PDF_A_3U).CreateCheckBox - ().SetValue("On"); + , 50)).SetCheckType(CheckBoxType.CHECK).SetConformance(PdfConformance.PDF_A_3U).CreateCheckBox().SetValue + ("On"); chk.GetFirstFormAnnotation().SetBorderColor(ColorConstants.BLACK); chk.GetFirstFormAnnotation().SetBorderWidth(1); form.AddField(chk); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfADocumentTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfADocumentTest.cs index 693512901f..606a9b890d 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfADocumentTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfADocumentTest.cs @@ -39,8 +39,8 @@ public virtual void CheckCadesSignatureTypeIsoConformance() { PdfWriter writer = new PdfWriter(new MemoryStream(), new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0 )); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument document = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument document = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "" + , "http://www.color.org", "sRGB IEC61966-2.1", @is)); document.CheckIsoConformance(new SignTypeValidationContext(true)); } @@ -49,8 +49,8 @@ public virtual void CheckCMSSignatureTypeIsoConformance() { PdfWriter writer = new PdfWriter(new MemoryStream(), new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0 )); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfADocument document = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument document = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "" + , "http://www.color.org", "sRGB IEC61966-2.1", @is)); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => document.CheckIsoConformance (new SignTypeValidationContext(false))); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.SIGNATURE_SHALL_CONFORM_TO_ONE_OF_THE_PADES_PROFILE diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFlushingTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFlushingTest.cs index b15e6bfbde..fe5b5b02d4 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFlushingTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFlushingTest.cs @@ -59,8 +59,8 @@ public virtual void FlushingTest01() { String cmpPdf = sourceFolder + "cmp/PdfAFlushingTest/cmp_pdfA1b_flushingTest01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); PdfImageXObject imageXObject = new PdfImageXObject(ImageDataFactory.Create(sourceFolder + "Desert.jpg")); imageXObject.MakeIndirect(doc); @@ -80,8 +80,8 @@ public virtual void FlushingTest02() { String cmpPdf = sourceFolder + "cmp/PdfAFlushingTest/cmp_pdfA2b_flushingTest02.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); PdfImageXObject imageXObject = new PdfImageXObject(ImageDataFactory.Create(sourceFolder + "Desert.jpg")); imageXObject.MakeIndirect(doc); @@ -101,8 +101,8 @@ public virtual void FlushingTest03() { String cmpPdf = sourceFolder + "cmp/PdfAFlushingTest/cmp_pdfA3b_flushingTest03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); PdfImageXObject imageXObject = new PdfImageXObject(ImageDataFactory.Create(sourceFolder + "Desert.jpg")); canvas.AddXObjectFittedIntoRectangle(imageXObject, new Rectangle(30, 300, 300, 300)); @@ -124,8 +124,8 @@ public virtual void TryToFlushFontTest() { String cmpPdf = sourceFolder + "cmp_tryToFlushFontTest.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument pdfDoc = (PdfADocument)new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent - ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)).SetTagged(); + PdfADocument pdfDoc = (PdfADocument)new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent( + "Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)).SetTagged(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); font.MakeIndirect(pdfDoc); @@ -152,7 +152,7 @@ public virtual void AddUnusedStreamObjectsTest() { String cmpPdf = sourceFolder + "cmp/PdfAFlushingTest/cmp_pdfA1b_docWithUnusedObjects_3.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); - PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom" + PdfADocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom" , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); pdfDocument.AddNewPage(); PdfDictionary unusedDictionary = new PdfDictionary(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFontTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFontTest.cs index 5b1485cd61..e35270e16a 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFontTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFontTest.cs @@ -61,8 +61,8 @@ public virtual void FontCheckPdfA1_01() { String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_pdfA1b_fontCheckPdfA1_01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -77,8 +77,8 @@ public virtual void FontCheckPdfA1_01() { public virtual void FontCheckPdfA1_02() { PdfWriter writer = new PdfWriter(new MemoryStream()); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfEncodings.WINANSI, PdfFontFactory.EmbeddingStrategy .FORCE_NOT_EMBEDDED); @@ -96,8 +96,8 @@ public virtual void FontCheckPdfA1_03() { String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_pdfA1b_fontCheckPdfA1_03.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy @@ -113,8 +113,8 @@ public virtual void FontCheckPdfA1_03() { public virtual void FontCheckPdfA1_04() { PdfWriter writer = new PdfWriter(new MemoryStream()); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont("Helvetica", "WinAnsi", PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED ); @@ -132,8 +132,8 @@ public virtual void FontCheckPdfA1_05() { String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_pdfA1b_fontCheckPdfA1_05.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSansCJKtc-Light.otf", "Identity-H"); @@ -150,8 +150,8 @@ public virtual void FontCheckPdfA2_01() { String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_pdfA2b_fontCheckPdfA2_01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy @@ -169,8 +169,8 @@ public virtual void FontCheckPdfA3_01() { String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_pdfA3b_fontCheckPdfA3_01.pdf"; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_3B, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy @@ -213,7 +213,7 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test01() { // Here we produced valid pdfa files in the past by silently removing not valid symbols // But right now we check for used glyphs which don't exist in the font and throw exception Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "symbolicTtfCharEncodingsPdfA1Test01.pdf", "Symbols1.ttf", "", PdfAConformanceLevel.PDF_A_1B)); + "symbolicTtfCharEncodingsPdfA1Test01.pdf", "Symbols1.ttf", "", PdfAConformance.PDF_A_1B)); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.EMBEDDED_FONTS_SHALL_DEFINE_ALL_REFERENCED_GLYPHS , e.Message); } @@ -222,8 +222,8 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test01() { public virtual void SymbolicTtfCharEncodingsPdfA1Test02() { // if you specify encoding, symbolic font is treated as non-symbolic Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "symbolicTtfCharEncodingsPdfA1Test02.pdf", "Symbols1.ttf", PdfEncodings.MACROMAN, PdfAConformanceLevel - .PDF_A_1B)); + "symbolicTtfCharEncodingsPdfA1Test02.pdf", "Symbols1.ttf", PdfEncodings.MACROMAN, PdfAConformance.PDF_A_1B + )); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.EMBEDDED_FONTS_SHALL_DEFINE_ALL_REFERENCED_GLYPHS , e.Message); } @@ -232,8 +232,7 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test02() { public virtual void SymbolicTtfCharEncodingsPdfA1Test03() { // if you specify encoding, symbolic font is treated as non-symbolic Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "symbolicTtfCharEncodingsPdfA1Test03.pdf", "Symbols1.ttf", "ISO-8859-1", PdfAConformanceLevel.PDF_A_1B - )); + "symbolicTtfCharEncodingsPdfA1Test03.pdf", "Symbols1.ttf", "ISO-8859-1", PdfAConformance.PDF_A_1B)); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.EMBEDDED_FONTS_SHALL_DEFINE_ALL_REFERENCED_GLYPHS , e.Message); } @@ -241,8 +240,8 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test03() { [NUnit.Framework.Test] public virtual void SymbolicTtfCharEncodingsPdfA1Test04() { Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "symbolicTtfCharEncodingsPdfA1Test04.pdf", "Symbols1.ttf", PdfEncodings.WINANSI, PdfAConformanceLevel. - PDF_A_1B)); + "symbolicTtfCharEncodingsPdfA1Test04.pdf", "Symbols1.ttf", PdfEncodings.WINANSI, PdfAConformance.PDF_A_1B + )); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.EMBEDDED_FONTS_SHALL_DEFINE_ALL_REFERENCED_GLYPHS , e.Message); } @@ -253,8 +252,8 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test05() { // Here we produced valid pdfa files in the past by silently removing not valid symbols // But right now we check for used glyphs which don't exist in the font and throw exception Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "symbolicTtfCharEncodingsPdfA1Test05.pdf", "Symbols1.ttf", PdfEncodings.IDENTITY_H, PdfAConformanceLevel - .PDF_A_1B)); + "symbolicTtfCharEncodingsPdfA1Test05.pdf", "Symbols1.ttf", PdfEncodings.IDENTITY_H, PdfAConformance.PDF_A_1B + )); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.EMBEDDED_FONTS_SHALL_DEFINE_ALL_REFERENCED_GLYPHS , e.Message); } @@ -263,15 +262,14 @@ public virtual void SymbolicTtfCharEncodingsPdfA1Test05() { public virtual void NonSymbolicTtfCharEncodingsPdfA1Test01() { // encoding must be either winansi or macroman, by default winansi is used CreateDocumentWithFont("nonSymbolicTtfCharEncodingsPdfA1Test01.pdf", "FreeSans.ttf", PdfEncodings.WINANSI, - PdfAConformanceLevel.PDF_A_1B); + PdfAConformance.PDF_A_1B); } [NUnit.Framework.Test] public virtual void NonSymbolicTtfCharEncodingsPdfA1Test02() { // encoding must be either winansi or macroman, by default winansi is used Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => CreateDocumentWithFont( - "nonSymbolicTtfCharEncodingsPdfA1Test02.pdf", "FreeSans.ttf", "ISO-8859-1", PdfAConformanceLevel.PDF_A_2B - )); + "nonSymbolicTtfCharEncodingsPdfA1Test02.pdf", "FreeSans.ttf", "ISO-8859-1", PdfAConformance.PDF_A_2B)); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.ALL_NON_SYMBOLIC_TRUE_TYPE_FONT_SHALL_SPECIFY_MAC_ROMAN_ENCODING_OR_WIN_ANSI_ENCODING , e.Message); } @@ -281,8 +279,8 @@ public virtual void NotdefInTrueTypeFontTest() { String outPdf = DESTINATION_FOLDER + "notdefInTrueTypeFont.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "# simple 32 0020 00C5 1987", PdfFontFactory.EmbeddingStrategy .PREFER_EMBEDDED); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); @@ -298,8 +296,8 @@ public virtual void NotdefFontTest2() { String outPdf = DESTINATION_FOLDER + "notdefFontTest2.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSans-Regular.ttf", "", PdfFontFactory.EmbeddingStrategy .PREFER_EMBEDDED); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); @@ -315,7 +313,7 @@ public virtual void GlyphLineWithUndefinedGlyphsTest() { String outPdf = DESTINATION_FOLDER + "glyphLineWithUndefinedGlyphs.pdf"; Stream icm = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); Document document = new Document(new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion - (PdfVersion.PDF_2_0)), PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + (PdfVersion.PDF_2_0)), PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" , "sRGB ICC preference", icm))); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSans-Regular.ttf", "", PdfFontFactory.EmbeddingStrategy .PREFER_EMBEDDED); @@ -331,8 +329,8 @@ public virtual void PdfArrayWithUndefinedGlyphsTest() { String outPdf = DESTINATION_FOLDER + "pdfArrayWithUndefinedGlyphs.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSans-Regular.ttf", "", PdfFontFactory.EmbeddingStrategy .PREFER_EMBEDDED); PdfCanvas canvas = new PdfCanvas(doc.AddNewPage()); @@ -354,8 +352,8 @@ public virtual void CreateDocumentWithType1FontAfmTest() { PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); writer.SetCompressionLevel(CompressionConstants.NO_COMPRESSION); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", - "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfFont pdfType1Font = PdfFontFactory.CreateFont(FontProgramFactory.CreateType1Font(SOURCE_FOLDER + "cmr10.afm" , SOURCE_FOLDER + "cmr10.pfb"), FontEncoding.FONT_SPECIFIC, PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED ); @@ -383,8 +381,8 @@ public virtual void CheckPdfA4FreeSansForceEmbeddedTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -401,8 +399,8 @@ public virtual void CheckPdfA4FreeSansForceNotEmbeddedTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(new MemoryStream(), writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfEncodings.WINANSI, PdfFontFactory.EmbeddingStrategy .FORCE_NOT_EMBEDDED); @@ -422,8 +420,8 @@ public virtual void CheckPdfA4FreeSansPreferNotEmbeddedTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy @@ -441,8 +439,8 @@ public virtual void CheckPdfA4HelveticaPreferEmbeddedTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(new MemoryStream(), writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont("Helvetica", "WinAnsi", PdfFontFactory.EmbeddingStrategy.PREFER_EMBEDDED ); @@ -462,8 +460,8 @@ public virtual void CheckPdfA4NotoSansCJKtcLightTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSansCJKtc-Light.otf", "Identity-H"); @@ -483,8 +481,8 @@ public virtual void CheckPdfA4Puritan2Test() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "Puritan2.otf", "Identity-H"); @@ -503,8 +501,8 @@ public virtual void CheckPdfA4Type3Test() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); // A A A A E E E ~ é String testString = "A A A A E E E ~ \u00E9"; //writing type3 font characters @@ -555,8 +553,8 @@ public virtual void CheckPdfA4UmingTtcTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateTtcFont(SOURCE_FOLDER + "uming.ttc", 0, "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED, false); @@ -575,8 +573,8 @@ public virtual void CheckPdfA4WoffTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "SourceSerif4-Black.woff", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -595,8 +593,8 @@ public virtual void CheckPdfA4SurrogatePairTest() { writerProperties.SetPdfVersion(PdfVersion.PDF_2_0); PdfWriter writer = new PdfWriter(outPdf, writerProperties); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "", - "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoEmoji-Regular.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); @@ -607,13 +605,13 @@ public virtual void CheckPdfA4SurrogatePairTest() { CompareResult(outPdf, cmpPdf, null); } - private void CreateDocumentWithFont(String outFileName, String fontFileName, String encoding, PdfAConformanceLevel - conformanceLevel) { + private void CreateDocumentWithFont(String outFileName, String fontFileName, String encoding, PdfAConformance + conformance) { String outPdf = DESTINATION_FOLDER + outFileName; String cmpPdf = SOURCE_FOLDER + "cmp/PdfAFontTest/cmp_" + outFileName; PdfWriter writer = new PdfWriter(outPdf); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfDocument doc = new PdfADocument(writer, conformanceLevel, new PdfOutputIntent("Custom", "", "http://www.color.org" + PdfDocument doc = new PdfADocument(writer, conformance, new PdfOutputIntent("Custom", "", "http://www.color.org" , "sRGB IEC61966-2.1", @is)); PdfPage page = doc.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + fontFileName, encoding, PdfFontFactory.EmbeddingStrategy @@ -637,8 +635,8 @@ private void CompareResult(String outPdf, String cmpPdf, String expectedVeraPdfW private void GeneratePdfA2WithCidFont(String fontFile, String outPdf) { using (PdfWriter writer = new PdfWriter(outPdf)) { using (Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) { - using (PdfDocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_2B, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is))) { + using (PdfDocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_2B, new PdfOutputIntent("Custom", + "", "http://www.color.org", "sRGB IEC61966-2.1", @is))) { PdfPage page = doc.AddNewPage(); // Identity-H must be embedded PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + fontFile, "Identity-H", PdfFontFactory.EmbeddingStrategy diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs index c6422b3c70..17e445d865 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs @@ -67,15 +67,15 @@ public virtual void PdfAButtonFieldTest() { Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); String file = "pdfAButtonField.pdf"; String filename = DESTINATION_FOLDER + file; - pdf = new PdfADocument(new PdfWriter(FileUtil.GetFileOutputStream(filename)), PdfAConformanceLevel.PDF_A_1B - , new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB ICC preference", @is)); + pdf = new PdfADocument(new PdfWriter(FileUtil.GetFileOutputStream(filename)), PdfAConformance.PDF_A_1B, new + PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB ICC preference", @is)); PageSize pageSize = PageSize.LETTER; Document doc = new Document(pdf, pageSize); PdfFontFactory.Register(SOURCE_FOLDER + "FreeSans.ttf", SOURCE_FOLDER + "FreeSans.ttf"); PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy. PREFER_EMBEDDED); - PdfButtonFormField group = new RadioFormFieldBuilder(pdf, "group").SetConformanceLevel(PdfAConformanceLevel - .PDF_A_1B).CreateRadioGroup(); + PdfButtonFormField group = new RadioFormFieldBuilder(pdf, "group").SetConformance(PdfConformance.PDF_A_1B) + .CreateRadioGroup(); group.SetValue(""); group.SetReadOnly(true); Paragraph p = new Paragraph(); @@ -112,15 +112,15 @@ public virtual void PdfA1DocWithPdfA1ButtonFieldTest() { String fileName = DESTINATION_FOLDER + name + ".pdf"; String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_pdfA1DocWithPdfA1ButtonField.pdf"; Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); - PdfFormField emptyField = new NonTerminalFormFieldBuilder(pdfDoc, "empty").SetConformanceLevel(conformanceLevel - ).CreateNonTerminalFormField(); + PdfFormField emptyField = new NonTerminalFormFieldBuilder(pdfDoc, "empty").SetConformance(conformance).CreateNonTerminalFormField + (); emptyField.AddKid(new PushButtonFormFieldBuilder(pdfDoc, "button").SetWidgetRectangle(new Rectangle(36, 756 - , 20, 20)).SetConformanceLevel(conformanceLevel).CreatePushButton().SetFieldFlags(PdfAnnotation.PRINT) - .SetFieldName("button").SetValue("hello")); + , 20, 20)).SetConformance(conformance).CreatePushButton().SetFieldFlags(PdfAnnotation.PRINT).SetFieldName + ("button").SetValue("hello")); form.AddField(emptyField); pdfDoc.Close(); NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(fileName, cmp, DESTINATION_FOLDER)); @@ -134,13 +134,12 @@ public virtual void PdfA1DocWithPdfA1CheckBoxFieldTest() { String fileName = DESTINATION_FOLDER + name + ".pdf"; String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_pdfA1DocWithPdfA1CheckBoxField.pdf"; Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); form.AddField(new CheckBoxFormFieldBuilder(pdfDoc, "checkBox").SetWidgetRectangle(new Rectangle(36, 726, 20 - , 20)).SetCheckType(CheckBoxType.STAR).SetConformanceLevel(conformanceLevel).CreateCheckBox().SetValue - ("1")); + , 20)).SetCheckType(CheckBoxType.STAR).SetConformance(conformance).CreateCheckBox().SetValue("1")); pdfDoc.Close(); NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(fileName, cmp, DESTINATION_FOLDER)); NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(fileName)); @@ -156,16 +155,15 @@ public virtual void PdfA1DocWithPdfA1ChoiceFieldTest() { PdfFont fontFreeSans = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfArray options = new PdfArray(); options.Add(new PdfString("Name")); options.Add(new PdfString("Surname")); PdfFormField choiceFormField = new ChoiceFormFieldBuilder(pdfDoc, "choice").SetWidgetRectangle(new Rectangle - (36, 696, 100, 70)).SetOptions(options).SetConformanceLevel(conformanceLevel).CreateList().SetValue("1" - , true); + (36, 696, 100, 70)).SetOptions(options).SetConformance(conformance).CreateList().SetValue("1", true); choiceFormField.SetFont(fontFreeSans); form.AddField(choiceFormField); pdfDoc.Close(); @@ -182,12 +180,12 @@ public virtual void PdfA1DocWithPdfA1ComboBoxFieldTest() { PdfFont fontCJK = PdfFontFactory.CreateFont(SOURCE_FOLDER + "NotoSansCJKtc-Light.otf", PdfEncodings.IDENTITY_H , PdfFontFactory.EmbeddingStrategy.FORCE_EMBEDDED); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfFormField choiceFormField = new ChoiceFormFieldBuilder(pdfDoc, "combo").SetWidgetRectangle(new Rectangle - (156, 616, 70, 70)).SetOptions(new String[] { "用", "规", "表" }).SetConformanceLevel(conformanceLevel).CreateComboBox + (156, 616, 70, 70)).SetOptions(new String[] { "用", "规", "表" }).SetConformance(conformance).CreateComboBox ().SetValue("用"); choiceFormField.SetFont(fontCJK); form.AddField(choiceFormField); @@ -206,13 +204,13 @@ public virtual void PdfA1DocWithPdfA1ListFieldTest() { PdfFont fontFreeSans = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfChoiceFormField f = new ChoiceFormFieldBuilder(pdfDoc, "list").SetWidgetRectangle(new Rectangle(86, 556 - , 50, 200)).SetOptions(new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }).SetConformanceLevel - (conformanceLevel).CreateList(); + , 50, 200)).SetOptions(new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }).SetConformance + (conformance).CreateList(); f.SetValue("9").SetFont(fontFreeSans); f.SetValue("4"); f.SetTopIndex(2); @@ -232,13 +230,12 @@ public virtual void PdfA1DocWithPdfA1PushButtonFieldTest() { PdfFont fontFreeSans = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfFormField pushButtonFormField = new PushButtonFormFieldBuilder(pdfDoc, "push button").SetWidgetRectangle - (new Rectangle(36, 526, 100, 20)).SetCaption("Push").SetConformanceLevel(conformanceLevel).CreatePushButton - (); + (new Rectangle(36, 526, 100, 20)).SetCaption("Push").SetConformance(conformance).CreatePushButton(); pushButtonFormField.SetFont(fontFreeSans).SetFontSize(12); form.AddField(pushButtonFormField); pdfDoc.Close(); @@ -253,14 +250,14 @@ public virtual void PdfA1DocWithPdfA1RadioButtonFieldTest() { String fileName = DESTINATION_FOLDER + name + ".pdf"; String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_pdfA1DocWithPdfA1RadioButtonField.pdf"; Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); String pdfFormFieldName = "radio group"; - RadioFormFieldBuilder builder = new RadioFormFieldBuilder(pdfDoc, pdfFormFieldName).SetConformanceLevel(conformanceLevel + RadioFormFieldBuilder builder = new RadioFormFieldBuilder(pdfDoc, pdfFormFieldName).SetConformance(conformance ); - PdfButtonFormField radioGroup = builder.SetConformanceLevel(conformanceLevel).CreateRadioGroup(); + PdfButtonFormField radioGroup = builder.SetConformance(conformance).CreateRadioGroup(); radioGroup.SetValue(""); PdfFormAnnotation radio1 = builder.CreateRadioButton("1", new Rectangle(36, 496, 20, 20)).SetBorderWidth(2 ).SetBorderColor(ColorConstants.ORANGE); @@ -284,13 +281,12 @@ public virtual void PdfA1DocWithPdfA1TextFieldTest() { .FORCE_EMBEDDED); fontFreeSans.SetSubset(false); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfFormField textFormField = new TextFormFieldBuilder(pdfDoc, "text").SetWidgetRectangle(new Rectangle(36, - 466, 90, 20)).SetConformanceLevel(conformanceLevel).CreateText().SetValue("textField").SetValue("iText" - ); + 466, 90, 20)).SetConformance(conformance).CreateText().SetValue("textField").SetValue("iText"); textFormField.SetFont(fontFreeSans).SetFontSize(12); form.AddField(textFormField); pdfDoc.Close(); @@ -308,11 +304,11 @@ public virtual void PdfA1DocWithPdfA1SignatureFieldTest() { .FORCE_EMBEDDED); fontFreeSans.SetSubset(false); Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm"); - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_1B; - PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformanceLevel, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); + PdfConformance conformance = PdfConformance.PDF_A_1B; + PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), conformance.GetAConformance(), new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is)); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); - PdfFormField signFormField = new SignatureFormFieldBuilder(pdfDoc, "signature").SetConformanceLevel(conformanceLevel + PdfFormField signFormField = new SignatureFormFieldBuilder(pdfDoc, "signature").SetConformance(conformance ).CreateSignature(); signFormField.SetFont(fontFreeSans).SetFontSize(20); form.AddField(signFormField); @@ -327,15 +323,14 @@ public virtual void MergePdfADocWithFormTest() { String fileName = DESTINATION_FOLDER + "pdfADocWithTextFormField.pdf"; String mergedDocFileName = DESTINATION_FOLDER + "mergedPdfADoc.pdf"; using (Stream @is = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) { - using (PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), PdfAConformanceLevel.PDF_A_1B, new - PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB ICC preference", @is))) { + using (PdfADocument pdfDoc = new PdfADocument(new PdfWriter(fileName), PdfAConformance.PDF_A_1B, new PdfOutputIntent + ("Custom", "", "http://www.color.org", "sRGB ICC preference", @is))) { using (Document doc = new Document(pdfDoc)) { PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", PdfEncodings.WINANSI); doc.Add(new Paragraph(new Text("Some text").SetFont(font).SetFontSize(10))); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfFormField field = new TextFormFieldBuilder(pdfDoc, "text").SetWidgetRectangle(new Rectangle(150, 100, 100 - , 20)).SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreateText().SetValue("textField").SetFieldName - ("text"); + , 20)).SetConformance(PdfConformance.PDF_A_1B).CreateText().SetValue("textField").SetFieldName("text"); field.SetFont(font).SetFontSize(10); field.GetFirstFormAnnotation().SetPage(1); form.AddField(field, pdfDoc.GetPage(1)); @@ -347,8 +342,8 @@ public virtual void MergePdfADocWithFormTest() { PdfADocument pdfDocToMerge; using (Stream is_1 = FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) { using (PdfDocument newDoc = new PdfDocument(new PdfReader(fileName))) { - pdfDocToMerge = new PdfADocument(new PdfWriter(mergedDocFileName).SetSmartMode(true), PdfAConformanceLevel - .PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB ICC preference", is_1)); + pdfDocToMerge = new PdfADocument(new PdfWriter(mergedDocFileName).SetSmartMode(true), PdfAConformance.PDF_A_1B + , new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB ICC preference", is_1)); newDoc.CopyPagesTo(1, newDoc.GetNumberOfPages(), pdfDocToMerge, new PdfPageFormCopier()); } } @@ -416,7 +411,7 @@ public virtual void TestCheckboxWithPDFA() { CheckBox checkBox = new CheckBox("CheckBox"); checkBox.SetChecked(true); checkBox.SetInteractive(true); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_1A); + checkBox.SetPdfConformance(PdfConformance.PDF_A_1A); doc.Add(checkBox); } ); @@ -552,17 +547,17 @@ public virtual void TestCopyPagesDoesntEmbedHelveticaFont() { PdfFont font = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfWriter writer = new PdfWriter(simplePdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) + ); Document document = new Document(doc); document.Add(new InputField("inputfield1").SetFont(font).SetInteractive(true).SetValue("Hello there")); document.Add(new Paragraph("Hello there paragraph").SetFont(font)); doc.Close(); PdfWriter writer2 = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc2 = new PdfADocument(writer2, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", - "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc2 = new PdfADocument(writer2, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) + ); PdfDocument docToCopy = new PdfDocument(new PdfReader(simplePdf)); docToCopy.CopyPagesTo(1, 1, doc2, new PdfPageFormCopier()); docToCopy.Close(); @@ -593,8 +588,7 @@ public virtual void PdfASignatureFieldWithTextAndFontTest() { signatureFieldAppearance2.SetContent(new SignedAppearanceText().SetLocationLine("Byeeee")); signatureFieldAppearance2.SetInteractive(true); PdfSignatureFormField signatureFormField = signatureFormFieldBuilder.SetWidgetRectangle(new Rectangle(200, - 200, 40, 40)).SetFont(fontFreeSans).SetConformanceLevel(PdfAConformanceLevel.PDF_A_4).CreateSignature( - ); + 200, 40, 40)).SetFont(fontFreeSans).SetConformance(PdfConformance.PDF_A_4).CreateSignature(); signatureFormField.GetFirstFormAnnotation().SetFormFieldElement(signatureFieldAppearance2); form.AddField(signatureFormField); } @@ -603,9 +597,9 @@ public virtual void PdfASignatureFieldWithTextAndFontTest() { private void MakePdfDocument(String outPdf, String cmp, Action consumer) { PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4E, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4E, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) + ); Document document = new Document(doc); consumer(document); doc.Close(); @@ -622,14 +616,14 @@ private IList> GenerateFormFields() { inputs.Add(() => { CheckBox checkBox = new CheckBox("CheckBox"); checkBox.SetChecked(true); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_4); + checkBox.SetPdfConformance(PdfConformance.PDF_A_4); return checkBox; } ); inputs.Add(() => { CheckBox checkBox = new CheckBox("CheckBox1"); checkBox.SetChecked(false); - checkBox.SetPdfConformanceLevel(PdfAConformanceLevel.PDF_A_4); + checkBox.SetPdfConformance(PdfConformance.PDF_A_4); return checkBox; } ); @@ -716,8 +710,8 @@ public override void Draw(DrawContext context) { Rectangle bbox = GetInnerAreaBBox(); PdfDocument pdf = context.GetDocument(); PdfAcroForm form = PdfFormCreator.GetAcroForm(pdf, true); - PdfFormAnnotation chk = new RadioFormFieldBuilder(pdf, "").SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B - ).CreateRadioButton(_value, bbox); + PdfFormAnnotation chk = new RadioFormFieldBuilder(pdf, "").SetConformance(PdfConformance.PDF_A_1B).CreateRadioButton + (_value, bbox); _group.AddKid(chk); chk.SetPage(pageNumber); chk.SetVisibility(PdfFormAnnotation.VISIBLE); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAIndirectObjectsCountLimitTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAIndirectObjectsCountLimitTest.cs index 06741bb3ed..f03f92f297 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAIndirectObjectsCountLimitTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAIndirectObjectsCountLimitTest.cs @@ -40,11 +40,11 @@ public class PdfAIndirectObjectsCountLimitTest : ExtendedITextTest { [NUnit.Framework.Test] public virtual void ValidAmountOfIndirectObjectsTest() { - PdfA1Checker testChecker = new _PdfA1Checker_58(PdfAConformanceLevel.PDF_A_1B); + PdfA1Checker testChecker = new _PdfA1Checker_57(PdfAConformance.PDF_A_1B); using (Stream icm = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm")) { using (Stream fos = new MemoryStream()) { - using (Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformanceLevel.PDF_A_1B - , GetOutputIntent(icm)))) { + using (Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformance.PDF_A_1B, GetOutputIntent + (icm)))) { PdfADocument pdfa = (PdfADocument)document.GetPdfDocument(); pdfa.checker = testChecker; document.Add(BuildContent()); @@ -53,8 +53,8 @@ public virtual void ValidAmountOfIndirectObjectsTest() { } } - private sealed class _PdfA1Checker_58 : PdfA1Checker { - public _PdfA1Checker_58(PdfAConformanceLevel baseArg1) + private sealed class _PdfA1Checker_57 : PdfA1Checker { + public _PdfA1Checker_57(PdfAConformance baseArg1) : base(baseArg1) { } @@ -67,10 +67,10 @@ protected internal override long GetMaxNumberOfIndirectObjects() { // limit per "mock specification" conformance exception shouldn't be thrown [NUnit.Framework.Test] public virtual void InvalidAmountOfIndirectObjectsTest() { - PdfA1Checker testChecker = new _PdfA1Checker_83(PdfAConformanceLevel.PDF_A_1B); + PdfA1Checker testChecker = new _PdfA1Checker_82(PdfAConformance.PDF_A_1B); using (Stream icm = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm")) { using (Stream fos = new MemoryStream()) { - Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformanceLevel.PDF_A_1B, GetOutputIntent + Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformance.PDF_A_1B, GetOutputIntent (icm))); PdfADocument pdfa = (PdfADocument)document.GetPdfDocument(); pdfa.checker = testChecker; @@ -85,8 +85,8 @@ public virtual void InvalidAmountOfIndirectObjectsTest() { } } - private sealed class _PdfA1Checker_83 : PdfA1Checker { - public _PdfA1Checker_83(PdfAConformanceLevel baseArg1) + private sealed class _PdfA1Checker_82 : PdfA1Checker { + public _PdfA1Checker_82(PdfAConformance baseArg1) : base(baseArg1) { } @@ -97,7 +97,7 @@ protected internal override long GetMaxNumberOfIndirectObjects() { [NUnit.Framework.Test] public virtual void InvalidAmountOfIndirectObjectsAppendModeTest() { - PdfA1Checker testChecker = new _PdfA1Checker_111(PdfAConformanceLevel.PDF_A_1B); + PdfA1Checker testChecker = new _PdfA1Checker_110(PdfAConformance.PDF_A_1B); using (Stream fis = FileUtil.GetInputStreamForFile(sourceFolder + "pdfs/pdfa10IndirectObjects.pdf")) { using (Stream fos = new MemoryStream()) { PdfADocument pdfa = new PdfADocument(new PdfReader(fis), new PdfWriter(fos), new StampingProperties().UseAppendMode @@ -113,8 +113,8 @@ public virtual void InvalidAmountOfIndirectObjectsAppendModeTest() { } } - private sealed class _PdfA1Checker_111 : PdfA1Checker { - public _PdfA1Checker_111(PdfAConformanceLevel baseArg1) + private sealed class _PdfA1Checker_110 : PdfA1Checker { + public _PdfA1Checker_110(PdfAConformance baseArg1) : base(baseArg1) { } diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfALongStringTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfALongStringTest.cs index 57b91c4ff2..cc1118da50 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfALongStringTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfALongStringTest.cs @@ -55,7 +55,7 @@ public virtual void RunTest() { String filename = destinationFolder + file; using (Stream icm = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm")) { using (Stream fos = FileUtil.GetFileOutputStream(filename)) { - Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformanceLevel.PDF_A_3U, new PdfOutputIntent + Document document = new Document(new PdfADocument(new PdfWriter(fos), PdfAConformance.PDF_A_3U, new PdfOutputIntent ("Custom", "", "http://www.color.org", "sRGB ICC preference", icm))); StringBuilder stringBuilder = new StringBuilder(LOREM_IPSUM); while (stringBuilder.Length < STRING_LENGTH_LIMIT) { diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPageTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPageTest.cs index e961faba4f..484c3d62ce 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPageTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPageTest.cs @@ -53,8 +53,8 @@ public virtual void CheckThatFlushingPreventedWhenAddingElementToDocument() { // Expected log message that page flushing was not performed String outPdf = destinationFolder + "checkThatFlushingPreventedWhenAddingElementToDocument.pdf"; PdfWriter writer = new PdfWriter(outPdf); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); @@ -83,8 +83,8 @@ public virtual void CheckThatFlushingPreventedWithFalseFlushResourcesContentStre // Expected log message that page flushing was not performed String outPdf = destinationFolder + "checkThatFlushingPreventedWithFalseFlushResourcesContentStreams.pdf"; PdfWriter writer = new PdfWriter(outPdf); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); @@ -106,8 +106,8 @@ public virtual void CheckThatFlushingPreventedWithFalseFlushResourcesContentStre public virtual void CheckFlushingWhenPdfDocumentIsClosing() { String outPdf = destinationFolder + "checkFlushingWhenPdfDocumentIsClosing.pdf"; PdfWriter writer = new PdfWriter(outPdf); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); @@ -129,8 +129,8 @@ public virtual void CheckFlushingWhenPdfDocumentIsClosing() { public virtual void CheckFlushingWithTrueFlushResourcesContentStreams() { String outPdf = destinationFolder + "checkFlushingWithTrueFlushResourcesContentStreams.pdf"; PdfWriter writer = new PdfWriter(outPdf); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); @@ -152,8 +152,8 @@ public virtual void CheckFlushingWithTrueFlushResourcesContentStreams() { public virtual void CheckFlushingOfCheckedPage() { String outPdf = destinationFolder + "checkFlushingOfCheckedPage.pdf"; PdfWriter writer = new PdfWriter(outPdf); - PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom" - , "", "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" + PdfADocument pdfDoc = new PdfADocument(writer, PdfAConformance.PDF_A_1A, new PdfOutputIntent("Custom", "", + "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm" ))); pdfDoc.SetTagged(); pdfDoc.GetCatalog().SetLang(new PdfString("en-US")); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs index b54c245eb3..7bc426649a 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAPushbuttonfieldTest.cs @@ -60,7 +60,7 @@ public virtual void PdfA1bButtonAppearanceTest() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); @@ -69,7 +69,7 @@ public virtual void PdfA1bButtonAppearanceTest() { PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfFormField button = new PushButtonFormFieldBuilder(doc, "push button").SetWidgetRectangle(rect).SetCaption - ("push").SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreatePushButton(); + ("push").SetConformance(PdfConformance.PDF_A_1B).CreatePushButton(); button.SetFont(font).SetFontSize(12); form.AddField(button); doc.Close(); @@ -89,7 +89,7 @@ public virtual void PdfA1bButtonAppearanceRegenerateTest() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); @@ -98,7 +98,7 @@ public virtual void PdfA1bButtonAppearanceRegenerateTest() { PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfFormField button = new PushButtonFormFieldBuilder(doc, "push button").SetWidgetRectangle(rect).SetCaption - ("push").SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreatePushButton(); + ("push").SetConformance(PdfConformance.PDF_A_1B).CreatePushButton(); button.SetFont(font).SetFontSize(12); button.RegenerateField(); form.AddField(button); @@ -119,7 +119,7 @@ public virtual void PdfA1bButtonAppearanceSetValueTest() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); @@ -128,7 +128,7 @@ public virtual void PdfA1bButtonAppearanceSetValueTest() { PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfFormField button = new PushButtonFormFieldBuilder(doc, "push button").SetWidgetRectangle(rect).SetCaption - ("push").SetConformanceLevel(PdfAConformanceLevel.PDF_A_1B).CreatePushButton(); + ("push").SetConformance(PdfConformance.PDF_A_1B).CreatePushButton(); button.SetFont(font).SetFontSize(12); button.SetValue("button"); form.AddField(button); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfARadiofieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfARadiofieldTest.cs index a97b1222bb..3ad83af184 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfARadiofieldTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfARadiofieldTest.cs @@ -58,7 +58,7 @@ public virtual void PdfA1aRadioFieldOffAppearanceTest() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_1B, outputIntent); doc.SetTagged(); doc.GetCatalog().SetLang(new PdfString("en-US")); doc.AddNewPage(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfATransparencyCheckTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfATransparencyCheckTest.cs index 6286fa0e64..12949dc306 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfATransparencyCheckTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfATransparencyCheckTest.cs @@ -55,7 +55,7 @@ public static void BeforeClass() { [NUnit.Framework.Test] public virtual void TextTransparencyNoOutputIntentTest() { PdfWriter writer = new PdfWriter(new MemoryStream()); - PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, null); + PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, null); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page1 = pdfDocument.AddNewPage(); @@ -75,7 +75,7 @@ public virtual void TextTransparencyNoOutputIntentTest() { public virtual void TransparentTextWithGroupColorSpaceTest() { String outPdf = destinationFolder + "transparencyAndCS.pdf"; String cmpPdf = cmpFolder + "cmp_transparencyAndCS.pdf"; - PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_3B, null); + PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_3B, null); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); PdfPage page = pdfDocument.AddNewPage(); @@ -104,8 +104,7 @@ public virtual void TransparentTextWithGroupColorSpaceTest() { [NUnit.Framework.Test] public virtual void ImageTransparencyTest() { - PdfDocument pdfDoc = new PdfADocument(new PdfWriter(new MemoryStream()), PdfAConformanceLevel.PDF_A_3B, null - ); + PdfDocument pdfDoc = new PdfADocument(new PdfWriter(new MemoryStream()), PdfAConformance.PDF_A_3B, null); PdfPage page = pdfDoc.AddNewPage(); PdfCanvas canvas = new PdfCanvas(page); page.GetResources().SetDefaultRgb(new PdfCieBasedCs.CalRgb(new float[] { 0.3f, 0.4f, 0.5f })); @@ -121,7 +120,7 @@ public virtual void ImageTransparencyTest() { [NUnit.Framework.Test] public virtual void NestedXObjectWithTransparencyTest() { PdfWriter writer = new PdfWriter(new MemoryStream()); - PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_3B, null); + PdfDocument pdfDocument = new PdfADocument(writer, PdfAConformance.PDF_A_3B, null); PdfFormXObject form1 = new PdfFormXObject(new Rectangle(0, 0, 50, 50)); PdfCanvas canvas1 = new PdfCanvas(form1, pdfDocument); canvas1.SaveState(); @@ -155,7 +154,7 @@ public virtual void NestedXObjectWithTransparencyTest() { public virtual void TestTransparencyObjectsAbsence() { String outPdf = destinationFolder + "transparencyObjectsAbsence.pdf"; String cmpPdf = cmpFolder + "cmp_transparencyObjectsAbsence.pdf"; - PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformanceLevel.PDF_A_3B, null); + PdfDocument pdfDocument = new PdfADocument(new PdfWriter(outPdf), PdfAConformance.PDF_A_3B, null); PdfPage page = pdfDocument.AddNewPage(); PdfFont font = PdfFontFactory.CreateFont(sourceFolder + "FreeSans.ttf", "Identity-H", PdfFontFactory.EmbeddingStrategy .FORCE_EMBEDDED); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAXmpTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAXmpTest.cs index c810ad4dd7..4f4fe73211 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAXmpTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAXmpTest.cs @@ -54,7 +54,7 @@ public virtual void KeywordsInfoTestPdfA1b() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(new PdfWriter(outFile), PdfAConformanceLevel.PDF_A_1B, outputIntent); + PdfADocument doc = new PdfADocument(new PdfWriter(outFile), PdfAConformance.PDF_A_1B, outputIntent); doc.AddNewPage(); doc.GetDocumentInfo().SetKeywords("key1, key2 , key3;key4,key5"); doc.Close(); @@ -71,7 +71,7 @@ public virtual void KeywordsInfoTestPdfA2b() { Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfADocument doc = new PdfADocument(new PdfWriter(outFile), PdfAConformanceLevel.PDF_A_2B, outputIntent); + PdfADocument doc = new PdfADocument(new PdfWriter(outFile), PdfAConformance.PDF_A_2B, outputIntent); doc.AddNewPage(); doc.GetDocumentInfo().SetKeywords("key1, key2 , key3;key4,key5"); doc.Close(); @@ -85,18 +85,18 @@ public virtual void KeywordsInfoTestPdfA2b() { public virtual void SaveAndReadDocumentWithCanonicalXmpMetadata() { String outFile = destinationFolder + "saveAndReadDocumentWithCanonicalXmpMetadata.pdf"; String cmpFile = cmpFolder + "cmp_saveAndReadDocumentWithCanonicalXmpMetadata.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_2B; + PdfAConformance conformance = PdfAConformance.PDF_A_2B; PdfOutputIntent outputIntent; using (Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm")) { outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is); } - using (PdfADocument doc = new PdfADocument(new PdfWriter(outFile), conformanceLevel, outputIntent)) { + using (PdfADocument doc = new PdfADocument(new PdfWriter(outFile), conformance, outputIntent)) { doc.AddNewPage(); XMPMeta xmp = XMPMetaFactory.Create(); - xmp.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, conformanceLevel.GetPart(), new PropertyOptions().SetSchemaNode + xmp.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, conformance.GetPart(), new PropertyOptions().SetSchemaNode + (true)); + xmp.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE, conformance.GetLevel(), new PropertyOptions().SetSchemaNode (true)); - xmp.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE, conformanceLevel.GetConformance(), new PropertyOptions - ().SetSchemaNode(true)); SerializeOptions options = new SerializeOptions().SetUseCanonicalFormat(true).SetUseCompactFormat(false); doc.SetXmpMetadata(xmp, options); doc.SetTagged(); @@ -143,7 +143,7 @@ private void GeneratePdfAWithUA(Stream os) { using (Stream @is = FileUtil.GetInputStreamForFile(sourceFolder + "sRGB Color Space Profile.icm")) { outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", @is); } - PdfDocument pdfDoc = new PdfADocument(w, PdfAConformanceLevel.PDF_A_2A, outputIntent).SetTagged(); + PdfDocument pdfDoc = new PdfADocument(w, PdfAConformance.PDF_A_2A, outputIntent).SetTagged(); pdfDoc.GetDocumentInfo().SetTitle("Test document"); pdfDoc.GetCatalog().SetViewerPreferences(new PdfViewerPreferences().SetDisplayDocTitle(true)); pdfDoc.GetCatalog().SetLang(new PdfString("en")); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1CheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1CheckerTest.cs index a980aa7606..b3971494ad 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1CheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1CheckerTest.cs @@ -31,7 +31,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA1CheckerTest : ExtendedITextTest { - private PdfA1Checker pdfA1Checker = new PdfA1Checker(PdfAConformanceLevel.PDF_A_1B); + private PdfA1Checker pdfA1Checker = new PdfA1Checker(PdfAConformance.PDF_A_1B); [NUnit.Framework.SetUp] public virtual void Before() { diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1ImplementationLimitsCheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1ImplementationLimitsCheckerTest.cs index 85156311bf..7a53af827e 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1ImplementationLimitsCheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA1ImplementationLimitsCheckerTest.cs @@ -34,7 +34,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA1ImplementationLimitsCheckerTest : ExtendedITextTest { - private PdfA1Checker pdfA1Checker = new PdfA1Checker(PdfAConformanceLevel.PDF_A_1B); + private PdfA1Checker pdfA1Checker = new PdfA1Checker(PdfAConformance.PDF_A_1B); private const int MAX_ARRAY_CAPACITY = 8191; diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerGlyphsTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerGlyphsTest.cs index 73d940fc19..08bacaab2b 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerGlyphsTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerGlyphsTest.cs @@ -32,7 +32,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA2CheckerGlyphsTest : ExtendedITextTest { - private readonly PdfA2Checker pdfA2Checker = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B); + private readonly PdfA2Checker pdfA2Checker = new PdfA2Checker(PdfAConformance.PDF_A_2B); [NUnit.Framework.SetUp] public virtual void Before() { diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTest.cs index 5c39a951d5..9edfce0284 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTest.cs @@ -35,7 +35,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA2CheckerTest : ExtendedITextTest { - private PdfA2Checker pdfA2Checker = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B); + private PdfA2Checker pdfA2Checker = new PdfA2Checker(PdfAConformance.PDF_A_2B); [NUnit.Framework.Test] public virtual void CheckNameEntryShouldBeUniqueBetweenDefaultAndAdditionalConfigs() { diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTransparencyTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTransparencyTest.cs index 63f900d928..8d2e3819e9 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTransparencyTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2CheckerTransparencyTest.cs @@ -37,7 +37,7 @@ public class PdfA2CheckerTransparencyTest : ExtendedITextTest { [NUnit.Framework.SetUp] public virtual void Before() { - pdfA2Checker = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B); + pdfA2Checker = new PdfA2Checker(PdfAConformance.PDF_A_2B); pdfA2Checker.SetFullCheckMode(true); } diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2ImplementationLimitsCheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2ImplementationLimitsCheckerTest.cs index 3ecb7df306..eedba13a96 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2ImplementationLimitsCheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA2ImplementationLimitsCheckerTest.cs @@ -35,7 +35,7 @@ public class PdfA2ImplementationLimitsCheckerTest : ExtendedITextTest { [NUnit.Framework.SetUp] public virtual void Before() { - pdfA2Checker = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B); + pdfA2Checker = new PdfA2Checker(PdfAConformance.PDF_A_2B); pdfA2Checker.SetFullCheckMode(true); } diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA3CheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA3CheckerTest.cs index 2a14bf21aa..a67c8aec8e 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA3CheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA3CheckerTest.cs @@ -28,7 +28,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA3CheckerTest : ExtendedITextTest { - private PdfA1Checker pdfA3Checker = new PdfA3Checker(PdfAConformanceLevel.PDF_A_3B); + private PdfA1Checker pdfA3Checker = new PdfA3Checker(PdfAConformance.PDF_A_3B); [NUnit.Framework.SetUp] public virtual void Before() { diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4ImplementationLimitsTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4ImplementationLimitsTest.cs index a2d52c55f1..8b48f8d2f7 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4ImplementationLimitsTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4ImplementationLimitsTest.cs @@ -30,7 +30,7 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfa.Checker { [NUnit.Framework.Category("UnitTest")] public class PdfA4ImplementationLimitsTest : ExtendedITextTest { - private PdfA4Checker pdfA4Checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + private PdfA4Checker pdfA4Checker = new PdfA4Checker(PdfAConformance.PDF_A_4); [NUnit.Framework.SetUp] public virtual void Before() { @@ -39,7 +39,7 @@ public virtual void Before() { [NUnit.Framework.Test] public virtual void IndependentLongStringTest() { - int maxAllowedLength = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B).GetMaxStringLength(); + int maxAllowedLength = new PdfA2Checker(PdfAConformance.PDF_A_2B).GetMaxStringLength(); int testLength = maxAllowedLength + 1; PdfString longString = PdfACheckerTestUtils.GetLongString(testLength); //An exception should not be thrown because pdf/a-4 spec allows any length strings @@ -49,7 +49,7 @@ public virtual void IndependentLongStringTest() { [NUnit.Framework.Test] public virtual void LongStringInContentStreamTest() { - int maxAllowedLength = new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B).GetMaxStringLength(); + int maxAllowedLength = new PdfA2Checker(PdfAConformance.PDF_A_2B).GetMaxStringLength(); int testLength = maxAllowedLength + 1; PdfString longString = PdfACheckerTestUtils.GetLongString(testLength); String newContentString = PdfACheckerTestUtils.GetStreamWithValue(longString); @@ -62,7 +62,7 @@ public virtual void LongStringInContentStreamTest() { [NUnit.Framework.Test] public virtual void IndependentLargeRealTest() { - PdfNumber largeNumber = new PdfNumber(new PdfA2Checker(PdfAConformanceLevel.PDF_A_2B).GetMaxRealValue()); + PdfNumber largeNumber = new PdfNumber(new PdfA2Checker(PdfAConformance.PDF_A_2B).GetMaxRealValue()); // An exception shall not be thrown pdf/a-4 has no number limits pdfA4Checker.CheckPdfObject(largeNumber); NUnit.Framework.Assert.AreEqual(float.MaxValue, largeNumber.FloatValue(), 0.001f); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4MetaDataTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4MetaDataTest.cs index 730982a3e4..d848332bb1 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4MetaDataTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfA4MetaDataTest.cs @@ -49,9 +49,9 @@ public static void BeforeClass() { [NUnit.Framework.Test] public virtual void PdfA4DocumentShallContainMetaDataKey() { PdfDictionary dictionary = new PdfDictionary(); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(PdfAConformanceLevel.PDF_A_4).CheckMetaData(dictionary); + new PdfA4Checker(PdfAConformance.PDF_A_4).CheckMetaData(dictionary); } ); NUnit.Framework.Assert.AreEqual(e.Message, PdfaExceptionMessageConstant.A_CATALOG_DICTIONARY_SHALL_CONTAIN_METADATA_ENTRY @@ -62,7 +62,7 @@ public virtual void PdfA4DocumentShallContainMetaDataKey() { public virtual void PdfA4DocumentMetaDataDocumentShallNotContainBytes() { String startHeader = "\n"; byte[] bytes = startHeader.GetBytes(); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(bytes)); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -77,7 +77,7 @@ public virtual void PdfA4DocumentMetaDataDocumentShallNotContainBytes() { public virtual void PdfA4DocumentMetaDataDocumentShallNotContainEncoding() { String startHeader = "\n"; byte[] bytes = startHeader.GetBytes(); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(bytes)); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -93,7 +93,7 @@ public virtual void PdfA4DocumentMetaDataDocumentShallNotContainEncodingInAnyPac String startHeader = "\n"; startHeader += "\n"; byte[] bytes = startHeader.GetBytes(); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(bytes)); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -108,7 +108,7 @@ public virtual void PdfA4DocumentMetaDataDocumentShallNotContainEncodingInAnyPac public virtual void PdfA4DocumentMetaDataDocumentShallNotThrowInAnyPacket() { byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithMultipleXmpHeaders.xmp" )); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(bytes)); NUnit.Framework.Assert.DoesNotThrow(() => { @@ -123,7 +123,7 @@ public virtual void PdfA4DocumentMetaDataRevPropertyHasCorrectPrefix() { )); String xmpContent = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII).Replace ("pdfaid:rev", "rev"); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(xmpContent.GetBytes(System.Text.Encoding.UTF8))); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfException), () => { @@ -138,7 +138,7 @@ public virtual void PdfA4DocumentMetaDataIdentificationSchemaUsesCorrectNamespac )); String xmpContent = iText.Commons.Utils.JavaUtil.GetStringForBytes(bytes, System.Text.Encoding.ASCII).Replace ("http://www.aiim.org/pdfa/ns/id/", "no_link"); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(xmpContent.GetBytes(System.Text.Encoding.UTF8))); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -153,7 +153,7 @@ public virtual void PdfA4DocumentMetaDataIdentificationSchemaUsesCorrectNamespac public virtual void PdfA4DocumentMetaDataDocumentShallThrowInSecondPacket() { byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithMultipleXmpHeadersWithEnconding.xmp" )); - PdfA4Checker checker = new PdfA4Checker(PdfAConformanceLevel.PDF_A_4); + PdfA4Checker checker = new PdfA4Checker(PdfAConformance.PDF_A_4); PdfDictionary catalog = new PdfDictionary(); catalog.Put(PdfName.Metadata, new PdfStream(bytes)); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -167,8 +167,8 @@ public virtual void PdfA4DocumentMetaDataDocumentShallThrowInSecondPacket() { [NUnit.Framework.Test] public virtual void TestAbsentPartPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testAbsentPartPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -177,7 +177,7 @@ public virtual void TestAbsentPartPropertyPDFA4() { } )); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_PART @@ -187,8 +187,8 @@ public virtual void TestAbsentPartPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestInvalidPartPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testInvalidPartPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -202,7 +202,7 @@ public virtual void TestInvalidPartPropertyPDFA4() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_PART @@ -212,8 +212,8 @@ public virtual void TestInvalidPartPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestNullPartPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testNullPartPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -227,7 +227,7 @@ public virtual void TestNullPartPropertyPDFA4() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_PART @@ -237,8 +237,8 @@ public virtual void TestNullPartPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestAbsentRevisionPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testNullRevisionPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -247,7 +247,7 @@ public virtual void TestAbsentRevisionPropertyPDFA4() { } )); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_REV @@ -257,8 +257,8 @@ public virtual void TestAbsentRevisionPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestInvalidValueNotNumberRevisionPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testInvalidValueNotNumberRevisionPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -272,7 +272,7 @@ public virtual void TestInvalidValueNotNumberRevisionPropertyPDFA4() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_REV @@ -282,8 +282,8 @@ public virtual void TestInvalidValueNotNumberRevisionPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestInvalidValueNotLength4RevisionPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testInvalidValueNotLength4RevisionPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -297,7 +297,7 @@ public virtual void TestInvalidValueNotLength4RevisionPropertyPDFA4() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_REV @@ -307,8 +307,8 @@ public virtual void TestInvalidValueNotLength4RevisionPropertyPDFA4() { [NUnit.Framework.Test] public virtual void TestInvalidValueLength4ButContainsLettersRevisionPropertyPDFA4() { String outPdf = DESTINATION_FOLDER + "testInvalidValueLength4ButContainsLettersRevisionPropertyPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -322,7 +322,7 @@ public virtual void TestInvalidValueLength4ButContainsLettersRevisionPropertyPDF } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_REV @@ -332,8 +332,8 @@ public virtual void TestInvalidValueLength4ButContainsLettersRevisionPropertyPDF [NUnit.Framework.Test] public virtual void TestValidPropertiesPDFA4() { String outPdf = DESTINATION_FOLDER + "testValidPropertiesPDFA4.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -341,7 +341,7 @@ public virtual void TestValidPropertiesPDFA4() { } )); NUnit.Framework.Assert.DoesNotThrow(() => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); } @@ -349,8 +349,8 @@ public virtual void TestValidPropertiesPDFA4() { [NUnit.Framework.Test] public virtual void TestValidPropertiesPDFA4F() { String outPdf = DESTINATION_FOLDER + "testValidPropertiesPDFA4F.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4F; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4F; + GeneratePdfADocument(conformance, outPdf, (doc) => { PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); doc.AddFileAttachment("file.txt", fs); @@ -361,7 +361,7 @@ public virtual void TestValidPropertiesPDFA4F() { } )); NUnit.Framework.Assert.DoesNotThrow(() => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); } @@ -369,8 +369,8 @@ public virtual void TestValidPropertiesPDFA4F() { [NUnit.Framework.Test] public virtual void TestValidPropertiesPDFA4E() { String outPdf = DESTINATION_FOLDER + "testValidPropertiesPDFA4E.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4E; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4E; + GeneratePdfADocument(conformance, outPdf, (doc) => { } ); PdfADocument pdfADocument = new PdfADocument(new PdfReader(outPdf), new PdfWriter(new MemoryStream())); @@ -378,7 +378,7 @@ public virtual void TestValidPropertiesPDFA4E() { } )); NUnit.Framework.Assert.DoesNotThrow(() => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); } @@ -386,8 +386,8 @@ public virtual void TestValidPropertiesPDFA4E() { [NUnit.Framework.Test] public virtual void TestAbsentConformancePropertyPDFA4F() { String outPdf = DESTINATION_FOLDER + "testAbsentConformancePropertyPDFA4F.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4F; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4F; + GeneratePdfADocument(conformance, outPdf, (doc) => { PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); doc.AddFileAttachment("file.txt", fs); @@ -398,14 +398,14 @@ public virtual void TestAbsentConformancePropertyPDFA4F() { xmpMeta.DeleteProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE); } )); - NUnit.Framework.Assert.DoesNotThrow(() => new PdfA4Checker(conformanceLevel).CheckMetaData(catalog)); + NUnit.Framework.Assert.DoesNotThrow(() => new PdfA4Checker(conformance).CheckMetaData(catalog)); } [NUnit.Framework.Test] public virtual void TestInvalidConformancePropertyPDFA4F() { String outPdf = DESTINATION_FOLDER + "testInvalidConformancePropertyPDFA4F.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4F; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4F; + GeneratePdfADocument(conformance, outPdf, (doc) => { PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); doc.AddFileAttachment("file.txt", fs); @@ -422,7 +422,7 @@ public virtual void TestInvalidConformancePropertyPDFA4F() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_CONFORMANCE @@ -431,26 +431,26 @@ public virtual void TestInvalidConformancePropertyPDFA4F() { [NUnit.Framework.Test] public virtual void HistoryWithXmpMetaData() { - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; + PdfAConformance conformance = PdfAConformance.PDF_A_4; byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithCorrectHistory.xmp")); XMPMeta xmpMeta = XMPMetaFactory.Parse(new MemoryStream(bytes)); PdfDictionary catalog = new PdfDictionary(); MemoryStream baos = new MemoryStream(); XMPMetaFactory.Serialize(xmpMeta, baos); catalog.Put(PdfName.Metadata, new PdfStream(baos.ToArray())); - NUnit.Framework.Assert.DoesNotThrow(() => new PdfA4Checker(conformanceLevel).CheckMetaData(catalog)); + NUnit.Framework.Assert.DoesNotThrow(() => new PdfA4Checker(conformance).CheckMetaData(catalog)); } [NUnit.Framework.Test] public virtual void HistoryWithInvalidWhenXmpMetaData() { - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; + PdfAConformance conformance = PdfAConformance.PDF_A_4; byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithInvalidWhen.xmp")); XMPMeta xmpMeta = XMPMetaFactory.Parse(new MemoryStream(bytes)); PdfDictionary catalog = new PdfDictionary(); MemoryStream baos = new MemoryStream(); XMPMetaFactory.Serialize(xmpMeta, baos); catalog.Put(PdfName.Metadata, new PdfStream(baos.ToArray())); - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => new PdfA4Checker(conformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => new PdfA4Checker(conformance ).CheckMetaData(catalog)); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HISTORY_ENTRY_SHALL_CONTAIN_KEY , "stEvt:when"), e.Message); @@ -458,14 +458,14 @@ public virtual void HistoryWithInvalidWhenXmpMetaData() { [NUnit.Framework.Test] public virtual void HistoryWithInvalidActionXmpMetaData() { - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; + PdfAConformance conformance = PdfAConformance.PDF_A_4; byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithInvalidAction.xmp")); XMPMeta xmpMeta = XMPMetaFactory.Parse(new MemoryStream(bytes)); PdfDictionary catalog = new PdfDictionary(); MemoryStream baos = new MemoryStream(); XMPMetaFactory.Serialize(xmpMeta, baos); catalog.Put(PdfName.Metadata, new PdfStream(baos.ToArray())); - Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => new PdfA4Checker(conformanceLevel + Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => new PdfA4Checker(conformance ).CheckMetaData(catalog)); NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HISTORY_ENTRY_SHALL_CONTAIN_KEY , "stEvt:action"), e.Message); @@ -473,22 +473,22 @@ public virtual void HistoryWithInvalidActionXmpMetaData() { [NUnit.Framework.Test] public virtual void HistoryWithEmptyEntryXmpMetaData() { - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4; + PdfAConformance conformance = PdfAConformance.PDF_A_4; byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithEmpty.xmp")); XMPMeta xmpMeta = XMPMetaFactory.Parse(new MemoryStream(bytes)); PdfDictionary catalog = new PdfDictionary(); MemoryStream baos = new MemoryStream(); XMPMetaFactory.Serialize(xmpMeta, baos); catalog.Put(PdfName.Metadata, new PdfStream(baos.ToArray())); - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); NUnit.Framework.Assert.IsTrue(true); } [NUnit.Framework.Test] public virtual void TestNullConformancePropertyPDFA4F() { String outPdf = DESTINATION_FOLDER + "testNullConformancePropertyPDFA4F.pdf"; - PdfAConformanceLevel conformanceLevel = PdfAConformanceLevel.PDF_A_4F; - GeneratePdfADocument(conformanceLevel, outPdf, (doc) => { + PdfAConformance conformance = PdfAConformance.PDF_A_4F; + GeneratePdfADocument(conformance, outPdf, (doc) => { PdfFileSpec fs = PdfFileSpec.CreateEmbeddedFileSpec(doc, "file".GetBytes(), "description", "file.txt", null , null, null); doc.AddFileAttachment("file.txt", fs); @@ -505,7 +505,7 @@ public virtual void TestNullConformancePropertyPDFA4F() { } )); Exception e_1 = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { - new PdfA4Checker(conformanceLevel).CheckMetaData(catalog); + new PdfA4Checker(conformance).CheckMetaData(catalog); } ); NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_CONFORMANCE @@ -516,9 +516,9 @@ public virtual void TestNullConformancePropertyPDFA4F() { public virtual void PdfA4DocumentMetaDataIsNotUTF8Encoded() { String outPdf = DESTINATION_FOLDER + "metadataNotUTF8.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) + ); doc.AddNewPage(); byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "xmp/xmpWithEmpty.xmp")); XMPMeta xmpMeta = XMPMetaFactory.Parse(new MemoryStream(bytes)); @@ -537,9 +537,9 @@ public virtual void PdfA4DocumentPageMetaDataIsNotUTF8Encoded() { byte[] bytes = File.ReadAllBytes(System.IO.Path.Combine(SOURCE_FOLDER + "encodedXmp.xmp")); String outPdf = DESTINATION_FOLDER + "metadataNotUTF8.pdf"; PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_4, new PdfOutputIntent("Custom", "" - , "http://www.color.org", "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm" - ))); + PdfADocument doc = new PdfADocument(writer, PdfAConformance.PDF_A_4, new PdfOutputIntent("Custom", "", "http://www.color.org" + , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) + ); doc.AddNewPage(); doc.GetPage(1).SetXmpMetadata(bytes); Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => { @@ -549,13 +549,13 @@ public virtual void PdfA4DocumentPageMetaDataIsNotUTF8Encoded() { NUnit.Framework.Assert.AreEqual(PdfaExceptionMessageConstant.INVALID_XMP_METADATA_ENCODING, e.Message); } - private void GeneratePdfADocument(PdfAConformanceLevel conformanceLevel, String outPdf, Action consumer) { + private void GeneratePdfADocument(PdfAConformance conformance, String outPdf, Action consumer + ) { if (outPdf == null) { NUnit.Framework.Assert.Fail(); } PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)); - PdfADocument doc = new PdfADocument(writer, conformanceLevel, new PdfOutputIntent("Custom", "", "http://www.color.org" + PdfADocument doc = new PdfADocument(writer, conformance, new PdfOutputIntent("Custom", "", "http://www.color.org" , "sRGB IEC61966-2.1", FileUtil.GetInputStreamForFile(SOURCE_FOLDER + "sRGB Color Space Profile.icm")) ); doc.AddNewPage(); diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfACheckerTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfACheckerTest.cs index 92854bdeb5..64c5456cce 100644 --- a/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfACheckerTest.cs +++ b/itext.tests/itext.pdfa.tests/itext/pdfa/checker/PdfACheckerTest.cs @@ -76,7 +76,7 @@ public virtual void CheckAppearanceStreamsWithCycle() { [NUnit.Framework.Test] public virtual void CheckContentStreamPdfAText() { //TODO adapt after DEVSIX-5759 is fixed - PdfA1Checker testChecker = new PdfA1Checker(PdfAConformanceLevel.PDF_A_1B); + PdfA1Checker testChecker = new PdfA1Checker(PdfAConformance.PDF_A_1B); PdfADocument pdfa = new PdfADocument(new PdfReader(new FileInfo(SOURCE_FOLDER + "InlineImagesPdfA.pdf")), new PdfWriter(new MemoryStream()).SetSmartMode(true)); PdfStream firstContentStream = pdfa.GetPage(1).GetFirstContentStream(); diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUAAnnotationsTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUAAnnotationsTest.cs index 97272d98df..9b23a93c7c 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUAAnnotationsTest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUAAnnotationsTest.cs @@ -72,12 +72,12 @@ public virtual void InitializeFramework() { [NUnit.Framework.Test] public virtual void Ua1LinkAnnotNoDirectChildOfAnnotTest() { - framework.AddSuppliers(new _Generator_122()); + framework.AddSuppliers(new _Generator_118()); framework.AssertBothValid("ua1LinkAnnotNoDirectChildOfAnnotTest"); } - private sealed class _Generator_122 : UaValidationTestFramework.Generator { - public _Generator_122() { + private sealed class _Generator_118 : UaValidationTestFramework.Generator { + public _Generator_118() { } public IBlockElement Generate() { @@ -98,7 +98,7 @@ public virtual void Ua1WidgetAnnotNoDirectChildOfAnnotTest() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm acroForm = PdfFormCreator.GetAcroForm(pdfDoc, true); PdfButtonFormField checkBox = new CheckBoxFormFieldBuilder(pdfDoc, "checkbox").SetWidgetRectangle(new Rectangle - (10, 650, 40, 20)).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateCheckBox(); + (10, 650, 40, 20)).SetConformance(PdfConformance.PDF_UA_1).CreateCheckBox(); checkBox.SetAlternativeName("widget"); acroForm.AddField(checkBox); } @@ -350,8 +350,7 @@ public virtual void Ua1PushBtnNestedWithinFormTest() { PdfAcroForm acroForm = PdfFormCreator.GetAcroForm(pdfDoc, true); // The rest of the tests for widgets can be found in com.itextpdf.pdfua.checkers.PdfUAFormFieldsTest PdfFormField button = new PushButtonFormFieldBuilder(pdfDoc, "push button").SetWidgetRectangle(new Rectangle - (10, 650, 40, 20)).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).SetFont(LoadFont()).CreatePushButton - (); + (10, 650, 40, 20)).SetConformance(PdfConformance.PDF_UA_1).SetFont(LoadFont()).CreatePushButton(); button.SetAlternativeName("widget"); acroForm.AddField(button); } diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUADocumentTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUADocumentTest.cs new file mode 100644 index 0000000000..42424e568f --- /dev/null +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUADocumentTest.cs @@ -0,0 +1,44 @@ +/* +This file is part of the iText (R) project. +Copyright (c) 1998-2024 Apryse Group NV +Authors: Apryse Software. + +This program is offered under a commercial and under the AGPL license. +For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below. + +AGPL licensing: +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +using System; +using System.IO; +using iText.Kernel.Pdf; +using iText.Pdfua.Logs; +using iText.Test; +using iText.Test.Attributes; + +namespace iText.Pdfua { + [NUnit.Framework.Category("IntegrationTest")] + public class PdfUADocumentTest : ExtendedITextTest { + private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext + .CurrentContext.TestDirectory) + "/resources/itext/pdfua/PdfUADocumentTest/"; + + [NUnit.Framework.Test] + [LogMessage(PdfUALogMessageConstants.PDF_TO_PDF_UA_CONVERSION_IS_NOT_SUPPORTED, LogLevel = LogLevelConstants + .WARN)] + public virtual void OpenNotUaDocumentTest() { + NUnit.Framework.Assert.DoesNotThrow(() => new PdfUADocument(new PdfReader(SOURCE_FOLDER + "usualPdf.pdf"), + new PdfWriter(new MemoryStream()), new PdfUAConfig(PdfUAConformance.PDF_UA_1, "simple doc", "eng"))); + } + } +} diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUASignerTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUASignerTest.cs index 5605c3dc9f..5a3eec9911 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUASignerTest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUASignerTest.cs @@ -184,8 +184,8 @@ public virtual void NormalPdfSignerInvisibleSignatureWithoutTU() { // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android) [NUnit.Framework.Test] - [NUnit.Framework.Ignore("DEVSIX-8571")] public virtual void NormalPdfSignerVisibleSignatureWithoutFont() { + // TODO DEVSIX-8623 Spike: Get rid of PdfADocument, PdfUADocument, PdfAAgnosticDocument in favour of one PdfDocument //This test should fail with the appropriate exception MemoryStream inPdf = GenerateSimplePdfUA1Document(); String outPdf = GenerateSignatureNormal(inPdf, "normalPdfSignerVisibleSignatureWithoutFont", (signer) => { @@ -224,8 +224,8 @@ public virtual void NormalPdfSignerVisibleSignatureWithFont() { // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android) [NUnit.Framework.Test] - [NUnit.Framework.Ignore("DEVSIX-8571")] public virtual void NormalPdfSignerVisibleSignatureWithFontEmptyTU() { + // TODO DEVSIX-8623 Spike: Get rid of PdfADocument, PdfUADocument, PdfAAgnosticDocument in favour of one PdfDocument //Should throw the correct exception if the font is not set MemoryStream inPdf = GenerateSimplePdfUA1Document(); PdfFont font = PdfFontFactory.CreateFont(FONT); @@ -269,8 +269,8 @@ public virtual void PdfSignerVisibleSignatureWithFontEmptyTU() { private MemoryStream GenerateSimplePdfUA1Document() { MemoryStream @out = new MemoryStream(); - PdfUADocument pdfUADocument = new PdfUADocument(new PdfWriter(@out), new PdfUAConfig(PdfUAConformanceLevel - .PDFUA_1, "Title", "en-US")); + PdfUADocument pdfUADocument = new PdfUADocument(new PdfWriter(@out), new PdfUAConfig(PdfUAConformance.PDF_UA_1 + , "Title", "en-US")); pdfUADocument.AddNewPage(); pdfUADocument.Close(); return new MemoryStream(@out.ToArray()); @@ -323,7 +323,7 @@ public PdfUaSigner(PdfReader reader, Stream outputStream, String path, StampingP protected override PdfDocument InitDocument(PdfReader reader, PdfWriter writer, StampingProperties properties ) { - return new PdfUADocument(reader, writer, new PdfUAConfig(PdfUAConformanceLevel.PDFUA_1, "Title", "en-US")); + return new PdfUADocument(reader, writer, new PdfUAConfig(PdfUAConformance.PDF_UA_1, "Title", "en-US")); } } //\endcond diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUATestPdfDocument.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUATestPdfDocument.cs index 67e5377103..9939cfa818 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUATestPdfDocument.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/PdfUATestPdfDocument.cs @@ -42,7 +42,7 @@ public PdfUATestPdfDocument(PdfReader reader, PdfWriter writer, StampingProperti } private static PdfUAConfig CreateConfig() { - return new PdfUAConfig(PdfUAConformanceLevel.PDFUA_1, "English pangram", "en-US"); + return new PdfUAConfig(PdfUAConformance.PDF_UA_1, "English pangram", "en-US"); } } } diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAFormFieldsTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAFormFieldsTest.cs index f78c43c594..2a00492819 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAFormFieldsTest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAFormFieldsTest.cs @@ -61,12 +61,12 @@ public virtual void SetUp() { [NUnit.Framework.Test] public virtual void TestCheckBox() { - framework.AddSuppliers(new _Generator_83()); + framework.AddSuppliers(new _Generator_95()); framework.AssertBothValid("testCheckBox.pdf"); } - private sealed class _Generator_83 : UaValidationTestFramework.Generator { - public _Generator_83() { + private sealed class _Generator_95 : UaValidationTestFramework.Generator { + public _Generator_95() { } public IBlockElement Generate() { @@ -76,17 +76,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxWithCustomAppearance() { - framework.AddSuppliers(new _Generator_94()); + framework.AddSuppliers(new _Generator_106()); framework.AssertBothValid("testCheckBoxWithCustomAppearance.pdf"); } - private sealed class _Generator_94 : UaValidationTestFramework.Generator { - public _Generator_94() { + private sealed class _Generator_106 : UaValidationTestFramework.Generator { + public _Generator_106() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.SetBorder(new SolidBorder(ColorConstants.MAGENTA, 2)); cb.SetBackgroundColor(ColorConstants.YELLOW); return cb; @@ -95,17 +95,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxChecked() { - framework.AddSuppliers(new _Generator_109()); + framework.AddSuppliers(new _Generator_121()); framework.AssertBothValid("testCheckBox"); } - private sealed class _Generator_109 : UaValidationTestFramework.Generator { - public _Generator_109() { + private sealed class _Generator_121 : UaValidationTestFramework.Generator { + public _Generator_121() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.SetChecked(true); return cb; } @@ -113,17 +113,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxCheckedAlternativeDescription() { - framework.AddSuppliers(new _Generator_123()); + framework.AddSuppliers(new _Generator_135()); framework.AssertBothValid("testCheckBoxCheckedAlternativeDescription"); } - private sealed class _Generator_123 : UaValidationTestFramework.Generator { - public _Generator_123() { + private sealed class _Generator_135 : UaValidationTestFramework.Generator { + public _Generator_135() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.GetAccessibilityProperties().SetAlternateDescription("Yello"); cb.SetChecked(true); return cb; @@ -132,17 +132,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxCheckedCustomAppearance() { - framework.AddSuppliers(new _Generator_138()); + framework.AddSuppliers(new _Generator_150()); framework.AssertBothValid("testCheckBoxCheckedCustomAppearance"); } - private sealed class _Generator_138 : UaValidationTestFramework.Generator { - public _Generator_138() { + private sealed class _Generator_150 : UaValidationTestFramework.Generator { + public _Generator_150() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.SetChecked(true); cb.SetBorder(new SolidBorder(ColorConstants.CYAN, 2)); cb.SetBackgroundColor(ColorConstants.GREEN); @@ -154,17 +154,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxInteractive() { - framework.AddSuppliers(new _Generator_156()); + framework.AddSuppliers(new _Generator_168()); framework.AssertBothValid("testCheckBoxInteractive"); } - private sealed class _Generator_156 : UaValidationTestFramework.Generator { - public _Generator_156() { + private sealed class _Generator_168 : UaValidationTestFramework.Generator { + public _Generator_168() { } public IBlockElement Generate() { CheckBox checkBox = (CheckBox)new CheckBox("name").SetInteractive(true); - checkBox.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + checkBox.SetPdfConformance(PdfConformance.PDF_UA_1); checkBox.GetAccessibilityProperties().SetAlternateDescription("Alternative description"); return checkBox; } @@ -172,17 +172,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxInteractiveCustomAppearance() { - framework.AddSuppliers(new _Generator_170()); + framework.AddSuppliers(new _Generator_182()); framework.AssertBothValid("testCheckBoxInteractiveCustomAppearance"); } - private sealed class _Generator_170 : UaValidationTestFramework.Generator { - public _Generator_170() { + private sealed class _Generator_182 : UaValidationTestFramework.Generator { + public _Generator_182() { } public IBlockElement Generate() { CheckBox checkBox = (CheckBox)new CheckBox("name").SetInteractive(true); - checkBox.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + checkBox.SetPdfConformance(PdfConformance.PDF_UA_1); checkBox.GetAccessibilityProperties().SetAlternateDescription("Alternative description"); checkBox.SetBorder(new SolidBorder(ColorConstants.CYAN, 2)); checkBox.SetBackgroundColor(ColorConstants.GREEN); @@ -194,17 +194,17 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxInteractiveCustomAppearanceChecked() { - framework.AddSuppliers(new _Generator_188()); + framework.AddSuppliers(new _Generator_200()); framework.AssertBothValid("testCheckBoxInteractiveCustomAppearanceChecked"); } - private sealed class _Generator_188 : UaValidationTestFramework.Generator { - public _Generator_188() { + private sealed class _Generator_200 : UaValidationTestFramework.Generator { + public _Generator_200() { } public IBlockElement Generate() { CheckBox checkBox = (CheckBox)new CheckBox("name").SetInteractive(true); - checkBox.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + checkBox.SetPdfConformance(PdfConformance.PDF_UA_1); checkBox.GetAccessibilityProperties().SetAlternateDescription("Alternative description"); checkBox.SetBorder(new SolidBorder(ColorConstants.CYAN, 2)); checkBox.SetBackgroundColor(ColorConstants.GREEN); @@ -217,12 +217,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButton() { - framework.AddSuppliers(new _Generator_207()); + framework.AddSuppliers(new _Generator_219()); framework.AssertBothValid("testRadioButton"); } - private sealed class _Generator_207 : UaValidationTestFramework.Generator { - public _Generator_207() { + private sealed class _Generator_219 : UaValidationTestFramework.Generator { + public _Generator_219() { } public IBlockElement Generate() { @@ -232,12 +232,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonChecked() { - framework.AddSuppliers(new _Generator_218()); + framework.AddSuppliers(new _Generator_230()); framework.AssertBothValid("testRadioButtonChecked"); } - private sealed class _Generator_218 : UaValidationTestFramework.Generator { - public _Generator_218() { + private sealed class _Generator_230 : UaValidationTestFramework.Generator { + public _Generator_230() { } public IBlockElement Generate() { @@ -249,12 +249,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonCustomAppearance() { - framework.AddSuppliers(new _Generator_231()); + framework.AddSuppliers(new _Generator_243()); framework.AssertBothValid("testRadioButtonCustomAppearance"); } - private sealed class _Generator_231 : UaValidationTestFramework.Generator { - public _Generator_231() { + private sealed class _Generator_243 : UaValidationTestFramework.Generator { + public _Generator_243() { } public IBlockElement Generate() { @@ -268,12 +268,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonCustomAppearanceChecked() { - framework.AddSuppliers(new _Generator_246()); + framework.AddSuppliers(new _Generator_258()); framework.AssertBothValid("testRadioButtonCustomAppearanceChecked"); } - private sealed class _Generator_246 : UaValidationTestFramework.Generator { - public _Generator_246() { + private sealed class _Generator_258 : UaValidationTestFramework.Generator { + public _Generator_258() { } public IBlockElement Generate() { @@ -288,13 +288,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroup() { - framework.AddSuppliers(new _Generator_262()); - framework.AddSuppliers(new _Generator_268()); + framework.AddSuppliers(new _Generator_274()); + framework.AddSuppliers(new _Generator_280()); framework.AssertBothValid("testRadioButtonGroup"); } - private sealed class _Generator_262 : UaValidationTestFramework.Generator { - public _Generator_262() { + private sealed class _Generator_274 : UaValidationTestFramework.Generator { + public _Generator_274() { } public IBlockElement Generate() { @@ -302,8 +302,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_268 : UaValidationTestFramework.Generator { - public _Generator_268() { + private sealed class _Generator_280 : UaValidationTestFramework.Generator { + public _Generator_280() { } public IBlockElement Generate() { @@ -313,13 +313,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroupCustomAppearance() { - framework.AddSuppliers(new _Generator_280()); - framework.AddSuppliers(new _Generator_290()); + framework.AddSuppliers(new _Generator_292()); + framework.AddSuppliers(new _Generator_302()); framework.AssertBothValid("testRadioButtonGroup"); } - private sealed class _Generator_280 : UaValidationTestFramework.Generator { - public _Generator_280() { + private sealed class _Generator_292 : UaValidationTestFramework.Generator { + public _Generator_292() { } public IBlockElement Generate() { @@ -331,8 +331,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_290 : UaValidationTestFramework.Generator { - public _Generator_290() { + private sealed class _Generator_302 : UaValidationTestFramework.Generator { + public _Generator_302() { } public IBlockElement Generate() { @@ -346,13 +346,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroupCustomAppearanceChecked() { - framework.AddSuppliers(new _Generator_305()); - framework.AddSuppliers(new _Generator_315()); + framework.AddSuppliers(new _Generator_317()); + framework.AddSuppliers(new _Generator_327()); framework.AssertBothValid("testRadioButtonGroupCustomAppearanceChecked"); } - private sealed class _Generator_305 : UaValidationTestFramework.Generator { - public _Generator_305() { + private sealed class _Generator_317 : UaValidationTestFramework.Generator { + public _Generator_317() { } public IBlockElement Generate() { @@ -364,8 +364,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_315 : UaValidationTestFramework.Generator { - public _Generator_315() { + private sealed class _Generator_327 : UaValidationTestFramework.Generator { + public _Generator_327() { } public IBlockElement Generate() { @@ -380,12 +380,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonInteractive() { - framework.AddSuppliers(new _Generator_332()); + framework.AddSuppliers(new _Generator_344()); framework.AssertBothValid("testRadioButtonInteractive"); } - private sealed class _Generator_332 : UaValidationTestFramework.Generator { - public _Generator_332() { + private sealed class _Generator_344 : UaValidationTestFramework.Generator { + public _Generator_344() { } public IBlockElement Generate() { @@ -398,12 +398,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonCheckedInteractive() { - framework.AddSuppliers(new _Generator_346()); + framework.AddSuppliers(new _Generator_358()); framework.AssertBothValid("testRadioButtonChecked"); } - private sealed class _Generator_346 : UaValidationTestFramework.Generator { - public _Generator_346() { + private sealed class _Generator_358 : UaValidationTestFramework.Generator { + public _Generator_358() { } public IBlockElement Generate() { @@ -417,12 +417,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_361()); + framework.AddSuppliers(new _Generator_373()); framework.AssertBothValid("testRadioButtonCustomAppearance"); } - private sealed class _Generator_361 : UaValidationTestFramework.Generator { - public _Generator_361() { + private sealed class _Generator_373 : UaValidationTestFramework.Generator { + public _Generator_373() { } public IBlockElement Generate() { @@ -438,12 +438,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonCustomAppearanceCheckedInteractive() { - framework.AddSuppliers(new _Generator_378()); + framework.AddSuppliers(new _Generator_390()); framework.AssertBothValid("testRadioButtonCustomAppearanceCheckedInteractive"); } - private sealed class _Generator_378 : UaValidationTestFramework.Generator { - public _Generator_378() { + private sealed class _Generator_390 : UaValidationTestFramework.Generator { + public _Generator_390() { } public IBlockElement Generate() { @@ -460,13 +460,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroupInteractive() { - framework.AddSuppliers(new _Generator_396()); - framework.AddSuppliers(new _Generator_405()); + framework.AddSuppliers(new _Generator_408()); + framework.AddSuppliers(new _Generator_417()); framework.AssertBothValid("testRadioButtonGroupInteractive"); } - private sealed class _Generator_396 : UaValidationTestFramework.Generator { - public _Generator_396() { + private sealed class _Generator_408 : UaValidationTestFramework.Generator { + public _Generator_408() { } public IBlockElement Generate() { @@ -477,8 +477,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_405 : UaValidationTestFramework.Generator { - public _Generator_405() { + private sealed class _Generator_417 : UaValidationTestFramework.Generator { + public _Generator_417() { } public IBlockElement Generate() { @@ -491,13 +491,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroupCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_420()); framework.AddSuppliers(new _Generator_432()); + framework.AddSuppliers(new _Generator_444()); framework.AssertBothValid("testRadioButtonGroupInteractive"); } - private sealed class _Generator_420 : UaValidationTestFramework.Generator { - public _Generator_420() { + private sealed class _Generator_432 : UaValidationTestFramework.Generator { + public _Generator_432() { } public IBlockElement Generate() { @@ -511,8 +511,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_432 : UaValidationTestFramework.Generator { - public _Generator_432() { + private sealed class _Generator_444 : UaValidationTestFramework.Generator { + public _Generator_444() { } public IBlockElement Generate() { @@ -528,13 +528,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonGroupCustomAppearanceCheckedInteractive() { - framework.AddSuppliers(new _Generator_449()); framework.AddSuppliers(new _Generator_461()); + framework.AddSuppliers(new _Generator_473()); framework.AssertBothValid("testRadioButtonGroupCustomAppearanceCheckedInteractive"); } - private sealed class _Generator_449 : UaValidationTestFramework.Generator { - public _Generator_449() { + private sealed class _Generator_461 : UaValidationTestFramework.Generator { + public _Generator_461() { } public IBlockElement Generate() { @@ -548,8 +548,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_461 : UaValidationTestFramework.Generator { - public _Generator_461() { + private sealed class _Generator_473 : UaValidationTestFramework.Generator { + public _Generator_473() { } public IBlockElement Generate() { @@ -566,12 +566,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButton() { - framework.AddSuppliers(new _Generator_480(this)); + framework.AddSuppliers(new _Generator_492(this)); framework.AssertBothValid("testButton"); } - private sealed class _Generator_480 : UaValidationTestFramework.Generator { - public _Generator_480(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_492 : UaValidationTestFramework.Generator { + public _Generator_492(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -587,12 +587,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomAppearance() { - framework.AddSuppliers(new _Generator_494(this)); + framework.AddSuppliers(new _Generator_506(this)); framework.AssertBothValid("testButtonCustomAppearance"); } - private sealed class _Generator_494 : UaValidationTestFramework.Generator { - public _Generator_494(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_506 : UaValidationTestFramework.Generator { + public _Generator_506(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -610,12 +610,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonSingleLine() { - framework.AddSuppliers(new _Generator_510(this)); + framework.AddSuppliers(new _Generator_522(this)); framework.AssertBothValid("testButtonSingleLine"); } - private sealed class _Generator_510 : UaValidationTestFramework.Generator { - public _Generator_510(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_522 : UaValidationTestFramework.Generator { + public _Generator_522(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -631,12 +631,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomContent() { - framework.AddSuppliers(new _Generator_524(this)); + framework.AddSuppliers(new _Generator_536(this)); framework.AssertBothValid("testButtonSingleLine"); } - private sealed class _Generator_524 : UaValidationTestFramework.Generator { - public _Generator_524(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_536 : UaValidationTestFramework.Generator { + public _Generator_536(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -653,12 +653,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomContentIsAlsoForm() { - framework.AddSuppliers(new _Generator_539()); + framework.AddSuppliers(new _Generator_551()); framework.AssertBothValid("testButtonSingleLine"); } - private sealed class _Generator_539 : UaValidationTestFramework.Generator { - public _Generator_539() { + private sealed class _Generator_551 : UaValidationTestFramework.Generator { + public _Generator_551() { } public IBlockElement Generate() { @@ -672,12 +672,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonInteractive() { - framework.AddSuppliers(new _Generator_554(this)); + framework.AddSuppliers(new _Generator_566(this)); framework.AssertBothValid("testButtonInteractive"); } - private sealed class _Generator_554 : UaValidationTestFramework.Generator { - public _Generator_554(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_566 : UaValidationTestFramework.Generator { + public _Generator_566(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -695,12 +695,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_571(this)); + framework.AddSuppliers(new _Generator_583(this)); framework.AssertBothValid("testButtonCustomAppearanceInteractive"); } - private sealed class _Generator_571 : UaValidationTestFramework.Generator { - public _Generator_571(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_583 : UaValidationTestFramework.Generator { + public _Generator_583(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -720,12 +720,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonSingleLineInteractive() { - framework.AddSuppliers(new _Generator_590(this)); + framework.AddSuppliers(new _Generator_602(this)); framework.AssertBothValid("testButtonSingleLineInteractive"); } - private sealed class _Generator_590 : UaValidationTestFramework.Generator { - public _Generator_590(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_602 : UaValidationTestFramework.Generator { + public _Generator_602(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -743,12 +743,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomContentInteractive() { - framework.AddSuppliers(new _Generator_607(this)); + framework.AddSuppliers(new _Generator_619(this)); framework.AssertBothValid("testButtonSingleLineInteractive"); } - private sealed class _Generator_607 : UaValidationTestFramework.Generator { - public _Generator_607(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_619 : UaValidationTestFramework.Generator { + public _Generator_619(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -768,12 +768,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonCustomContentIsAlsoFormInteractive() { - framework.AddSuppliers(new _Generator_625(this)); + framework.AddSuppliers(new _Generator_637(this)); framework.AssertBothValid("testButtonSingleLineInteractive"); } - private sealed class _Generator_625 : UaValidationTestFramework.Generator { - public _Generator_625(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_637 : UaValidationTestFramework.Generator { + public _Generator_637(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -795,12 +795,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputField() { - framework.AddSuppliers(new _Generator_645(this)); + framework.AddSuppliers(new _Generator_657(this)); framework.AssertBothValid("testInputField"); } - private sealed class _Generator_645 : UaValidationTestFramework.Generator { - public _Generator_645(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_657 : UaValidationTestFramework.Generator { + public _Generator_657(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -815,12 +815,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithValue() { - framework.AddSuppliers(new _Generator_658(this)); + framework.AddSuppliers(new _Generator_670(this)); framework.AssertBothValid("testInputFieldWithValue"); } - private sealed class _Generator_658 : UaValidationTestFramework.Generator { - public _Generator_658(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_670 : UaValidationTestFramework.Generator { + public _Generator_670(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -836,12 +836,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearance() { - framework.AddSuppliers(new _Generator_672(this)); + framework.AddSuppliers(new _Generator_684(this)); framework.AssertBothValid("testInputFieldWithCustomAppearance"); } - private sealed class _Generator_672 : UaValidationTestFramework.Generator { - public _Generator_672(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_684 : UaValidationTestFramework.Generator { + public _Generator_684(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -858,12 +858,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearanceAndValue() { - framework.AddSuppliers(new _Generator_687(this)); + framework.AddSuppliers(new _Generator_699(this)); framework.AssertBothValid("testInputFieldWithCustomAppearanceAndValue"); } - private sealed class _Generator_687 : UaValidationTestFramework.Generator { - public _Generator_687(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_699 : UaValidationTestFramework.Generator { + public _Generator_699(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -881,12 +881,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearanceAndPlaceHolder() { - framework.AddSuppliers(new _Generator_703(this)); + framework.AddSuppliers(new _Generator_715(this)); framework.AssertBothValid("testInputFieldWithCustomAppearanceAndValue"); } - private sealed class _Generator_703 : UaValidationTestFramework.Generator { - public _Generator_703(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_715 : UaValidationTestFramework.Generator { + public _Generator_715(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -904,12 +904,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldInteractive() { - framework.AddSuppliers(new _Generator_719(this)); + framework.AddSuppliers(new _Generator_731(this)); framework.AssertBothValid("testInputFieldInteractive"); } - private sealed class _Generator_719 : UaValidationTestFramework.Generator { - public _Generator_719(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_731 : UaValidationTestFramework.Generator { + public _Generator_731(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -926,12 +926,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithValueInteractive() { - framework.AddSuppliers(new _Generator_734(this)); + framework.AddSuppliers(new _Generator_746(this)); framework.AssertBothValid("testInputFieldWithValueInteractive"); } - private sealed class _Generator_734 : UaValidationTestFramework.Generator { - public _Generator_734(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_746 : UaValidationTestFramework.Generator { + public _Generator_746(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -949,12 +949,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_750(this)); + framework.AddSuppliers(new _Generator_762(this)); framework.AssertBothValid("testInputFieldWithCustomAppearanceInteractive"); } - private sealed class _Generator_750 : UaValidationTestFramework.Generator { - public _Generator_750(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_762 : UaValidationTestFramework.Generator { + public _Generator_762(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -973,12 +973,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearanceAndValueInteractive() { - framework.AddSuppliers(new _Generator_767(this)); + framework.AddSuppliers(new _Generator_779(this)); framework.AssertBothValid("testInputFieldWithCustomAppearanceAndValueInteractive"); } - private sealed class _Generator_767 : UaValidationTestFramework.Generator { - public _Generator_767(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_779 : UaValidationTestFramework.Generator { + public _Generator_779(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -998,12 +998,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldWithCustomAppearanceAndPlaceHolderInteractive() { - framework.AddSuppliers(new _Generator_785(this)); + framework.AddSuppliers(new _Generator_797(this)); framework.AssertBothValid("testInputFieldWithCustomAppearanceAndPlaceHolderInteractive"); } - private sealed class _Generator_785 : UaValidationTestFramework.Generator { - public _Generator_785(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_797 : UaValidationTestFramework.Generator { + public _Generator_797(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1023,12 +1023,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextArea() { - framework.AddSuppliers(new _Generator_803(this)); + framework.AddSuppliers(new _Generator_815(this)); framework.AssertBothValid("testTextArea"); } - private sealed class _Generator_803 : UaValidationTestFramework.Generator { - public _Generator_803(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_815 : UaValidationTestFramework.Generator { + public _Generator_815(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1043,12 +1043,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithValue() { - framework.AddSuppliers(new _Generator_816(this)); + framework.AddSuppliers(new _Generator_828(this)); framework.AssertBothValid("testTextAreaWithValue"); } - private sealed class _Generator_816 : UaValidationTestFramework.Generator { - public _Generator_816(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_828 : UaValidationTestFramework.Generator { + public _Generator_828(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1064,12 +1064,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearance() { - framework.AddSuppliers(new _Generator_830(this)); + framework.AddSuppliers(new _Generator_842(this)); framework.AssertBothValid("testTextAreaWithCustomAppearance"); } - private sealed class _Generator_830 : UaValidationTestFramework.Generator { - public _Generator_830(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_842 : UaValidationTestFramework.Generator { + public _Generator_842(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1086,12 +1086,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearanceAndValue() { - framework.AddSuppliers(new _Generator_845(this)); + framework.AddSuppliers(new _Generator_857(this)); framework.AssertBothValid("testTextAreaWithCustomAppearanceAndValue"); } - private sealed class _Generator_845 : UaValidationTestFramework.Generator { - public _Generator_845(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_857 : UaValidationTestFramework.Generator { + public _Generator_857(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1109,12 +1109,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearanceAndPlaceHolder() { - framework.AddSuppliers(new _Generator_861(this)); + framework.AddSuppliers(new _Generator_873(this)); framework.AssertBothValid("testTextAreaWithCustomAppearanceAndValue"); } - private sealed class _Generator_861 : UaValidationTestFramework.Generator { - public _Generator_861(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_873 : UaValidationTestFramework.Generator { + public _Generator_873(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1132,12 +1132,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaInteractive() { - framework.AddSuppliers(new _Generator_877(this)); + framework.AddSuppliers(new _Generator_889(this)); framework.AssertBothValid("testTextAreaInteractive"); } - private sealed class _Generator_877 : UaValidationTestFramework.Generator { - public _Generator_877(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_889 : UaValidationTestFramework.Generator { + public _Generator_889(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1154,12 +1154,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithValueInteractive() { - framework.AddSuppliers(new _Generator_892(this)); + framework.AddSuppliers(new _Generator_904(this)); framework.AssertBothValid("testTextAreaWithValueInteractive"); } - private sealed class _Generator_892 : UaValidationTestFramework.Generator { - public _Generator_892(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_904 : UaValidationTestFramework.Generator { + public _Generator_904(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1177,12 +1177,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_908(this)); + framework.AddSuppliers(new _Generator_920(this)); framework.AssertBothValid("testTextAreaWithCustomAppearanceInteractive"); } - private sealed class _Generator_908 : UaValidationTestFramework.Generator { - public _Generator_908(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_920 : UaValidationTestFramework.Generator { + public _Generator_920(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1201,12 +1201,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearanceAndValueInteractive() { - framework.AddSuppliers(new _Generator_925(this)); + framework.AddSuppliers(new _Generator_937(this)); framework.AssertBothValid("testTextAreaWithCustomAppearanceAndValueInteractive"); } - private sealed class _Generator_925 : UaValidationTestFramework.Generator { - public _Generator_925(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_937 : UaValidationTestFramework.Generator { + public _Generator_937(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1226,12 +1226,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaWithCustomAppearanceAndPlaceHolderInteractive() { - framework.AddSuppliers(new _Generator_943(this)); + framework.AddSuppliers(new _Generator_955(this)); framework.AssertBothValid("testTextAreaWithCustomAppearanceAndPlaceHolderInteractive"); } - private sealed class _Generator_943 : UaValidationTestFramework.Generator { - public _Generator_943(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_955 : UaValidationTestFramework.Generator { + public _Generator_955(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1251,12 +1251,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBox() { - framework.AddSuppliers(new _Generator_961(this)); + framework.AddSuppliers(new _Generator_973(this)); framework.AssertBothValid("testListBox"); } - private sealed class _Generator_961 : UaValidationTestFramework.Generator { - public _Generator_961(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_973 : UaValidationTestFramework.Generator { + public _Generator_973(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1273,12 +1273,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxCustomAppearance() { - framework.AddSuppliers(new _Generator_976(this)); + framework.AddSuppliers(new _Generator_988(this)); framework.AssertBothValid("testListBoxCustomAppearance"); } - private sealed class _Generator_976 : UaValidationTestFramework.Generator { - public _Generator_976(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_988 : UaValidationTestFramework.Generator { + public _Generator_988(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1298,12 +1298,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxCustomAppearanceSelected() { - framework.AddSuppliers(new _Generator_994(this)); + framework.AddSuppliers(new _Generator_1006(this)); framework.AssertBothValid("testListBoxCustomAppearanceSelected"); } - private sealed class _Generator_994 : UaValidationTestFramework.Generator { - public _Generator_994(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1006 : UaValidationTestFramework.Generator { + public _Generator_1006(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1323,12 +1323,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxInteractive() { - framework.AddSuppliers(new _Generator_1012(this)); + framework.AddSuppliers(new _Generator_1024(this)); framework.AssertBothValid("testListBoxInteractive"); } - private sealed class _Generator_1012 : UaValidationTestFramework.Generator { - public _Generator_1012(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1024 : UaValidationTestFramework.Generator { + public _Generator_1024(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1347,12 +1347,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_1029(this)); + framework.AddSuppliers(new _Generator_1041(this)); framework.AssertBothValid("testListBoxCustomAppearanceInteractive"); } - private sealed class _Generator_1029 : UaValidationTestFramework.Generator { - public _Generator_1029(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1041 : UaValidationTestFramework.Generator { + public _Generator_1041(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1374,12 +1374,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxCustomAppearanceSelectedInteractive() { - framework.AddSuppliers(new _Generator_1049(this)); + framework.AddSuppliers(new _Generator_1061(this)); framework.AssertBothValid("testListBoxCustomAppearanceSelectedInteractive"); } - private sealed class _Generator_1049 : UaValidationTestFramework.Generator { - public _Generator_1049(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1061 : UaValidationTestFramework.Generator { + public _Generator_1061(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1401,12 +1401,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBox() { - framework.AddSuppliers(new _Generator_1069(this)); + framework.AddSuppliers(new _Generator_1081(this)); framework.AssertBothValid("testComboBox"); } - private sealed class _Generator_1069 : UaValidationTestFramework.Generator { - public _Generator_1069(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1081 : UaValidationTestFramework.Generator { + public _Generator_1081(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1423,12 +1423,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxCustomAppearance() { - framework.AddSuppliers(new _Generator_1084(this)); + framework.AddSuppliers(new _Generator_1096(this)); framework.AssertBothValid("testComboBoxCustomAppearance"); } - private sealed class _Generator_1084 : UaValidationTestFramework.Generator { - public _Generator_1084(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1096 : UaValidationTestFramework.Generator { + public _Generator_1096(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1448,12 +1448,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxCustomAppearanceSelected() { - framework.AddSuppliers(new _Generator_1102(this)); + framework.AddSuppliers(new _Generator_1114(this)); framework.AssertBothValid("testListBoxCustomAppearanceSelected"); } - private sealed class _Generator_1102 : UaValidationTestFramework.Generator { - public _Generator_1102(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1114 : UaValidationTestFramework.Generator { + public _Generator_1114(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1473,12 +1473,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxInteractive() { - framework.AddSuppliers(new _Generator_1120(this)); + framework.AddSuppliers(new _Generator_1132(this)); framework.AssertBothValid("testComboBoxInteractive"); } - private sealed class _Generator_1120 : UaValidationTestFramework.Generator { - public _Generator_1120(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1132 : UaValidationTestFramework.Generator { + public _Generator_1132(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1497,12 +1497,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxCustomAppearanceInteractive() { - framework.AddSuppliers(new _Generator_1137(this)); + framework.AddSuppliers(new _Generator_1149(this)); framework.AssertBothValid("testComboBoxCustomAppearanceInteractive"); } - private sealed class _Generator_1137 : UaValidationTestFramework.Generator { - public _Generator_1137(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1149 : UaValidationTestFramework.Generator { + public _Generator_1149(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1524,12 +1524,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxCustomAppearanceSelectedInteractive() { - framework.AddSuppliers(new _Generator_1157(this)); + framework.AddSuppliers(new _Generator_1169(this)); framework.AssertBothValid("testComboBoxCustomAppearanceSelectedInteractive"); } - private sealed class _Generator_1157 : UaValidationTestFramework.Generator { - public _Generator_1157(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1169 : UaValidationTestFramework.Generator { + public _Generator_1169(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1551,12 +1551,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearance() { - framework.AddSuppliers(new _Generator_1177(this)); + framework.AddSuppliers(new _Generator_1189(this)); framework.AssertBothValid("testSignatureAppearance"); } - private sealed class _Generator_1177 : UaValidationTestFramework.Generator { - public _Generator_1177(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1189 : UaValidationTestFramework.Generator { + public _Generator_1189(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1572,12 +1572,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceWithSignedAppearanceText() { - framework.AddSuppliers(new _Generator_1191(this)); + framework.AddSuppliers(new _Generator_1203(this)); framework.AssertBothValid("testSignatureAppearanceWithSignedAppearanceText"); } - private sealed class _Generator_1191 : UaValidationTestFramework.Generator { - public _Generator_1191(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1203 : UaValidationTestFramework.Generator { + public _Generator_1203(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1597,12 +1597,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceWithCustomContent() { - framework.AddSuppliers(new _Generator_1209(this)); + framework.AddSuppliers(new _Generator_1221(this)); framework.AssertBothValid("testSignatureAppearanceWithSignedAppearanceText"); } - private sealed class _Generator_1209 : UaValidationTestFramework.Generator { - public _Generator_1209(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1221 : UaValidationTestFramework.Generator { + public _Generator_1221(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1620,12 +1620,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceWithSignedAppearanceAndCustomAppearanceText() { - framework.AddSuppliers(new _Generator_1226(this)); + framework.AddSuppliers(new _Generator_1238(this)); framework.AssertBothValid("testSignatureAppearanceWithSignedAppearanceAndCustomAppearanceText"); } - private sealed class _Generator_1226 : UaValidationTestFramework.Generator { - public _Generator_1226(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1238 : UaValidationTestFramework.Generator { + public _Generator_1238(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1647,12 +1647,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceInteractive() { - framework.AddSuppliers(new _Generator_1246(this)); + framework.AddSuppliers(new _Generator_1258(this)); framework.AssertBothValid("testSignatureAppearanceInteractive"); } - private sealed class _Generator_1246 : UaValidationTestFramework.Generator { - public _Generator_1246(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1258 : UaValidationTestFramework.Generator { + public _Generator_1258(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1670,12 +1670,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceWithSignedAppearanceTextInteractive() { - framework.AddSuppliers(new _Generator_1262(this)); + framework.AddSuppliers(new _Generator_1274(this)); framework.AssertBothValid("testSignatureAppearanceWithSignedAppearanceTextInteractive"); } - private sealed class _Generator_1262 : UaValidationTestFramework.Generator { - public _Generator_1262(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1274 : UaValidationTestFramework.Generator { + public _Generator_1274(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1697,12 +1697,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceWithCustomContentInteractive() { - framework.AddSuppliers(new _Generator_1283(this)); + framework.AddSuppliers(new _Generator_1295(this)); framework.AssertBothValid("testSignatureAppearanceWithSignedAppearanceTextInteractive"); } - private sealed class _Generator_1283 : UaValidationTestFramework.Generator { - public _Generator_1283(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1295 : UaValidationTestFramework.Generator { + public _Generator_1295(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1722,12 +1722,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignedAndCustomAppearanceTextInteractive() { - framework.AddSuppliers(new _Generator_1303(this)); + framework.AddSuppliers(new _Generator_1315(this)); framework.AssertBothValid("testSignedAndCustomAppearanceTextInteractive"); } - private sealed class _Generator_1303 : UaValidationTestFramework.Generator { - public _Generator_1303(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1315 : UaValidationTestFramework.Generator { + public _Generator_1315(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1751,18 +1751,18 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveCheckBoxNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1325()); + framework.AddSuppliers(new _Generator_1337()); framework.AssertBothFail("testInteractiveCheckBoxNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1325 : UaValidationTestFramework.Generator { - public _Generator_1325() { + private sealed class _Generator_1337 : UaValidationTestFramework.Generator { + public _Generator_1337() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.SetInteractive(true); return cb; } @@ -1770,13 +1770,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveRadioButtonNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1340()); + framework.AddSuppliers(new _Generator_1352()); framework.AssertBothFail("testInteractiveRadioButtonNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1340 : UaValidationTestFramework.Generator { - public _Generator_1340() { + private sealed class _Generator_1352 : UaValidationTestFramework.Generator { + public _Generator_1352() { } public IBlockElement Generate() { @@ -1788,13 +1788,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveButtonNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1354(this)); + framework.AddSuppliers(new _Generator_1366(this)); framework.AssertBothFail("testInteractiveButtonNoAlternativeDescription", PdfUAExceptionMessageConstants.MISSING_FORM_FIELD_DESCRIPTION ); } - private sealed class _Generator_1354 : UaValidationTestFramework.Generator { - public _Generator_1354(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1366 : UaValidationTestFramework.Generator { + public _Generator_1366(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1810,13 +1810,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveInputFieldNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1369(this)); + framework.AddSuppliers(new _Generator_1381(this)); framework.AssertBothFail("testInteractiveInputFieldNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1369 : UaValidationTestFramework.Generator { - public _Generator_1369(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1381 : UaValidationTestFramework.Generator { + public _Generator_1381(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1832,13 +1832,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveTextAreaNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1384(this)); + framework.AddSuppliers(new _Generator_1396(this)); framework.AssertBothFail("testInteractiveTextAreaNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1384 : UaValidationTestFramework.Generator { - public _Generator_1384(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1396 : UaValidationTestFramework.Generator { + public _Generator_1396(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1854,13 +1854,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveListBoxNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1399(this)); + framework.AddSuppliers(new _Generator_1411(this)); framework.AssertBothFail("testInteractiveListBoxNoAlternativeDescription", PdfUAExceptionMessageConstants. MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1399 : UaValidationTestFramework.Generator { - public _Generator_1399(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1411 : UaValidationTestFramework.Generator { + public _Generator_1411(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1876,13 +1876,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveComboBoxNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1414(this)); + framework.AddSuppliers(new _Generator_1426(this)); framework.AssertBothFail("testInteractiveComboBoxNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1414 : UaValidationTestFramework.Generator { - public _Generator_1414(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1426 : UaValidationTestFramework.Generator { + public _Generator_1426(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1898,13 +1898,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInteractiveSignatureAppearanceNoAlternativeDescription() { - framework.AddSuppliers(new _Generator_1429(this)); + framework.AddSuppliers(new _Generator_1441(this)); framework.AssertBothFail("testInteractiveSignatureAppearanceNoAlternativeDescription", PdfUAExceptionMessageConstants .MISSING_FORM_FIELD_DESCRIPTION); } - private sealed class _Generator_1429 : UaValidationTestFramework.Generator { - public _Generator_1429(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1441 : UaValidationTestFramework.Generator { + public _Generator_1441(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -1920,31 +1920,31 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestCheckBoxDifferentRole() { - framework.AddSuppliers(new _Generator_1444()); - framework.AddSuppliers(new _Generator_1454()); + framework.AddSuppliers(new _Generator_1456()); + framework.AddSuppliers(new _Generator_1466()); framework.AssertBothValid("testCheckBoxDifferentRole"); } - private sealed class _Generator_1444 : UaValidationTestFramework.Generator { - public _Generator_1444() { + private sealed class _Generator_1456 : UaValidationTestFramework.Generator { + public _Generator_1456() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.GetAccessibilityProperties().SetRole(StandardRoles.FIGURE); cb.GetAccessibilityProperties().SetAlternateDescription("Hello"); return cb; } } - private sealed class _Generator_1454 : UaValidationTestFramework.Generator { - public _Generator_1454() { + private sealed class _Generator_1466 : UaValidationTestFramework.Generator { + public _Generator_1466() { } public IBlockElement Generate() { CheckBox cb = new CheckBox("name"); - cb.SetPdfConformanceLevel(PdfUAConformanceLevel.PDFUA_1); + cb.SetPdfConformance(PdfConformance.PDF_UA_1); cb.GetAccessibilityProperties().SetRole(StandardRoles.ARTIFACT); return cb; } @@ -1952,14 +1952,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestRadioButtonDifferentRole() { - framework.AddSuppliers(new _Generator_1468()); - framework.AddSuppliers(new _Generator_1478()); - framework.AddSuppliers(new _Generator_1488()); + framework.AddSuppliers(new _Generator_1480()); + framework.AddSuppliers(new _Generator_1490()); + framework.AddSuppliers(new _Generator_1500()); framework.AssertBothValid("testRadioButtonDifferentRole"); } - private sealed class _Generator_1468 : UaValidationTestFramework.Generator { - public _Generator_1468() { + private sealed class _Generator_1480 : UaValidationTestFramework.Generator { + public _Generator_1480() { } public IBlockElement Generate() { @@ -1971,8 +1971,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_1478 : UaValidationTestFramework.Generator { - public _Generator_1478() { + private sealed class _Generator_1490 : UaValidationTestFramework.Generator { + public _Generator_1490() { } public IBlockElement Generate() { @@ -1984,8 +1984,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_1488 : UaValidationTestFramework.Generator { - public _Generator_1488() { + private sealed class _Generator_1500 : UaValidationTestFramework.Generator { + public _Generator_1500() { } public IBlockElement Generate() { @@ -1997,13 +1997,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestButtonDifferentRole() { - framework.AddSuppliers(new _Generator_1501(this)); - framework.AddSuppliers(new _Generator_1512(this)); + framework.AddSuppliers(new _Generator_1513(this)); + framework.AddSuppliers(new _Generator_1524(this)); framework.AssertBothValid("testButtonDifferentRole"); } - private sealed class _Generator_1501 : UaValidationTestFramework.Generator { - public _Generator_1501(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1513 : UaValidationTestFramework.Generator { + public _Generator_1513(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2019,8 +2019,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1512 : UaValidationTestFramework.Generator { - public _Generator_1512(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1524 : UaValidationTestFramework.Generator { + public _Generator_1524(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2037,14 +2037,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestInputFieldDifferentRole() { - framework.AddSuppliers(new _Generator_1527(this)); - framework.AddSuppliers(new _Generator_1538(this)); - framework.AddSuppliers(new _Generator_1549(this)); + framework.AddSuppliers(new _Generator_1539(this)); + framework.AddSuppliers(new _Generator_1550(this)); + framework.AddSuppliers(new _Generator_1561(this)); framework.AssertBothValid("testInputFieldDifferentRole"); } - private sealed class _Generator_1527 : UaValidationTestFramework.Generator { - public _Generator_1527(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1539 : UaValidationTestFramework.Generator { + public _Generator_1539(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2060,8 +2060,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1538 : UaValidationTestFramework.Generator { - public _Generator_1538(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1550 : UaValidationTestFramework.Generator { + public _Generator_1550(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2076,8 +2076,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1549 : UaValidationTestFramework.Generator { - public _Generator_1549(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1561 : UaValidationTestFramework.Generator { + public _Generator_1561(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2094,14 +2094,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestTextAreaDifferentRole() { - framework.AddSuppliers(new _Generator_1564(this)); - framework.AddSuppliers(new _Generator_1574(this)); - framework.AddSuppliers(new _Generator_1583(this)); + framework.AddSuppliers(new _Generator_1576(this)); + framework.AddSuppliers(new _Generator_1586(this)); + framework.AddSuppliers(new _Generator_1595(this)); framework.AssertBothValid("testTextAreaDifferentRole"); } - private sealed class _Generator_1564 : UaValidationTestFramework.Generator { - public _Generator_1564(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1576 : UaValidationTestFramework.Generator { + public _Generator_1576(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2116,8 +2116,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1574 : UaValidationTestFramework.Generator { - public _Generator_1574(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1586 : UaValidationTestFramework.Generator { + public _Generator_1586(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2131,8 +2131,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1583 : UaValidationTestFramework.Generator { - public _Generator_1583(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1595 : UaValidationTestFramework.Generator { + public _Generator_1595(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2148,13 +2148,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestListBoxDifferentRole() { - framework.AddSuppliers(new _Generator_1598(this)); - framework.AddSuppliers(new _Generator_1608(this)); + framework.AddSuppliers(new _Generator_1610(this)); + framework.AddSuppliers(new _Generator_1620(this)); framework.AssertBothValid("testListBoxDifferentRole"); } - private sealed class _Generator_1598 : UaValidationTestFramework.Generator { - public _Generator_1598(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1610 : UaValidationTestFramework.Generator { + public _Generator_1610(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2169,8 +2169,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1608 : UaValidationTestFramework.Generator { - public _Generator_1608(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1620 : UaValidationTestFramework.Generator { + public _Generator_1620(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2186,13 +2186,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestComboBoxDifferentRole() { - framework.AddSuppliers(new _Generator_1624(this)); - framework.AddSuppliers(new _Generator_1637(this)); + framework.AddSuppliers(new _Generator_1636(this)); + framework.AddSuppliers(new _Generator_1649(this)); framework.AssertBothValid("testComboBoxDifferentRole"); } - private sealed class _Generator_1624 : UaValidationTestFramework.Generator { - public _Generator_1624(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1636 : UaValidationTestFramework.Generator { + public _Generator_1636(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2209,8 +2209,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1637 : UaValidationTestFramework.Generator { - public _Generator_1637(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1649 : UaValidationTestFramework.Generator { + public _Generator_1649(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2226,13 +2226,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void TestSignatureAppearanceDifferentRole() { - framework.AddSuppliers(new _Generator_1651(this)); framework.AddSuppliers(new _Generator_1663(this)); + framework.AddSuppliers(new _Generator_1675(this)); framework.AssertBothValid("testSignatureAppearanceDifferentRole"); } - private sealed class _Generator_1651 : UaValidationTestFramework.Generator { - public _Generator_1651(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1663 : UaValidationTestFramework.Generator { + public _Generator_1663(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2248,8 +2248,8 @@ public IBlockElement Generate() { private readonly PdfUAFormFieldsTest _enclosing; } - private sealed class _Generator_1663 : UaValidationTestFramework.Generator { - public _Generator_1663(PdfUAFormFieldsTest _enclosing) { + private sealed class _Generator_1675 : UaValidationTestFramework.Generator { + public _Generator_1675(PdfUAFormFieldsTest _enclosing) { this._enclosing = _enclosing; } @@ -2269,7 +2269,7 @@ public virtual void TestTextBuilderWithTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfTextFormField field = new TextFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle(100, 100 - , 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateText(); + , 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateText(); field.SetValue("Some value"); field.SetAlternativeName("Some tu entry value"); form.AddField(field); @@ -2283,7 +2283,7 @@ public virtual void TestTextBuilderNoTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfTextFormField field = new TextFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle(100, 100 - , 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateText(); + , 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateText(); field.SetValue("Some value"); form.AddField(field); } @@ -2297,8 +2297,7 @@ public virtual void TestChoiceBuilderWithTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfChoiceFormField field = new ChoiceFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle(100 - , 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateComboBox - (); + , 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateComboBox(); field.SetAlternativeName("Some tu entry value"); form.AddField(field); } @@ -2311,8 +2310,7 @@ public virtual void TestChoiceBuilderNoTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfChoiceFormField field = new ChoiceFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle(100 - , 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateComboBox - (); + , 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateComboBox(); form.AddField(field); } ); @@ -2325,8 +2323,7 @@ public virtual void TestButtonBuilderWithTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfButtonFormField field = new PushButtonFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle - (100, 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreatePushButton - (); + (100, 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreatePushButton(); field.SetAlternativeName("Some tu entry value"); form.AddField(field); } @@ -2339,8 +2336,7 @@ public virtual void TestButtonBuilderNoTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfButtonFormField field = new PushButtonFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle - (100, 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreatePushButton - (); + (100, 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreatePushButton(); form.AddField(field); } ); @@ -2353,8 +2349,7 @@ public virtual void TestButtonBuilderNoTuNotVisible() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfButtonFormField field = new PushButtonFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle - (100, 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreatePushButton - (); + (100, 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreatePushButton(); IList annList = field.GetChildFormAnnotations(); annList[0].SetVisibility(PdfFormAnnotation.HIDDEN); form.AddField(field); @@ -2402,8 +2397,7 @@ public virtual void TestSignatureBuilderWithTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfSignatureFormField field = new SignatureFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle - (100, 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateSignature - (); + (100, 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateSignature(); field.SetValue("some value"); field.SetAlternativeName("Some tu entry value"); form.AddField(field); @@ -2417,8 +2411,7 @@ public virtual void TestSignatureBuilderNoTu() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfSignatureFormField field = new SignatureFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle - (100, 100, 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateSignature - (); + (100, 100, 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateSignature(); field.SetValue("some value"); form.AddField(field); } @@ -2432,7 +2425,7 @@ public virtual void TestFormFieldWithAltEntry() { framework.AddBeforeGenerationHook((pdfDoc) => { PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true); PdfTextFormField field = new TextFormFieldBuilder(pdfDoc, "hello").SetWidgetRectangle(new Rectangle(100, 100 - , 100, 100)).SetFont(GetFont()).SetConformanceLevel(PdfUAConformanceLevel.PDFUA_1).CreateText(); + , 100, 100)).SetFont(GetFont()).SetConformance(PdfConformance.PDF_UA_1).CreateText(); field.SetValue("Some value"); pdfDoc.GetTagStructureContext().GetAutoTaggingPointer().AddTag(new DefaultAccessibilityProperties(StandardRoles .FORM).SetAlternateDescription("alternate description")); diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAHeadingsTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAHeadingsTest.cs index e6b6174e39..680dbbd8b8 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAHeadingsTest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUAHeadingsTest.cs @@ -34,6 +34,7 @@ You should have received a copy of the GNU Affero General Public License using iText.Layout.Element; using iText.Pdfua; using iText.Pdfua.Exceptions; +using iText.Pdfua.Logs; using iText.Test; using iText.Test.Attributes; using iText.Test.Pdfa; @@ -66,12 +67,12 @@ public virtual void InitializeFramework() { // -------- Negative tests -------- [NUnit.Framework.Test] public virtual void AddH2AsFirstHeaderTest() { - framework.AddSuppliers(new _Generator_82()); + framework.AddSuppliers(new _Generator_81()); framework.AssertBothFail("addH2FirstHeaderTest", PdfUAExceptionMessageConstants.H1_IS_SKIPPED); } - private sealed class _Generator_82 : UaValidationTestFramework.Generator { - public _Generator_82() { + private sealed class _Generator_81 : UaValidationTestFramework.Generator { + public _Generator_81() { } public IBlockElement Generate() { @@ -84,14 +85,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void BrokenHnParallelSequenceTest() { - framework.AddSuppliers(new _Generator_98()); - framework.AddSuppliers(new _Generator_107()); + framework.AddSuppliers(new _Generator_97()); + framework.AddSuppliers(new _Generator_106()); framework.AssertBothFail("brokenHnParallelSequenceTest", MessageFormatUtil.Format(PdfUAExceptionMessageConstants .HN_IS_SKIPPED, 2)); } - private sealed class _Generator_98 : UaValidationTestFramework.Generator { - public _Generator_98() { + private sealed class _Generator_97 : UaValidationTestFramework.Generator { + public _Generator_97() { } public IBlockElement Generate() { @@ -102,8 +103,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_107 : UaValidationTestFramework.Generator { - public _Generator_107() { + private sealed class _Generator_106 : UaValidationTestFramework.Generator { + public _Generator_106() { } public IBlockElement Generate() { @@ -116,13 +117,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void BrokenHnInheritedSequenceTest1() { - framework.AddSuppliers(new _Generator_122()); + framework.AddSuppliers(new _Generator_121()); framework.AssertBothFail("brokenHnInheritedSequenceTest1", MessageFormatUtil.Format(PdfUAExceptionMessageConstants .HN_IS_SKIPPED, 2)); } - private sealed class _Generator_122 : UaValidationTestFramework.Generator { - public _Generator_122() { + private sealed class _Generator_121 : UaValidationTestFramework.Generator { + public _Generator_121() { } public IBlockElement Generate() { @@ -139,13 +140,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void BrokenHnMixedSequenceTest() { - framework.AddSuppliers(new _Generator_142()); + framework.AddSuppliers(new _Generator_141()); framework.AssertBothFail("brokenHnMixedSequenceTest", MessageFormatUtil.Format(PdfUAExceptionMessageConstants .HN_IS_SKIPPED, 3)); } - private sealed class _Generator_142 : UaValidationTestFramework.Generator { - public _Generator_142() { + private sealed class _Generator_141 : UaValidationTestFramework.Generator { + public _Generator_141() { } public IBlockElement Generate() { @@ -166,13 +167,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void BrokenHnMixedSequenceTest2() { - framework.AddSuppliers(new _Generator_167()); + framework.AddSuppliers(new _Generator_166()); framework.AssertBothFail("brokenHnMixedSequenceTest2", MessageFormatUtil.Format(PdfUAExceptionMessageConstants .HN_IS_SKIPPED, 3)); } - private sealed class _Generator_167 : UaValidationTestFramework.Generator { - public _Generator_167() { + private sealed class _Generator_166 : UaValidationTestFramework.Generator { + public _Generator_166() { } public IBlockElement Generate() { @@ -196,12 +197,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void FewHInOneNodeTest() { - framework.AddSuppliers(new _Generator_196()); + framework.AddSuppliers(new _Generator_195()); framework.AssertBothFail("fewHInOneNodeTest", PdfUAExceptionMessageConstants.MORE_THAN_ONE_H_TAG); } - private sealed class _Generator_196 : UaValidationTestFramework.Generator { - public _Generator_196() { + private sealed class _Generator_195 : UaValidationTestFramework.Generator { + public _Generator_195() { } public IBlockElement Generate() { @@ -221,13 +222,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void FewHInDocumentTest() { - framework.AddSuppliers(new _Generator_221()); - framework.AddSuppliers(new _Generator_230()); + framework.AddSuppliers(new _Generator_220()); + framework.AddSuppliers(new _Generator_229()); framework.AssertBothFail("fewHInDocumentTest", PdfUAExceptionMessageConstants.MORE_THAN_ONE_H_TAG); } - private sealed class _Generator_221 : UaValidationTestFramework.Generator { - public _Generator_221() { + private sealed class _Generator_220 : UaValidationTestFramework.Generator { + public _Generator_220() { } public IBlockElement Generate() { @@ -238,8 +239,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_230 : UaValidationTestFramework.Generator { - public _Generator_230() { + private sealed class _Generator_229 : UaValidationTestFramework.Generator { + public _Generator_229() { } public IBlockElement Generate() { @@ -252,14 +253,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HAndHnInDocumentTest1() { - framework.AddSuppliers(new _Generator_245()); - framework.AddSuppliers(new _Generator_254()); + framework.AddSuppliers(new _Generator_244()); + framework.AddSuppliers(new _Generator_253()); framework.AssertBothFail("hAndHnInDocumentTest1", PdfUAExceptionMessageConstants.DOCUMENT_USES_BOTH_H_AND_HN ); } - private sealed class _Generator_245 : UaValidationTestFramework.Generator { - public _Generator_245() { + private sealed class _Generator_244 : UaValidationTestFramework.Generator { + public _Generator_244() { } public IBlockElement Generate() { @@ -270,8 +271,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_254 : UaValidationTestFramework.Generator { - public _Generator_254() { + private sealed class _Generator_253 : UaValidationTestFramework.Generator { + public _Generator_253() { } public IBlockElement Generate() { @@ -284,14 +285,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HAndHnInDocumentTest2() { - framework.AddSuppliers(new _Generator_269()); - framework.AddSuppliers(new _Generator_278()); + framework.AddSuppliers(new _Generator_268()); + framework.AddSuppliers(new _Generator_277()); framework.AssertBothFail("hAndHnInDocumentTest2", PdfUAExceptionMessageConstants.DOCUMENT_USES_BOTH_H_AND_HN ); } - private sealed class _Generator_269 : UaValidationTestFramework.Generator { - public _Generator_269() { + private sealed class _Generator_268 : UaValidationTestFramework.Generator { + public _Generator_268() { } public IBlockElement Generate() { @@ -302,8 +303,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_278 : UaValidationTestFramework.Generator { - public _Generator_278() { + private sealed class _Generator_277 : UaValidationTestFramework.Generator { + public _Generator_277() { } public IBlockElement Generate() { @@ -316,13 +317,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HAndHnInDocumentTest3() { - framework.AddSuppliers(new _Generator_293()); + framework.AddSuppliers(new _Generator_292()); framework.AssertBothFail("hAndHnInDocumentTest3", PdfUAExceptionMessageConstants.DOCUMENT_USES_BOTH_H_AND_HN ); } - private sealed class _Generator_293 : UaValidationTestFramework.Generator { - public _Generator_293() { + private sealed class _Generator_292 : UaValidationTestFramework.Generator { + public _Generator_292() { } public IBlockElement Generate() { @@ -343,7 +344,7 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void RoleMappingTest() { - framework.AddSuppliers(new _Generator_318()); + framework.AddSuppliers(new _Generator_317()); framework.AddBeforeGenerationHook((pdfDocument) => { PdfStructTreeRoot root = pdfDocument.GetStructTreeRoot(); root.AddRoleMapping("header1", StandardRoles.H1); @@ -353,8 +354,8 @@ public virtual void RoleMappingTest() { framework.AssertBothFail("rolemappingTest"); } - private sealed class _Generator_318 : UaValidationTestFramework.Generator { - public _Generator_318() { + private sealed class _Generator_317 : UaValidationTestFramework.Generator { + public _Generator_317() { } public IBlockElement Generate() { @@ -371,7 +372,7 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void RoleMappingTestValid() { - framework.AddSuppliers(new _Generator_343()); + framework.AddSuppliers(new _Generator_342()); framework.AddBeforeGenerationHook((pdfDocument) => { PdfStructTreeRoot root = pdfDocument.GetStructTreeRoot(); root.AddRoleMapping("header1", StandardRoles.H1); @@ -381,8 +382,8 @@ public virtual void RoleMappingTestValid() { framework.AssertBothValid("rolemappingValid"); } - private sealed class _Generator_343 : UaValidationTestFramework.Generator { - public _Generator_343() { + private sealed class _Generator_342 : UaValidationTestFramework.Generator { + public _Generator_342() { } public IBlockElement Generate() { @@ -462,12 +463,12 @@ public virtual void FlushPreviousPageTest() { // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android) [NUnit.Framework.Test] public virtual void HnInheritedSequenceTest() { - framework.AddSuppliers(new _Generator_448()); + framework.AddSuppliers(new _Generator_447()); framework.AssertBothValid("hnInheritedSequenceTest"); } - private sealed class _Generator_448 : UaValidationTestFramework.Generator { - public _Generator_448() { + private sealed class _Generator_447 : UaValidationTestFramework.Generator { + public _Generator_447() { } public IBlockElement Generate() { @@ -488,13 +489,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnCompareWithLastFromAnotherBranchTest() { - framework.AddSuppliers(new _Generator_472()); - framework.AddSuppliers(new _Generator_496()); + framework.AddSuppliers(new _Generator_471()); + framework.AddSuppliers(new _Generator_495()); framework.AssertBothValid("hnInheritedSequenceTest"); } - private sealed class _Generator_472 : UaValidationTestFramework.Generator { - public _Generator_472() { + private sealed class _Generator_471 : UaValidationTestFramework.Generator { + public _Generator_471() { } public IBlockElement Generate() { @@ -517,8 +518,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_496 : UaValidationTestFramework.Generator { - public _Generator_496() { + private sealed class _Generator_495 : UaValidationTestFramework.Generator { + public _Generator_495() { } public IBlockElement Generate() { @@ -531,13 +532,13 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnCompareWithLastFromAnotherBranchTest2() { - framework.AddSuppliers(new _Generator_510()); - framework.AddSuppliers(new _Generator_534()); + framework.AddSuppliers(new _Generator_509()); + framework.AddSuppliers(new _Generator_533()); framework.AssertBothValid("hnCompareWithLastFromAnotherBranchTest2"); } - private sealed class _Generator_510 : UaValidationTestFramework.Generator { - public _Generator_510() { + private sealed class _Generator_509 : UaValidationTestFramework.Generator { + public _Generator_509() { } public IBlockElement Generate() { @@ -560,8 +561,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_534 : UaValidationTestFramework.Generator { - public _Generator_534() { + private sealed class _Generator_533 : UaValidationTestFramework.Generator { + public _Generator_533() { } public IBlockElement Generate() { @@ -574,12 +575,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnInheritedSequenceTest2() { - framework.AddSuppliers(new _Generator_548()); + framework.AddSuppliers(new _Generator_547()); framework.AssertBothValid("hnCompareWithLastFromAnotherBranchTest2"); } - private sealed class _Generator_548 : UaValidationTestFramework.Generator { - public _Generator_548() { + private sealed class _Generator_547 : UaValidationTestFramework.Generator { + public _Generator_547() { } public IBlockElement Generate() { @@ -604,14 +605,14 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnParallelSequenceTest() { - framework.AddSuppliers(new _Generator_577()); - framework.AddSuppliers(new _Generator_586()); - framework.AddSuppliers(new _Generator_595()); + framework.AddSuppliers(new _Generator_576()); + framework.AddSuppliers(new _Generator_585()); + framework.AddSuppliers(new _Generator_594()); framework.AssertBothValid("hnParallelSequenceTest"); } - private sealed class _Generator_577 : UaValidationTestFramework.Generator { - public _Generator_577() { + private sealed class _Generator_576 : UaValidationTestFramework.Generator { + public _Generator_576() { } public IBlockElement Generate() { @@ -622,8 +623,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_586 : UaValidationTestFramework.Generator { - public _Generator_586() { + private sealed class _Generator_585 : UaValidationTestFramework.Generator { + public _Generator_585() { } public IBlockElement Generate() { @@ -634,8 +635,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_595 : UaValidationTestFramework.Generator { - public _Generator_595() { + private sealed class _Generator_594 : UaValidationTestFramework.Generator { + public _Generator_594() { } public IBlockElement Generate() { @@ -675,15 +676,15 @@ public virtual void UsualHTest() { // with the same code, but div role is replaced by section role [NUnit.Framework.Test] public virtual void UsualHTest2() { - framework.AddSuppliers(new _Generator_643()); - framework.AddSuppliers(new _Generator_652()); + framework.AddSuppliers(new _Generator_642()); + framework.AddSuppliers(new _Generator_651()); // The test code is the same as in usualHTest with one exception: // the next line where another grouping element is defined. framework.AssertBothValid("hnParallelSequenceTest"); } - private sealed class _Generator_643 : UaValidationTestFramework.Generator { - public _Generator_643() { + private sealed class _Generator_642 : UaValidationTestFramework.Generator { + public _Generator_642() { } public IBlockElement Generate() { @@ -694,8 +695,8 @@ public IBlockElement Generate() { } } - private sealed class _Generator_652 : UaValidationTestFramework.Generator { - public _Generator_652() { + private sealed class _Generator_651 : UaValidationTestFramework.Generator { + public _Generator_651() { } public IBlockElement Generate() { @@ -714,12 +715,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnMixedSequenceTest() { - framework.AddSuppliers(new _Generator_675()); + framework.AddSuppliers(new _Generator_674()); framework.AssertBothValid("hnMixedSequenceTest"); } - private sealed class _Generator_675 : UaValidationTestFramework.Generator { - public _Generator_675() { + private sealed class _Generator_674 : UaValidationTestFramework.Generator { + public _Generator_674() { } public IBlockElement Generate() { @@ -745,12 +746,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnMixedSequenceTest2() { - framework.AddSuppliers(new _Generator_705()); + framework.AddSuppliers(new _Generator_704()); framework.AssertBothValid("hnMixedSequenceTest2"); } - private sealed class _Generator_705 : UaValidationTestFramework.Generator { - public _Generator_705() { + private sealed class _Generator_704 : UaValidationTestFramework.Generator { + public _Generator_704() { } public IBlockElement Generate() { @@ -771,12 +772,12 @@ public IBlockElement Generate() { [NUnit.Framework.Test] public virtual void HnMixedSequenceTest3() { - framework.AddSuppliers(new _Generator_729()); + framework.AddSuppliers(new _Generator_728()); framework.AssertBothValid("hnMixedSequenceTest3"); } - private sealed class _Generator_729 : UaValidationTestFramework.Generator { - public _Generator_729() { + private sealed class _Generator_728 : UaValidationTestFramework.Generator { + public _Generator_728() { } public IBlockElement Generate() { diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATableTest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATableTest.cs index 9424a820f7..943580631b 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATableTest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATableTest.cs @@ -28,7 +28,7 @@ You should have received a copy of the GNU Affero General Public License using iText.Kernel.Pdf.Tagging; using iText.Layout.Element; using iText.Pdfua; -using iText.Pdfua.Exceptions; +using iText.Pdfua.Logs; using iText.Test; using iText.Test.Attributes; @@ -262,7 +262,7 @@ public virtual void TableWithHeaderScopeColumn13() { PdfUATableTest.TableBuilder tableBuilder = new PdfUATableTest.TableBuilder(3); tableBuilder.AddHeaderCell(new PdfUATableTest.HeaderCellSupplier(null, "Header 1", 1, 1, "Column")); tableBuilder.AddHeaderCell(new PdfUATableTest.HeaderCellSupplier(null, "Header 2", 1, 1, "Column")); - tableBuilder.AddHeaderCell(new _Generator_303()); + tableBuilder.AddHeaderCell(new _Generator_302()); for (int i = 0; i < 9; i++) { tableBuilder.AddBodyCell(new PdfUATableTest.DataCellSupplier("Data 1", 1, 1, null)); tableBuilder.AddBodyCell(new PdfUATableTest.DataCellSupplier("Data 1", 1, 1, null)); @@ -271,8 +271,8 @@ public virtual void TableWithHeaderScopeColumn13() { framework.AssertBothFail("tableWithHeaderScopeColumn13"); } - private sealed class _Generator_303 : UaValidationTestFramework.Generator { - public _Generator_303() { + private sealed class _Generator_302 : UaValidationTestFramework.Generator { + public _Generator_302() { } public Cell Generate() { @@ -434,7 +434,7 @@ public virtual void TableWithHeaderRowScope07() { PdfUATableTest.TableBuilder tableBuilder = new PdfUATableTest.TableBuilder(3); tableBuilder.AddBodyCell(new PdfUATableTest.HeaderCellSupplier(null, "Header 1", 1, 1, "Row")); tableBuilder.AddBodyCell(new PdfUATableTest.DataCellSupplier("Data 1", 1, 1, null)); - tableBuilder.AddBodyCell(new _Generator_507()); + tableBuilder.AddBodyCell(new _Generator_506()); tableBuilder.AddBodyCell(new PdfUATableTest.HeaderCellSupplier(null, "Header 1", 1, 1, "Row")); tableBuilder.AddBodyCell(new PdfUATableTest.DataCellSupplier("Data 1", 1, 1, null)); tableBuilder.AddBodyCell(new PdfUATableTest.DataCellSupplier("Data 1", 1, 1, null)); @@ -442,8 +442,8 @@ public virtual void TableWithHeaderRowScope07() { framework.AssertBothFail("tableWithHeaderRowScope07"); } - private sealed class _Generator_507 : UaValidationTestFramework.Generator { - public _Generator_507() { + private sealed class _Generator_506 : UaValidationTestFramework.Generator { + public _Generator_506() { } public Cell Generate() { @@ -876,14 +876,14 @@ public virtual void RoleMapping01() { root.AddRoleMapping("FancyTD", StandardRoles.TD); } )); - tableBuilder.AddBodyCell(new _Generator_1009()); - tableBuilder.AddBodyCell(new _Generator_1019()); + tableBuilder.AddBodyCell(new _Generator_1008()); + tableBuilder.AddBodyCell(new _Generator_1018()); framework.AddSuppliers(tableBuilder); framework.AssertBothValid("tableCustomRoles"); } - private sealed class _Generator_1009 : UaValidationTestFramework.Generator { - public _Generator_1009() { + private sealed class _Generator_1008 : UaValidationTestFramework.Generator { + public _Generator_1008() { } public Cell Generate() { @@ -894,8 +894,8 @@ public Cell Generate() { } } - private sealed class _Generator_1019 : UaValidationTestFramework.Generator { - public _Generator_1019() { + private sealed class _Generator_1018 : UaValidationTestFramework.Generator { + public _Generator_1018() { } public Cell Generate() { diff --git a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATest.cs b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATest.cs index fb221d8c2a..308ca75815 100644 --- a/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATest.cs +++ b/itext.tests/itext.pdfua.tests/itext/pdfua/checkers/PdfUATest.cs @@ -40,6 +40,7 @@ You should have received a copy of the GNU Affero General Public License using iText.Layout.Element; using iText.Pdfua; using iText.Pdfua.Exceptions; +using iText.Pdfua.Logs; using iText.Test; using iText.Test.Attributes; using iText.Test.Pdfa; diff --git a/itext.tests/itext.pdfua.tests/resources/itext/pdfua/PdfUADocumentTest/usualPdf.pdf b/itext.tests/itext.pdfua.tests/resources/itext/pdfua/PdfUADocumentTest/usualPdf.pdf new file mode 100644 index 0000000000..09ec41b5bb Binary files /dev/null and b/itext.tests/itext.pdfua.tests/resources/itext/pdfua/PdfUADocumentTest/usualPdf.pdf differ diff --git a/itext.tests/itext.sign.tests/itext/signatures/PdfSignerUnitTest.cs b/itext.tests/itext.sign.tests/itext/signatures/PdfSignerUnitTest.cs index 864ee5f22c..76e7545534 100644 --- a/itext.tests/itext.sign.tests/itext/signatures/PdfSignerUnitTest.cs +++ b/itext.tests/itext.sign.tests/itext/signatures/PdfSignerUnitTest.cs @@ -259,8 +259,8 @@ public virtual void TempFileProvidedTest() { public virtual void InitPdfaDocumentTest() { PdfSigner signer = new PdfSigner(new PdfReader(new MemoryStream(CreateSimplePdfaDocument())), new ByteArrayOutputStream (), new StampingProperties()); - NUnit.Framework.Assert.AreEqual(PdfAConformanceLevel.PDF_A_1A, ((PdfAAgnosticPdfDocument)signer.GetDocument - ()).GetConformanceLevel()); + NUnit.Framework.Assert.AreEqual(PdfAConformance.PDF_A_1A, ((PdfAAgnosticPdfDocument)signer.GetDocument()). + GetConformance().GetAConformance()); } [NUnit.Framework.Test] @@ -499,7 +499,7 @@ private static byte[] CreateSimplePdfaDocument() { Stream @is = FileUtil.GetInputStreamForFile(PDFA_RESOURCES + "sRGB Color Space Profile.icm"); PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , @is); - PdfDocument document = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, outputIntent); + PdfDocument document = new PdfADocument(writer, PdfAConformance.PDF_A_1A, outputIntent); document.SetTagged(); document.GetCatalog().SetLang(new PdfString("en-US")); document.AddNewPage(); diff --git a/itext.tests/itext.sign.tests/itext/signatures/sign/SignedAppearanceTextTest.cs b/itext.tests/itext.sign.tests/itext/signatures/sign/SignedAppearanceTextTest.cs index 169b5290c4..c5ef198112 100644 --- a/itext.tests/itext.sign.tests/itext/signatures/sign/SignedAppearanceTextTest.cs +++ b/itext.tests/itext.sign.tests/itext/signatures/sign/SignedAppearanceTextTest.cs @@ -189,7 +189,7 @@ private static Document CreateSimplePDFADocument(String filename) { String icmProfile = PDFA_FOLDER + "sRGB Color Space Profile.icm"; PdfOutputIntent outputIntent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1" , FileUtil.GetInputStreamForFile(icmProfile)); - PdfDocument document = new PdfADocument(new PdfWriter(filename, writerProperties), PdfAConformanceLevel.PDF_A_4 + PdfDocument document = new PdfADocument(new PdfWriter(filename, writerProperties), PdfAConformance.PDF_A_4 , outputIntent); Document doc = new Document(document); PdfFont font = PdfFontFactory.CreateFont(FONT_FOLDER + "FreeSans.ttf", PdfFontFactory.EmbeddingStrategy.FORCE_EMBEDDED diff --git a/itext.tests/itext.sign.tests/itext/signatures/sign/TimestampSigTest.cs b/itext.tests/itext.sign.tests/itext/signatures/sign/TimestampSigTest.cs index 74c131c4ec..cf04fd9bbe 100644 --- a/itext.tests/itext.sign.tests/itext/signatures/sign/TimestampSigTest.cs +++ b/itext.tests/itext.sign.tests/itext/signatures/sign/TimestampSigTest.cs @@ -72,12 +72,5 @@ public virtual void TimestampTest01() { TestSignUtils.BasicCheckSignedDoc(destinationFolder + "timestampTest01.pdf", "timestampSig1"); NUnit.Framework.Assert.IsNull(SignaturesCompareTool.CompareSignatures(outFileName, compareFile)); } - // TimeStampToken tsWrong = new TimeStampResponse(Files.readAllBytes(Paths.get("c:\\Users\\yulian\\Desktop\\myTs"))).getTimeStampToken(); - // - // JcaSimpleSignerInfoVerifierBuilder sigVerifBuilder = new JcaSimpleSignerInfoVerifierBuilder(); - // X509Certificate caCert = (X509Certificate)Pkcs12FileHelper.readFirstChain(p12FileName, password)[0]; - // SignerInformationVerifier signerInfoVerif = sigVerifBuilder.setProvider(BouncyCastleProvider.PROVIDER_NAME).build(caCert.getPublicKey()); - // boolean signatureValid = tsWrong.isSignatureValid(signerInfoVerif); - // } } diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/PKCS7ExternalSignatureContainerTest/cmp_testTroughPdfSignerWithTsaClient.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/PKCS7ExternalSignatureContainerTest/cmp_testTroughPdfSignerWithTsaClient.pdf index 6d9796e2e7..de5070aa7b 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/PKCS7ExternalSignatureContainerTest/cmp_testTroughPdfSignerWithTsaClient.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/PKCS7ExternalSignatureContainerTest/cmp_testTroughPdfSignerWithTsaClient.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoCrlDataTest.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoCrlDataTest.pdf index e2650fb2b0..dc95140722 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoCrlDataTest.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoCrlDataTest.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoOcspDataTest.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoOcspDataTest.pdf index 7836c124cd..14b4a18fd3 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoOcspDataTest.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledSingleSignatureNoOcspDataTest.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledTsTest01.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledTsTest01.pdf index 17b5987106..6630ab9ca2 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledTsTest01.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_ltvEnabledTsTest01.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_secondLtvOriginalHasNoVriTs01.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_secondLtvOriginalHasNoVriTs01.pdf index f50412d43e..28360ecdf1 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_secondLtvOriginalHasNoVriTs01.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/LtvSigTest/cmp_secondLtvOriginalHasNoVriTs01.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelLTATest01.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelLTATest01.pdf index 3f5a6ff34f..a6ea940f5c 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelLTATest01.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelLTATest01.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelTTest01.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelTTest01.pdf index 6e80b40664..0d78251689 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelTTest01.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesSignatureLevelTest/cmp_padesSignatureLevelTTest01.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest1.pdf index 29ad2c6c86..a6be95ad51 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest2.pdf index 2209b43918..16f2783c73 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3.pdf index 0ae6f10f9d..cee812a555 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest4.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest4.pdf index af616ece42..37cfc5a967 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest4.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest4.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest1.pdf index c818f5b0c4..78953a84ac 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest2.pdf index 601da3cd62..679ecc2d6a 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3.pdf index a76a4f2218..e65747898b 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest4.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest4.pdf index 053f8cc08b..123c4b6954 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest4.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest4.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest1.pdf index fa1237c62d..dc762876e3 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest2.pdf index ebff5e665c..66bf74c45a 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest3.pdf index d3a36ccf58..36d546299c 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest4.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest4.pdf index e2798b8a79..f61d2f8b7e 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest4.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineTTest4.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest1.pdf index f9cd7d3820..d592f1feb0 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest2.pdf index 5666c4f044..ef482ecaad 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest3.pdf index 94bfab222e..c588ad9570 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTATest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest1.pdf index d16c5a4d8b..028004b72b 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest2.pdf index 3853a96412..1d7fc57037 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest3.pdf index 43b8f84047..39d0785c23 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelLTTest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest1.pdf index ac91394d28..cc5129dd24 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest2.pdf index b5754acf68..a71385963c 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest3.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest3.pdf index babc0976e9..db208ff194 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest3.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_padesSignatureLevelTTest3.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest1.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest1.pdf index 9dfa8fe6de..0c6a8bfe90 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest1.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest1.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest2.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest2.pdf index 2ce18344be..72b71aa06d 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest2.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerLevelsTest/cmp_prolongDocumentSignaturesTest2.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerTest/cmp_defaultSignerPropertiesTest.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerTest/cmp_defaultSignerPropertiesTest.pdf index 190d46284d..0226439e8d 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerTest/cmp_defaultSignerPropertiesTest.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/PdfPadesSignerTest/cmp_defaultSignerPropertiesTest.pdf differ diff --git a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/TimestampSigTest/cmp_timestampTest01.pdf b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/TimestampSigTest/cmp_timestampTest01.pdf index 3d0cefe2fc..d7c3b1963c 100644 Binary files a/itext.tests/itext.sign.tests/resources/itext/signatures/sign/TimestampSigTest/cmp_timestampTest01.pdf and b/itext.tests/itext.sign.tests/resources/itext/signatures/sign/TimestampSigTest/cmp_timestampTest01.pdf differ diff --git a/itext/itext.bouncy-castle-adapter/itext-bouncy-castle-adapter.nuspec b/itext/itext.bouncy-castle-adapter/itext-bouncy-castle-adapter.nuspec index 6b7a1f1e0c..11ac1e0d88 100644 --- a/itext/itext.bouncy-castle-adapter/itext-bouncy-castle-adapter.nuspec +++ b/itext/itext.bouncy-castle-adapter/itext-bouncy-castle-adapter.nuspec @@ -19,11 +19,11 @@ - + - + diff --git a/itext/itext.bouncy-castle-adapter/itext.bouncy-castle-adapter.csproj b/itext/itext.bouncy-castle-adapter/itext.bouncy-castle-adapter.csproj index e1ef51af7b..19181a141e 100644 --- a/itext/itext.bouncy-castle-adapter/itext.bouncy-castle-adapter.csproj +++ b/itext/itext.bouncy-castle-adapter/itext.bouncy-castle-adapter.csproj @@ -30,6 +30,6 @@ - + \ No newline at end of file diff --git a/itext/itext.bouncy-castle-adapter/itext/bouncycastle/BouncyCastleFactory.cs b/itext/itext.bouncy-castle-adapter/itext/bouncycastle/BouncyCastleFactory.cs index 13c6ceef29..088e964085 100644 --- a/itext/itext.bouncy-castle-adapter/itext/bouncycastle/BouncyCastleFactory.cs +++ b/itext/itext.bouncy-castle-adapter/itext/bouncycastle/BouncyCastleFactory.cs @@ -856,7 +856,8 @@ public virtual ITimeStampRequest CreateTimeStampRequest(byte[] bytes) { /// public ITimeStampTokenGenerator CreateTimeStampTokenGenerator(IPrivateKey pk, IX509Certificate certificate, string allowedDigest, string policyOid) { - return new TimeStampTokenGeneratorBC(pk, certificate, allowedDigest, policyOid); + String digestOid = GetDigestAlgorithmOid(allowedDigest.ToUpperInvariant()); + return new TimeStampTokenGeneratorBC(pk, certificate, digestOid, policyOid); } /// diff --git a/itext/itext.forms/itext/forms/fields/AbstractPdfFormField.cs b/itext/itext.forms/itext/forms/fields/AbstractPdfFormField.cs index 4e6a592eed..b87f8b8e8c 100644 --- a/itext/itext.forms/itext/forms/fields/AbstractPdfFormField.cs +++ b/itext/itext.forms/itext/forms/fields/AbstractPdfFormField.cs @@ -68,7 +68,7 @@ public abstract class AbstractPdfFormField : PdfObjectWrapper { protected internal Color color; - protected internal IConformanceLevel pdfConformanceLevel; + protected internal PdfConformance pdfConformance; /// Parent form field. protected internal PdfFormField parent; @@ -200,13 +200,13 @@ public virtual Color GetColor() { return color == null && parent != null ? parent.GetColor() : color; } - /// Gets the declared conformance level. + /// Gets the declared conformance. /// /// the - /// + /// /// - public virtual IConformanceLevel GetPdfConformanceLevel() { - return pdfConformanceLevel == null && parent != null ? parent.GetPdfConformanceLevel() : pdfConformanceLevel; + public virtual PdfConformance GetPdfConformance() { + return pdfConformance == null && parent != null ? parent.GetPdfConformance() : pdfConformance; } /// This method regenerates appearance stream of the field. diff --git a/itext/itext.forms/itext/forms/fields/CheckBoxFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/CheckBoxFormFieldBuilder.cs index 34a648ccdb..eeb0b7d005 100644 --- a/itext/itext.forms/itext/forms/fields/CheckBoxFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/CheckBoxFormFieldBuilder.cs @@ -74,13 +74,13 @@ public virtual PdfButtonFormField CreateCheckBox() { else { PdfWidgetAnnotation annotation = new PdfWidgetAnnotation(GetWidgetRectangle()); annotation.SetAppearanceState(new PdfName(PdfFormAnnotation.OFF_STATE_VALUE)); - if (GetConformanceLevel() != null) { + if (GetConformance() != null && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } check = PdfFormCreator.CreateButtonFormField(annotation, GetDocument()); } check.DisableFieldRegeneration(); - check.pdfConformanceLevel = GetConformanceLevel(); + check.pdfConformance = GetConformance(); check.SetCheckType(checkType); check.SetFieldName(GetFormFieldName()); // the default behavior is to automatically calculate the fontsize diff --git a/itext/itext.forms/itext/forms/fields/ChoiceFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/ChoiceFormFieldBuilder.cs index 49693a189d..04ac51947d 100644 --- a/itext/itext.forms/itext/forms/fields/ChoiceFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/ChoiceFormFieldBuilder.cs @@ -120,13 +120,13 @@ private PdfChoiceFormField CreateChoice(int flags) { } else { annotation = new PdfWidgetAnnotation(GetWidgetRectangle()); - if (null != GetConformanceLevel()) { + if (null != GetConformance() && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } field = PdfFormCreator.CreateChoiceFormField(annotation, GetDocument()); } field.DisableFieldRegeneration(); - field.pdfConformanceLevel = GetConformanceLevel(); + field.pdfConformance = GetConformance(); if (this.GetFont() != null) { field.SetFont(this.GetFont()); } diff --git a/itext/itext.forms/itext/forms/fields/FormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/FormFieldBuilder.cs index 8e3c3ff2cb..5b43462eaa 100644 --- a/itext/itext.forms/itext/forms/fields/FormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/FormFieldBuilder.cs @@ -34,8 +34,8 @@ public abstract class FormFieldBuilder /// Name of the form field. private readonly String formFieldName; - /// Conformance level of the form field. - private IConformanceLevel conformanceLevel = null; + /// Conformance of the form field. + private PdfConformance conformance = null; /// /// Creates builder for @@ -48,7 +48,7 @@ protected internal FormFieldBuilder(PdfDocument document, String formFieldName) this.document = document; this.formFieldName = formFieldName; if (document != null) { - this.conformanceLevel = document.GetConformanceLevel(); + this.conformance = document.GetConformance(); } } @@ -68,25 +68,25 @@ public virtual String GetFormFieldName() { return formFieldName; } - /// Gets conformance level for form field creation. + /// Gets conformance for form field creation. /// /// instance of - /// + /// /// to be used for form field creation /// - public virtual IConformanceLevel GetConformanceLevel() { - return conformanceLevel; + public virtual PdfConformance GetConformance() { + return conformance; } - /// Sets conformance level for form field creation. - /// + /// Sets conformance for form field creation. + /// /// Instance of - /// + /// /// to be used for form field creation. /// /// this builder - public virtual T SetConformanceLevel(IConformanceLevel conformanceLevel) { - this.conformanceLevel = conformanceLevel; + public virtual T SetConformance(PdfConformance conformance) { + this.conformance = conformance; return GetThis(); } diff --git a/itext/itext.forms/itext/forms/fields/NonTerminalFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/NonTerminalFormFieldBuilder.cs index 01c1b2e616..999fcbad5c 100644 --- a/itext/itext.forms/itext/forms/fields/NonTerminalFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/NonTerminalFormFieldBuilder.cs @@ -46,7 +46,7 @@ public NonTerminalFormFieldBuilder(PdfDocument document, String formFieldName) /// public virtual PdfFormField CreateNonTerminalFormField() { PdfFormField field = PdfFormCreator.CreateFormField(GetDocument()); - field.pdfConformanceLevel = GetConformanceLevel(); + field.pdfConformance = GetConformance(); field.SetFieldName(GetFormFieldName()); return field; } diff --git a/itext/itext.forms/itext/forms/fields/PdfFormAnnotation.cs b/itext/itext.forms/itext/forms/fields/PdfFormAnnotation.cs index 11d2795739..f3a776f1cd 100644 --- a/itext/itext.forms/itext/forms/fields/PdfFormAnnotation.cs +++ b/itext/itext.forms/itext/forms/fields/PdfFormAnnotation.cs @@ -165,9 +165,8 @@ public static iText.Forms.Fields.PdfFormAnnotation MakeFormAnnotation(PdfObject return null; } field.MakeIndirect(document); - if (document != null && document.GetReader() != null && document.GetReader().GetPdfAConformanceLevel() != - null) { - field.pdfConformanceLevel = document.GetReader().GetPdfAConformanceLevel(); + if (document != null) { + field.pdfConformance = document.GetConformance(); } return field; } @@ -988,7 +987,7 @@ protected internal virtual void DrawCheckBoxAndSaveAppearance(String onStateName iText.Layout.Canvas canvasOff = new iText.Layout.Canvas(xObjectOff, GetDocument()); SetMetaInfoToCanvas(canvasOff); canvasOff.Add(formFieldElement); - if (GetPdfConformanceLevel() == null) { + if (GetPdfConformance() == null || !GetPdfConformance().IsPdfAOrUa()) { xObjectOff.GetResources().AddFont(GetDocument(), GetFont()); } normalAppearance.Put(new PdfName(OFF_STATE_VALUE), xObjectOff.GetPdfObject()); @@ -1226,7 +1225,7 @@ private void CreateCheckBox() { } formFieldElement.SetProperty(Property.FONT_SIZE, UnitValue.CreatePointValue(GetFontSize())); SetModelElementProperties(GetRect(GetPdfObject())); - ((CheckBox)formFieldElement).SetPdfConformanceLevel(GetPdfConformanceLevel()); + ((CheckBox)formFieldElement).SetPdfConformance(GetPdfConformance()); ((CheckBox)formFieldElement).SetCheckBoxType(parent.checkType.GetValue()); } diff --git a/itext/itext.forms/itext/forms/fields/PdfFormField.cs b/itext/itext.forms/itext/forms/fields/PdfFormField.cs index 82dabf5d76..0d42761929 100644 --- a/itext/itext.forms/itext/forms/fields/PdfFormField.cs +++ b/itext/itext.forms/itext/forms/fields/PdfFormField.cs @@ -270,9 +270,8 @@ public static iText.Forms.Fields.PdfFormField MakeFormField(PdfObject pdfObject, } } field.MakeIndirect(document); - if (document != null && document.GetReader() != null && document.GetReader().GetPdfAConformanceLevel() != - null) { - field.pdfConformanceLevel = document.GetReader().GetPdfAConformanceLevel(); + if (document != null) { + field.pdfConformance = document.GetConformance(); } return field; } @@ -1190,7 +1189,7 @@ public virtual iText.Forms.Fields.PdfFormField SetCheckType(CheckBoxType checkTy checkType = CheckBoxType.CROSS; } this.checkType = new NullableContainer(checkType); - if (GetPdfConformanceLevel() != null) { + if (GetPdfConformance() != null && GetPdfConformance().IsPdfAOrUa()) { return this; } try { diff --git a/itext/itext.forms/itext/forms/fields/PushButtonFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/PushButtonFormFieldBuilder.cs index b3b24f5f12..c321affc26 100644 --- a/itext/itext.forms/itext/forms/fields/PushButtonFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/PushButtonFormFieldBuilder.cs @@ -71,7 +71,7 @@ public virtual PdfButtonFormField CreatePushButton() { else { annotation = new PdfWidgetAnnotation(GetWidgetRectangle()); field = PdfFormCreator.CreateButtonFormField(annotation, GetDocument()); - if (null != GetConformanceLevel()) { + if (null != GetConformance() && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } } @@ -79,7 +79,7 @@ public virtual PdfButtonFormField CreatePushButton() { if (this.GetFont() != null) { field.SetFont(this.GetFont()); } - field.pdfConformanceLevel = GetConformanceLevel(); + field.pdfConformance = GetConformance(); field.SetPushButton(true); field.SetFieldName(GetFormFieldName()); field.text = caption; diff --git a/itext/itext.forms/itext/forms/fields/RadioFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/RadioFormFieldBuilder.cs index 7a6445fca8..9c251bf416 100644 --- a/itext/itext.forms/itext/forms/fields/RadioFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/RadioFormFieldBuilder.cs @@ -46,7 +46,7 @@ public RadioFormFieldBuilder(PdfDocument document, String radioGroupFormFieldNam public virtual PdfButtonFormField CreateRadioGroup() { PdfButtonFormField radioGroup = PdfFormCreator.CreateButtonFormField(GetDocument()); radioGroup.DisableFieldRegeneration(); - radioGroup.pdfConformanceLevel = GetConformanceLevel(); + radioGroup.pdfConformance = GetConformance(); radioGroup.SetFieldName(GetFormFieldName()); radioGroup.SetFieldFlags(PdfButtonFormField.FF_RADIO); radioGroup.EnableFieldRegeneration(); @@ -71,12 +71,12 @@ public virtual PdfFormAnnotation CreateRadioButton(String appearanceName, Rectan PdfName appearancePdfName = new PdfName(appearanceName); PdfWidgetAnnotation annotation = new PdfWidgetAnnotation(widgetRectangle); annotation.SetAppearanceState(appearancePdfName); - if (GetConformanceLevel() != null) { + if (GetConformance() != null && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } PdfFormAnnotation radio = PdfFormCreator.CreateFormAnnotation(annotation, GetDocument()); SetPageToField(radio); - radio.pdfConformanceLevel = GetConformanceLevel(); + radio.pdfConformance = GetConformance(); return radio; } diff --git a/itext/itext.forms/itext/forms/fields/SignatureFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/SignatureFormFieldBuilder.cs index 1975eedcaf..17d2c03ec6 100644 --- a/itext/itext.forms/itext/forms/fields/SignatureFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/SignatureFormFieldBuilder.cs @@ -52,7 +52,7 @@ public virtual PdfSignatureFormField CreateSignature() { } else { PdfWidgetAnnotation annotation = new PdfWidgetAnnotation(GetWidgetRectangle()); - if (GetConformanceLevel() != null) { + if (GetConformance() != null && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } signatureFormField = PdfFormCreator.CreateSignatureFormField(annotation, GetDocument()); @@ -63,7 +63,7 @@ public virtual PdfSignatureFormField CreateSignature() { if (GetFont() != null) { signatureFormField.font = GetFont(); } - signatureFormField.pdfConformanceLevel = GetConformanceLevel(); + signatureFormField.pdfConformance = GetConformance(); signatureFormField.SetFieldName(GetFormFieldName()); return signatureFormField; } diff --git a/itext/itext.forms/itext/forms/fields/TextFormFieldBuilder.cs b/itext/itext.forms/itext/forms/fields/TextFormFieldBuilder.cs index 4c5d3c2e56..d5fb6f3741 100644 --- a/itext/itext.forms/itext/forms/fields/TextFormFieldBuilder.cs +++ b/itext/itext.forms/itext/forms/fields/TextFormFieldBuilder.cs @@ -57,7 +57,7 @@ private PdfTextFormField CreateText(bool multiline) { } else { PdfWidgetAnnotation annotation = new PdfWidgetAnnotation(GetWidgetRectangle()); - if (null != GetConformanceLevel()) { + if (null != GetConformance() && GetConformance().IsPdfAOrUa()) { annotation.SetFlag(PdfAnnotation.PRINT); } field = PdfFormCreator.CreateTextFormField(annotation, GetDocument()); @@ -67,7 +67,7 @@ private PdfTextFormField CreateText(bool multiline) { field.SetFont(GetFont()); } field.DisableFieldRegeneration(); - field.pdfConformanceLevel = GetConformanceLevel(); + field.pdfConformance = GetConformance(); field.SetMultiline(multiline); field.SetFieldName(GetFormFieldName()); field.SetValue(TEXT_FORM_FIELD_DEFAULT_VALUE); diff --git a/itext/itext.forms/itext/forms/form/element/CheckBox.cs b/itext/itext.forms/itext/forms/form/element/CheckBox.cs index 66ae088df0..aff13866aa 100644 --- a/itext/itext.forms/itext/forms/form/element/CheckBox.cs +++ b/itext/itext.forms/itext/forms/form/element/CheckBox.cs @@ -67,12 +67,11 @@ public virtual iText.Forms.Form.Element.CheckBox SetChecked(bool @checked) { return this; } - /// Sets the conformance level for the checkbox. - /// The PDF/A conformance level to set. + /// Sets the conformance for the checkbox. + /// The PDF conformance to set. /// this checkbox instance - public virtual iText.Forms.Form.Element.CheckBox SetPdfConformanceLevel(IConformanceLevel conformanceLevel - ) { - SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, conformanceLevel); + public virtual iText.Forms.Form.Element.CheckBox SetPdfConformance(PdfConformance conformance) { + SetProperty(FormProperty.FORM_CONFORMANCE_LEVEL, conformance); return this; } diff --git a/itext/itext.forms/itext/forms/form/renderer/AbstractFormFieldRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/AbstractFormFieldRenderer.cs index 29c740bc79..1fde55b093 100644 --- a/itext/itext.forms/itext/forms/form/renderer/AbstractFormFieldRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/AbstractFormFieldRenderer.cs @@ -247,21 +247,19 @@ protected internal virtual String GetLang() { return language; } - /// Gets the conformance level. - /// Gets the conformance level. If the conformance level is not set, the conformance level of the document is used. - /// + /// Gets the conformance. + /// Gets the conformance. If the conformance is not set, the conformance of the document is used. /// the document - /// the conformance level or null if the conformance level is not set. - protected internal virtual IConformanceLevel GetConformanceLevel(PdfDocument document) { - IConformanceLevel conformanceLevel = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL - ); - if (conformanceLevel != null) { - return conformanceLevel; + /// the conformance or null if the conformance is not set. + protected internal virtual PdfConformance GetConformance(PdfDocument document) { + PdfConformance conformance = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL); + if (conformance != null) { + return conformance; } if (document == null) { return null; } - return document.GetConformanceLevel(); + return document.GetConformance(); } /// Determines, whether the layout is based in the renderer itself or flat renderer. diff --git a/itext/itext.forms/itext/forms/form/renderer/AbstractSelectFieldRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/AbstractSelectFieldRenderer.cs index df2bc22bb4..43ca315178 100644 --- a/itext/itext.forms/itext/forms/form/renderer/AbstractSelectFieldRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/AbstractSelectFieldRenderer.cs @@ -252,21 +252,19 @@ protected internal virtual float GetFinalSelectFieldHeight(float availableHeight return actualHeight; } - /// Gets the conformance level. - /// Gets the conformance level. If the conformance level is not set, the conformance level of the document is used. - /// + /// Gets the conformance. + /// Gets the conformance. If the conformance is not set, the conformance of the document is used. /// the document - /// the conformance level or null if the conformance level is not set. - protected internal virtual IConformanceLevel GetConformanceLevel(PdfDocument document) { - IConformanceLevel conformanceLevel = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL - ); - if (conformanceLevel != null) { - return conformanceLevel; + /// the conformance or null if the conformance is not set. + protected internal virtual PdfConformance GetConformance(PdfDocument document) { + PdfConformance conformance = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL); + if (conformance != null) { + return conformance; } if (document == null) { return null; } - return document.GetConformanceLevel(); + return document.GetConformance(); } /// Gets options that are marked as selected from the select field options subtree. diff --git a/itext/itext.forms/itext/forms/form/renderer/ButtonRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/ButtonRenderer.cs index 60cf4fe55c..41269e6872 100644 --- a/itext/itext.forms/itext/forms/form/renderer/ButtonRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/ButtonRenderer.cs @@ -243,7 +243,7 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { modelElement.SetProperty(Property.RENDERING_MODE, this.GetProperty(Property.RENDERING_MODE )); PdfButtonFormField button = new PushButtonFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetFont(font - ).SetConformanceLevel(GetConformanceLevel(doc)).CreatePushButton(); + ).SetConformance(GetConformance(doc)).CreatePushButton(); button.DisableFieldRegeneration(); button.SetFontSize(fontSizeValue); button.GetFirstFormAnnotation().SetBackgroundColor(backgroundColor); diff --git a/itext/itext.forms/itext/forms/form/renderer/CheckBoxRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/CheckBoxRenderer.cs index fffd2e99a0..bb5822f132 100644 --- a/itext/itext.forms/itext/forms/form/renderer/CheckBoxRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/CheckBoxRenderer.cs @@ -91,8 +91,8 @@ public virtual CheckBoxType GetCheckBoxType() { public virtual ICheckBoxRenderingStrategy CreateCheckBoxRenderStrategy() { // html rendering is PDFA compliant this means we don't have to check if its PDFA. ICheckBoxRenderingStrategy renderingStrategy; - bool isConformantPdfDocument = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL) != - null; + PdfConformance conformance = this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL); + bool isConformantPdfDocument = conformance != null && conformance.IsPdfAOrUa(); if (GetRenderingMode() == RenderingMode.HTML_MODE) { renderingStrategy = new HtmlCheckBoxRenderingStrategy(); } @@ -194,8 +194,8 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { Rectangle area = flatRenderer.GetOccupiedArea().GetBBox().Clone(); IDictionary properties = FormFieldRendererUtil.RemoveProperties(this.modelElement); PdfPage page = doc.GetPage(occupiedArea.GetPageNumber()); - CheckBoxFormFieldBuilder builder = new CheckBoxFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformanceLevel - (this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL)); + CheckBoxFormFieldBuilder builder = new CheckBoxFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformance + (this.GetProperty(FormProperty.FORM_CONFORMANCE_LEVEL)); if (this.HasProperty(FormProperty.FORM_CHECKBOX_TYPE)) { builder.SetCheckType((CheckBoxType)this.GetProperty(FormProperty.FORM_CHECKBOX_TYPE)); } diff --git a/itext/itext.forms/itext/forms/form/renderer/InputFieldRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/InputFieldRenderer.cs index 02fd6e6872..e87abe8caf 100644 --- a/itext/itext.forms/itext/forms/form/renderer/InputFieldRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/InputFieldRenderer.cs @@ -144,8 +144,8 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { // Default html2pdf input field appearance differs from the default one for form fields. // That's why we got rid of several properties we set by default during InputField instance creation. modelElement.SetProperty(Property.BOX_SIZING, BoxSizingPropertyValue.BORDER_BOX); - PdfFormField inputField = new TextFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetFont(font).SetConformanceLevel - (GetConformanceLevel(doc)).CreateText(); + PdfFormField inputField = new TextFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetFont(font).SetConformance + (GetConformance(doc)).CreateText(); inputField.DisableFieldRegeneration(); inputField.SetValue(value); inputField.SetFontSize(fontSizeValue); diff --git a/itext/itext.forms/itext/forms/form/renderer/RadioRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/RadioRenderer.cs index a5919090b5..c276247e1c 100644 --- a/itext/itext.forms/itext/forms/form/renderer/RadioRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/RadioRenderer.cs @@ -158,7 +158,7 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { } PdfButtonFormField radioGroup = (PdfButtonFormField)form.GetField(groupName); if (null == radioGroup) { - radioGroup = new RadioFormFieldBuilder(doc, groupName).SetConformanceLevel(GetConformanceLevel(doc)).CreateRadioGroup + radioGroup = new RadioFormFieldBuilder(doc, groupName).SetConformance(GetConformance(doc)).CreateRadioGroup (); radioGroup.DisableFieldRegeneration(); radioGroup.SetValue(PdfFormAnnotation.OFF_STATE_VALUE); @@ -169,8 +169,8 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { if (IsBoxChecked()) { radioGroup.SetValue(GetModelId()); } - PdfFormAnnotation radio = new RadioFormFieldBuilder(doc, null).SetConformanceLevel(GetConformanceLevel(doc - )).CreateRadioButton(GetModelId(), area); + PdfFormAnnotation radio = new RadioFormFieldBuilder(doc, null).SetConformance(GetConformance(doc)).CreateRadioButton + (GetModelId(), area); radio.DisableFieldRegeneration(); Background background = this.GetProperty(Property.BACKGROUND); if (background != null) { diff --git a/itext/itext.forms/itext/forms/form/renderer/SelectFieldComboBoxRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/SelectFieldComboBoxRenderer.cs index f81edb9b29..3bd0efc05e 100644 --- a/itext/itext.forms/itext/forms/form/renderer/SelectFieldComboBoxRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/SelectFieldComboBoxRenderer.cs @@ -94,7 +94,7 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { PdfPage page = doc.GetPage(occupiedArea.GetPageNumber()); PdfFont font = GetResolvedFont(doc); ChoiceFormFieldBuilder builder = new ChoiceFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetFont(font - ).SetConformanceLevel(GetConformanceLevel(doc)); + ).SetConformance(GetConformance(doc)); ApplyMargins(area, false); IDictionary properties = FormFieldRendererUtil.RemoveProperties(this.modelElement); modelElement.SetProperty(Property.FONT_PROVIDER, this.GetProperty(Property.FONT_PROVIDER)); diff --git a/itext/itext.forms/itext/forms/form/renderer/SelectFieldListBoxRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/SelectFieldListBoxRenderer.cs index 3a77e0ead6..24d21775f4 100644 --- a/itext/itext.forms/itext/forms/form/renderer/SelectFieldListBoxRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/SelectFieldListBoxRenderer.cs @@ -174,7 +174,7 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { )); ListBoxField lbModelElement = (ListBoxField)modelElement; IList selectedOptions = lbModelElement.GetSelectedStrings(); - ChoiceFormFieldBuilder builder = new ChoiceFormFieldBuilder(doc, GetModelId()).SetConformanceLevel(GetConformanceLevel + ChoiceFormFieldBuilder builder = new ChoiceFormFieldBuilder(doc, GetModelId()).SetConformance(GetConformance (doc)).SetFont(font).SetWidgetRectangle(area); SetupBuilderValues(builder, lbModelElement); PdfChoiceFormField choiceField = builder.CreateList(); diff --git a/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs index a8e4223ac5..5a35e9da72 100644 --- a/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs @@ -218,8 +218,8 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { modelElement.SetProperty(Property.FONT_PROVIDER, this.GetProperty(Property.FONT_PROVIDER)); modelElement.SetProperty(Property.RENDERING_MODE, this.GetProperty(Property.RENDERING_MODE)); - PdfSignatureFormField sigField = new SignatureFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformanceLevel - (GetConformanceLevel(doc)).SetFont(font).CreateSignature(); + PdfSignatureFormField sigField = new SignatureFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformance + (GetConformance(doc)).SetFont(font).CreateSignature(); sigField.DisableFieldRegeneration(); sigField.SetFontSize(fontSizeValue); sigField.GetFirstFormAnnotation().SetBackgroundColor(backgroundColor); diff --git a/itext/itext.forms/itext/forms/form/renderer/TextAreaRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/TextAreaRenderer.cs index bf63f03d1e..c3aab79362 100644 --- a/itext/itext.forms/itext/forms/form/renderer/TextAreaRenderer.cs +++ b/itext/itext.forms/itext/forms/form/renderer/TextAreaRenderer.cs @@ -165,8 +165,8 @@ protected internal override void ApplyAcroField(DrawContext drawContext) { // Default html2pdf text area appearance differs from the default one for form fields. // That's why we got rid of several properties we set by default during TextArea instance creation. modelElement.SetProperty(Property.BOX_SIZING, BoxSizingPropertyValue.BORDER_BOX); - PdfFormField inputField = new TextFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformanceLevel - (GetConformanceLevel(doc)).SetFont(font).CreateMultilineText(); + PdfFormField inputField = new TextFormFieldBuilder(doc, name).SetWidgetRectangle(area).SetConformance(GetConformance + (doc)).SetFont(font).CreateMultilineText(); inputField.DisableFieldRegeneration(); inputField.SetValue(value); inputField.SetFontSize(fontSizeValue); diff --git a/itext/itext.kernel/itext/kernel/pdf/IConformanceLevel.cs b/itext/itext.kernel/itext/kernel/pdf/IConformanceLevel.cs deleted file mode 100644 index 85515e8689..0000000000 --- a/itext/itext.kernel/itext/kernel/pdf/IConformanceLevel.cs +++ /dev/null @@ -1,34 +0,0 @@ -/* -This file is part of the iText (R) project. -Copyright (c) 1998-2024 Apryse Group NV -Authors: Apryse Software. - -This program is offered under a commercial and under the AGPL license. -For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below. - -AGPL licensing: -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -namespace iText.Kernel.Pdf { - /// Interface for PDF conformance level. - /// - /// Interface for PDF conformance level. - /// - /// Conformance levels are extended PDF specifications that define subsets of PDF - /// functionality. An example of a conformance level is PDF/A, which is used for long-term archiving - /// and PDF/UA, which is used for accessible documents. - /// - public interface IConformanceLevel { - } -} diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfAConformance.cs b/itext/itext.kernel/itext/kernel/pdf/PdfAConformance.cs new file mode 100644 index 0000000000..e9955ce48f --- /dev/null +++ b/itext/itext.kernel/itext/kernel/pdf/PdfAConformance.cs @@ -0,0 +1,108 @@ +/* +This file is part of the iText (R) project. +Copyright (c) 1998-2024 Apryse Group NV +Authors: Apryse Software. + +This program is offered under a commercial and under the AGPL license. +For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below. + +AGPL licensing: +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +using System; + +namespace iText.Kernel.Pdf { + /// PDF/A is a special variant of PDF designed specifically for long-term document preservation (the “A” stands for archive). + /// + /// + /// PDF/A is a special variant of PDF designed specifically for long-term document preservation (the “A” stands for archive). + /// + /// The class contains an enumeration of all the PDF/A conformance currently supported by iText. + /// + public sealed class PdfAConformance { + /// PDF/A-1A + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_1A = new iText.Kernel.Pdf.PdfAConformance("1" + , "A"); + + /// PDF/A-1B + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_1B = new iText.Kernel.Pdf.PdfAConformance("1" + , "B"); + + /// PDF/A-2A + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_2A = new iText.Kernel.Pdf.PdfAConformance("2" + , "A"); + + /// PDF/A-2B + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_2B = new iText.Kernel.Pdf.PdfAConformance("2" + , "B"); + + /// PDF/A-2U + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_2U = new iText.Kernel.Pdf.PdfAConformance("2" + , "U"); + + /// PDF/A-3A + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_3A = new iText.Kernel.Pdf.PdfAConformance("3" + , "A"); + + /// PDF/A-3B + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_3B = new iText.Kernel.Pdf.PdfAConformance("3" + , "B"); + + /// PDF/A-3U + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_3U = new iText.Kernel.Pdf.PdfAConformance("3" + , "U"); + + /// PDF/A-4 + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_4 = new iText.Kernel.Pdf.PdfAConformance("4" + , null); + + /// PDF/A-4E + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_4E = new iText.Kernel.Pdf.PdfAConformance("4" + , "E"); + + /// PDF/A-4F + public static readonly iText.Kernel.Pdf.PdfAConformance PDF_A_4F = new iText.Kernel.Pdf.PdfAConformance("4" + , "F"); + + private readonly String part; + + private readonly String level; + +//\cond DO_NOT_DOCUMENT + /// + /// Creates a new + /// + /// instance. + /// + /// the part of the PDF/A conformance + /// the level of the PDF/A conformance + internal PdfAConformance(String part, String level) { + this.part = part; + this.level = level; + } +//\endcond + + /// Get the part of the PDF/A conformance. + /// the part of the PDF/A conformance + public String GetPart() { + return this.part; + } + + /// Get the level of the PDF/A conformance. + /// the level of the PDF/A conformance + public String GetLevel() { + return this.level; + } + } +} diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfAConformanceLevel.cs b/itext/itext.kernel/itext/kernel/pdf/PdfAConformanceLevel.cs deleted file mode 100644 index a8b9d8e8a0..0000000000 --- a/itext/itext.kernel/itext/kernel/pdf/PdfAConformanceLevel.cs +++ /dev/null @@ -1,158 +0,0 @@ -/* -This file is part of the iText (R) project. -Copyright (c) 1998-2024 Apryse Group NV -Authors: Apryse Software. - -This program is offered under a commercial and under the AGPL license. -For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below. - -AGPL licensing: -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -using System; -using iText.Kernel.XMP; -using iText.Kernel.XMP.Properties; - -namespace iText.Kernel.Pdf { - /// Enumeration of all the PDF/A conformance levels. - public class PdfAConformanceLevel : IConformanceLevel { - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_1A = new iText.Kernel.Pdf.PdfAConformanceLevel - ("1", "A"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_1B = new iText.Kernel.Pdf.PdfAConformanceLevel - ("1", "B"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_2A = new iText.Kernel.Pdf.PdfAConformanceLevel - ("2", "A"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_2B = new iText.Kernel.Pdf.PdfAConformanceLevel - ("2", "B"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_2U = new iText.Kernel.Pdf.PdfAConformanceLevel - ("2", "U"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_3A = new iText.Kernel.Pdf.PdfAConformanceLevel - ("3", "A"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_3B = new iText.Kernel.Pdf.PdfAConformanceLevel - ("3", "B"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_3U = new iText.Kernel.Pdf.PdfAConformanceLevel - ("3", "U"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_4 = new iText.Kernel.Pdf.PdfAConformanceLevel - ("4", null); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_4E = new iText.Kernel.Pdf.PdfAConformanceLevel - ("4", "E"); - - public static readonly iText.Kernel.Pdf.PdfAConformanceLevel PDF_A_4F = new iText.Kernel.Pdf.PdfAConformanceLevel - ("4", "F"); - - public const String PDF_A_4_REVISION = "2020"; - - private readonly String conformance; - - private readonly String part; - - private PdfAConformanceLevel(String part, String conformance) { - this.conformance = conformance; - this.part = part; - } - - public virtual String GetConformance() { - return conformance; - } - - public virtual String GetPart() { - return part; - } - - public static iText.Kernel.Pdf.PdfAConformanceLevel GetConformanceLevel(String part, String conformance) { - String lowLetter = conformance == null ? null : conformance.ToUpperInvariant(); - bool aLevel = "A".Equals(lowLetter); - bool bLevel = "B".Equals(lowLetter); - bool uLevel = "U".Equals(lowLetter); - bool eLevel = "E".Equals(lowLetter); - bool fLevel = "F".Equals(lowLetter); - switch (part) { - case "1": { - if (aLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_1A; - } - if (bLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_1B; - } - break; - } - - case "2": { - if (aLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_2A; - } - if (bLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_2B; - } - if (uLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_2U; - } - break; - } - - case "3": { - if (aLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_3A; - } - if (bLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_3B; - } - if (uLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_3U; - } - break; - } - - case "4": { - if (eLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_4E; - } - if (fLevel) { - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_4F; - } - return iText.Kernel.Pdf.PdfAConformanceLevel.PDF_A_4; - } - } - return null; - } - - public static iText.Kernel.Pdf.PdfAConformanceLevel GetConformanceLevel(XMPMeta meta) { - XMPProperty conformanceXmpProperty = null; - XMPProperty partXmpProperty = null; - try { - conformanceXmpProperty = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE); - partXmpProperty = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART); - } - catch (XMPException) { - } - if (partXmpProperty == null || (conformanceXmpProperty == null && !"4".Equals(partXmpProperty.GetValue())) - ) { - return null; - } - else { - return GetConformanceLevel(partXmpProperty.GetValue(), conformanceXmpProperty == null ? null : conformanceXmpProperty - .GetValue()); - } - } - } -} diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfConformance.cs b/itext/itext.kernel/itext/kernel/pdf/PdfConformance.cs new file mode 100644 index 0000000000..5c7bc1a192 --- /dev/null +++ b/itext/itext.kernel/itext/kernel/pdf/PdfConformance.cs @@ -0,0 +1,320 @@ +/* +This file is part of the iText (R) project. +Copyright (c) 1998-2024 Apryse Group NV +Authors: Apryse Software. + +This program is offered under a commercial and under the AGPL license. +For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below. + +AGPL licensing: +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +using System; +using iText.Kernel.XMP; +using iText.Kernel.XMP.Properties; + +namespace iText.Kernel.Pdf { + /// The class represents possible PDF document conformance. + public class PdfConformance { + public const String PDF_A_4_REVISION = "2020"; + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_1A = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_1A); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_1B = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_1B); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_2A = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_2A); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_2B = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_2B); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_2U = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_2U); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_3A = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_3A); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_3B = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_3B); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_3U = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_3U); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_4 = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_4); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_4E = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_4E); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_A_4F = new iText.Kernel.Pdf.PdfConformance(PdfAConformance + .PDF_A_4F); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_UA_1 = new iText.Kernel.Pdf.PdfConformance(PdfUAConformance + .PDF_UA_1); + + public static readonly iText.Kernel.Pdf.PdfConformance PDF_NONE_CONFORMANCE = new iText.Kernel.Pdf.PdfConformance + (); + + private readonly PdfAConformance aConformance; + + private readonly PdfUAConformance uaConformance; + + /// + /// Creates a new + /// + /// instance based on PDF/A and PDF/UA conformance. + /// + /// the PDF/A conformance + /// the PDF/UA conformance + public PdfConformance(PdfAConformance aConformance, PdfUAConformance uaConformance) { + this.aConformance = aConformance; + this.uaConformance = uaConformance; + } + + /// + /// Creates a new + /// + /// instance based on only PDF/A conformance. + /// + /// the PDF/A conformance + public PdfConformance(PdfAConformance aConformance) { + this.aConformance = aConformance; + this.uaConformance = null; + } + + /// + /// Creates a new + /// + /// instance based on only PDF/UA conformance. + /// + /// the PDF/UA conformance + public PdfConformance(PdfUAConformance uaConformance) { + this.uaConformance = uaConformance; + this.aConformance = null; + } + + /// + /// Creates a new + /// + /// instance without PDF/A or PDF/UA conformance. + /// + public PdfConformance() { + this.aConformance = null; + this.uaConformance = null; + } + + /// Checks if any PDF/A conformance is specified. + /// + /// + /// + /// if PDF/A conformance is specified, otherwise + /// + /// + public virtual bool IsPdfA() { + return aConformance != null; + } + + /// Checks if any PDF/UA conformance is specified. + /// + /// + /// + /// if PDF/UA conformance is specified, otherwise + /// + /// + public virtual bool IsPdfUA() { + return uaConformance != null; + } + + /// Checks if any PDF/A or PDF/UA conformance is specified. + /// + /// + /// + /// if PDF/A or PDF/UA conformance is specified, otherwise + /// + /// + public virtual bool IsPdfAOrUa() { + return IsPdfA() || IsPdfUA(); + } + + /// + /// Gets the + /// + /// instance if specified. + /// + /// + /// the specified + /// + /// instance or + /// . + /// + public virtual PdfAConformance GetAConformance() { + return aConformance; + } + + /// + /// Gets the + /// + /// instance if specified. + /// + /// + /// the specified + /// + /// instance or + /// . + /// + public virtual PdfUAConformance GetUAConformance() { + return uaConformance; + } + + public override bool Equals(Object o) { + if (this == o) { + return true; + } + if (o == null || GetType() != o.GetType()) { + return false; + } + iText.Kernel.Pdf.PdfConformance that = (iText.Kernel.Pdf.PdfConformance)o; + return aConformance == that.aConformance && uaConformance == that.uaConformance; + } + + public override int GetHashCode() { + int result = aConformance == null ? 0 : aConformance.GetHashCode(); + result = 31 * result + (uaConformance == null ? 0 : uaConformance.GetHashCode()); + return result; + } + + /// + /// Gets + /// + /// instance from + /// . + /// + /// the meta data to parse + /// + /// the + /// + /// instance + /// + public static iText.Kernel.Pdf.PdfConformance GetConformance(XMPMeta meta) { + if (meta == null) { + return iText.Kernel.Pdf.PdfConformance.PDF_NONE_CONFORMANCE; + } + XMPProperty conformanceAXmpProperty = null; + XMPProperty partAXmpProperty = null; + PdfAConformance aLevel = null; + try { + conformanceAXmpProperty = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE); + partAXmpProperty = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART); + } + catch (XMPException) { + } + if (partAXmpProperty != null && (conformanceAXmpProperty != null || "4".Equals(partAXmpProperty.GetValue() + ))) { + aLevel = GetAConformance(partAXmpProperty.GetValue(), conformanceAXmpProperty == null ? null : conformanceAXmpProperty + .GetValue()); + } + XMPProperty partUAXmpProperty = null; + PdfUAConformance uaLevel = null; + try { + partUAXmpProperty = meta.GetProperty(XMPConst.NS_PDFUA_ID, XMPConst.PART); + } + catch (XMPException) { + } + if (partUAXmpProperty != null) { + uaLevel = GetUAConformance(partUAXmpProperty.GetValue()); + } + return new iText.Kernel.Pdf.PdfConformance(aLevel, uaLevel); + } + + /// + /// Gets an instance of + /// + /// based on passed part and level. + /// + /// the part of PDF/A conformance + /// the level of PDF/A conformance + /// + /// the + /// + /// instance or + /// + /// if there is no PDF/A conformance for passed parameters + /// + public static PdfAConformance GetAConformance(String part, String level) { + String lowLetter = level == null ? null : level.ToUpperInvariant(); + bool aLevel = "A".Equals(lowLetter); + bool bLevel = "B".Equals(lowLetter); + bool uLevel = "U".Equals(lowLetter); + bool eLevel = "E".Equals(lowLetter); + bool fLevel = "F".Equals(lowLetter); + switch (part) { + case "1": { + if (aLevel) { + return PdfAConformance.PDF_A_1A; + } + if (bLevel) { + return PdfAConformance.PDF_A_1B; + } + break; + } + + case "2": { + if (aLevel) { + return PdfAConformance.PDF_A_2A; + } + if (bLevel) { + return PdfAConformance.PDF_A_2B; + } + if (uLevel) { + return PdfAConformance.PDF_A_2U; + } + break; + } + + case "3": { + if (aLevel) { + return PdfAConformance.PDF_A_3A; + } + if (bLevel) { + return PdfAConformance.PDF_A_3B; + } + if (uLevel) { + return PdfAConformance.PDF_A_3U; + } + break; + } + + case "4": { + if (eLevel) { + return PdfAConformance.PDF_A_4E; + } + if (fLevel) { + return PdfAConformance.PDF_A_4F; + } + return PdfAConformance.PDF_A_4; + } + } + return null; + } + + private static PdfUAConformance GetUAConformance(String part) { + if ("1".Equals(part)) { + return PdfUAConformance.PDF_UA_1; + } + return null; + } + } +} diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs b/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs index 8094d9f8ad..c4b0ae44d8 100644 --- a/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs +++ b/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs @@ -1131,15 +1131,11 @@ public virtual IList CopyPagesTo(int pageFrom, int pageTo, iText.Kernel /// /// Get the - /// + /// /// - /// - /// the - /// - /// will be null if the document does not have a conformance level specified - /// - public virtual IConformanceLevel GetConformanceLevel() { - return null; + /// the document conformance + public virtual PdfConformance GetConformance() { + return reader == null ? PdfConformance.PDF_NONE_CONFORMANCE : reader.GetPdfConformance(); } /// @@ -2315,8 +2311,8 @@ protected internal virtual void UpdateXmpMetadata() { protected internal virtual XMPMeta UpdateDefaultXmpMetadata() { XMPMeta xmpMeta = GetXmpMetadata(true); XmpMetaInfoConverter.AppendDocumentInfoToMetadata(GetDocumentInfo(), xmpMeta); - if (IsTagged() && writer.properties.addUAXmpMetadata && !IsXmpMetaHasProperty(xmpMeta, XMPConst.NS_PDFUA_ID - , XMPConst.PART)) { + if (IsTagged() && writer.properties.addUAXmpMetadata && xmpMeta.GetProperty(XMPConst.NS_PDFUA_ID, XMPConst + .PART) == null) { xmpMeta.SetPropertyInteger(XMPConst.NS_PDFUA_ID, XMPConst.PART, 1, new PropertyOptions(PropertyOptions.SEPARATE_NODE )); } @@ -2666,10 +2662,6 @@ private static void OverrideFullCompressionInWriterProperties(WriterProperties p properties.isFullCompression = readerHasXrefStream; } - private static bool IsXmpMetaHasProperty(XMPMeta xmpMeta, String schemaNS, String propName) { - return xmpMeta.GetProperty(schemaNS, propName) != null; - } - private class DestinationMutationInfo { private readonly PdfDestination originalDestination; diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs b/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs index 02a6d7c010..ea18d8624f 100644 --- a/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs +++ b/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs @@ -98,7 +98,7 @@ public class PdfReader : IDisposable { private XMPMeta xmpMeta; - private PdfAConformanceLevel pdfAConformanceLevel; + private PdfConformance pdfConformance; /// Constructs a new PdfReader. /// source of bytes for the reader @@ -652,22 +652,16 @@ public virtual int GetCryptoMode() { } } - /// Gets the declared PDF/A conformance level of the source document that is being read. + /// Gets the declared PDF conformance of the source document that is being read. /// - /// Gets the declared PDF/A conformance level of the source document that is being read. + /// Gets the declared PDF conformance of the source document that is being read. /// Note that this information is provided via XMP metadata and is not verified by iText. - /// - /// is lazy initialized. + /// Conformance is lazy initialized. /// It will be initialized during the first call of this method. /// - /// - /// conformance level of the source document, or - /// - /// if no PDF/A - /// conformance level information is specified. - /// - public virtual PdfAConformanceLevel GetPdfAConformanceLevel() { - if (pdfAConformanceLevel == null) { + /// conformance of the source document + public virtual PdfConformance GetPdfConformance() { + if (pdfConformance == null) { if (pdfDocument == null || !pdfDocument.GetXref().IsReadingCompleted()) { throw new PdfException(KernelExceptionMessageConstant.DOCUMENT_HAS_NOT_BEEN_READ_YET); } @@ -675,14 +669,12 @@ public virtual PdfAConformanceLevel GetPdfAConformanceLevel() { if (xmpMeta == null && pdfDocument.GetXmpMetadata() != null) { xmpMeta = pdfDocument.GetXmpMetadata(); } - if (xmpMeta != null) { - pdfAConformanceLevel = PdfAConformanceLevel.GetConformanceLevel(xmpMeta); - } + pdfConformance = PdfConformance.GetConformance(xmpMeta); } catch (XMPException) { } } - return pdfAConformanceLevel; + return pdfConformance; } /// Computes user password if standard encryption handler is used with Standard40, Standard128 or AES128 encryption algorithm. diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfUAConformanceLevel.cs b/itext/itext.kernel/itext/kernel/pdf/PdfUAConformance.cs similarity index 53% rename from itext/itext.kernel/itext/kernel/pdf/PdfUAConformanceLevel.cs rename to itext/itext.kernel/itext/kernel/pdf/PdfUAConformance.cs index 61be74685a..d3b4608b29 100644 --- a/itext/itext.kernel/itext/kernel/pdf/PdfUAConformanceLevel.cs +++ b/itext/itext.kernel/itext/kernel/pdf/PdfUAConformance.cs @@ -20,41 +20,37 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ +using System; + namespace iText.Kernel.Pdf { - /// - /// Implementation of - /// - /// interface for PDF/UA conformance level. - /// + /// PDF/UA is a conformance for PDF files that ensures the files are accessible to all users. /// - /// Implementation of - /// - /// interface for PDF/UA conformance level. - /// - /// PDF/UA is a conformance level for PDF files that ensures the files are accessible. - /// It contains an enumeration of all the PDF/UA conformance levels currently supported by iText. + /// PDF/UA is a conformance for PDF files that ensures the files are accessible to all users. + /// It contains an enumeration of all the PDF/UA conformance currently supported by iText. /// - public class PdfUAConformanceLevel : IConformanceLevel { - /// PDF/UA conformance level PDF/UA-1. - public static readonly iText.Kernel.Pdf.PdfUAConformanceLevel PDFUA_1 = new iText.Kernel.Pdf.PdfUAConformanceLevel - (1); + public sealed class PdfUAConformance { + /// PDF/UA-1 conformance + public static readonly iText.Kernel.Pdf.PdfUAConformance PDF_UA_1 = new iText.Kernel.Pdf.PdfUAConformance( + "1"); - private readonly int version; + private readonly String part; +//\cond DO_NOT_DOCUMENT /// /// Creates a new - /// + /// /// instance. /// - /// the version of the PDF/UA conformance level - private PdfUAConformanceLevel(int version) { - this.version = version; + /// the part of the PDF/UA conformance + internal PdfUAConformance(String part) { + this.part = part; } +//\endcond - /// Get the version of the PDF/UA conformance level. - /// the version of the PDF/UA conformance level - public virtual int GetVersion() { - return version; + /// Get the part of the PDF/UA conformance. + /// the part of the PDF/UA conformance + public String GetPart() { + return this.part; } } } diff --git a/itext/itext.layout/itext/layout/Document.cs b/itext/itext.layout/itext/layout/Document.cs index d92f12b437..08f2a675cf 100644 --- a/itext/itext.layout/itext/layout/Document.cs +++ b/itext/itext.layout/itext/layout/Document.cs @@ -293,7 +293,7 @@ public virtual Rectangle GetPageEffectiveArea(PageSize pageSize) { public override T1 GetDefaultProperty(int property) { switch (property) { case Property.FONT: { - if (GetPdfDocument().GetConformanceLevel() != null) { + if (GetPdfDocument().GetConformance().IsPdfAOrUa()) { return (T1)(Object)GetPdfDocument().GetDefaultFont(); } return base.GetDefaultProperty(property); diff --git a/itext/itext.pdfa/itext/pdfa/PdfADocument.cs b/itext/itext.pdfa/itext/pdfa/PdfADocument.cs index bcd8f3989a..e8bc592baa 100644 --- a/itext/itext.pdfa/itext/pdfa/PdfADocument.cs +++ b/itext/itext.pdfa/itext/pdfa/PdfADocument.cs @@ -46,17 +46,17 @@ namespace iText.Pdfa { /// that comply with the PDF/A standard. /// Client code is still responsible for making sure the file is actually PDF/A /// compliant: multiple steps must be undertaken (depending on the - /// + /// /// ) to ensure that the PDF/A standard is followed. /// This class will throw exceptions, mostly /// /// , /// and thus refuse to output a PDF/A file if at any point the document does not /// adhere to the PDF/A guidelines specified by the - /// . + /// . /// public class PdfADocument : PdfDocument { - private static IPdfPageFactory pdfAPageFactory = new PdfAPageFactory(); + private static readonly IPdfPageFactory pdfAPageFactory = new PdfAPageFactory(); protected internal PdfAChecker checker; @@ -64,12 +64,12 @@ public class PdfADocument : PdfDocument { private bool alreadyLoggedThatPageFlushingWasNotPerformed = false; - private bool isPdfADocument = true; + private PdfConformance conformance; /// Constructs a new PdfADocument for writing purposes, i.e. from scratch. /// /// Constructs a new PdfADocument for writing purposes, i.e. from scratch. A - /// PDF/A file has a conformance level, and must have an explicit output + /// PDF/A file has a conformance, and must have an explicit output /// intent. /// /// @@ -77,19 +77,19 @@ public class PdfADocument : PdfDocument { /// /// object to write to /// - /// the generation and strictness level of the PDF/A that must be followed. + /// the generation and strictness level of the PDF/A that must be followed. /// /// a /// /// - public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, PdfOutputIntent outputIntent) - : this(writer, conformanceLevel, outputIntent, new DocumentProperties()) { + public PdfADocument(PdfWriter writer, PdfAConformance aConformance, PdfOutputIntent outputIntent) + : this(writer, aConformance, outputIntent, new DocumentProperties()) { } /// Constructs a new PdfADocument for writing purposes, i.e. from scratch. /// /// Constructs a new PdfADocument for writing purposes, i.e. from scratch. A - /// PDF/A file has a conformance level, and must have an explicit output + /// PDF/A file has a conformance, and must have an explicit output /// intent. /// /// @@ -97,7 +97,7 @@ public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, Pdf /// /// object to write to /// - /// the generation and strictness level of the PDF/A that must be followed. + /// the generation and strictness level of the PDF/A that must be followed. /// /// a /// @@ -106,10 +106,11 @@ public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, Pdf /// a /// /// - public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, PdfOutputIntent outputIntent, - DocumentProperties properties) + public PdfADocument(PdfWriter writer, PdfAConformance aConformance, PdfOutputIntent outputIntent, DocumentProperties + properties) : base(writer, properties) { - SetChecker(conformanceLevel); + this.conformance = new PdfConformance(aConformance); + SetChecker(aConformance); AddOutputIntent(outputIntent); } @@ -119,7 +120,7 @@ public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, Pdf /// . /// public override PdfFont GetDefaultFont() { - if (isPdfADocument) { + if (GetConformance().IsPdfA()) { return null; } return base.GetDefaultFont(); @@ -143,30 +144,15 @@ public PdfADocument(PdfReader reader, PdfWriter writer, StampingProperties prope //\cond DO_NOT_DOCUMENT internal PdfADocument(PdfReader reader, PdfWriter writer, StampingProperties properties, bool tolerant) : base(reader, writer, properties) { - PdfAConformanceLevel conformanceLevel = reader.GetPdfAConformanceLevel(); - if (conformanceLevel == null) { - if (tolerant) { - isPdfADocument = false; - } - else { - throw new PdfAConformanceException(PdfaExceptionMessageConstant.DOCUMENT_TO_READ_FROM_SHALL_BE_A_PDFA_CONFORMANT_FILE_WITH_VALID_XMP_METADATA - ); - } + this.conformance = base.GetConformance(); + if (!GetConformance().IsPdfA() && !tolerant) { + throw new PdfAConformanceException(PdfaExceptionMessageConstant.DOCUMENT_TO_READ_FROM_SHALL_BE_A_PDFA_CONFORMANT_FILE_WITH_VALID_XMP_METADATA + ); } - SetChecker(conformanceLevel); + SetChecker(GetConformance().GetAConformance()); } //\endcond - /// - public override IConformanceLevel GetConformanceLevel() { - if (isPdfADocument) { - return checker.GetConformanceLevel(); - } - else { - return null; - } - } - /// /// /// @@ -177,6 +163,10 @@ public override void AddOutputIntent(PdfOutputIntent outputIntent) { checker.SetPdfAOutputIntentColorSpace(GetCatalog().GetPdfObject()); } + public override PdfConformance GetConformance() { + return conformance; + } + //\cond DO_NOT_DOCUMENT internal virtual void LogThatPdfAPageFlushingWasNotPerformed() { if (!alreadyLoggedThatPageFlushingWasNotPerformed) { @@ -189,7 +179,7 @@ internal virtual void LogThatPdfAPageFlushingWasNotPerformed() { //\endcond protected override void AddCustomMetadataExtensions(XMPMeta xmpMeta) { - if (!isPdfADocument) { + if (!GetConformance().IsPdfA()) { base.AddCustomMetadataExtensions(xmpMeta); return; } @@ -208,19 +198,19 @@ protected override void AddCustomMetadataExtensions(XMPMeta xmpMeta) { } protected override void UpdateXmpMetadata() { - if (!isPdfADocument) { + if (!GetConformance().IsPdfA()) { base.UpdateXmpMetadata(); return; } try { XMPMeta xmpMeta = UpdateDefaultXmpMetadata(); - xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, checker.GetConformanceLevel().GetPart()); - if (checker.GetConformanceLevel().GetConformance() != null) { - xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE, checker.GetConformanceLevel().GetConformance - ()); + PdfAConformance aLevel = checker.GetAConformance(); + xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART, aLevel.GetPart()); + if (aLevel.GetLevel() != null) { + xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.CONFORMANCE, aLevel.GetLevel()); } - if ("4".Equals(checker.GetConformanceLevel().GetPart())) { - xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.REV, PdfAConformanceLevel.PDF_A_4_REVISION); + if ("4".Equals(aLevel.GetPart())) { + xmpMeta.SetProperty(XMPConst.NS_PDFA_ID, XMPConst.REV, PdfConformance.PDF_A_4_REVISION); } AddCustomMetadataExtensions(xmpMeta); SetXmpMetadata(xmpMeta); @@ -237,7 +227,7 @@ public override void CheckIsoConformance(IValidationContext validationContext) { } protected override void FlushObject(PdfObject pdfObject, bool canBeInObjStm) { - if (!isPdfADocument) { + if (!GetConformance().IsPdfA()) { base.FlushObject(pdfObject, canBeInObjStm); return; } @@ -257,21 +247,21 @@ protected override void FlushObject(PdfObject pdfObject, bool canBeInObjStm) { /// /// Sets the checker that defines the requirements of the PDF/A standard - /// depending on conformance level. + /// depending on conformance. /// - /// + /// /// - /// + /// /// - protected internal virtual void SetChecker(PdfAConformanceLevel conformanceLevel) { - if (!isPdfADocument) { + protected internal virtual void SetChecker(PdfAConformance aConformance) { + if (!GetConformance().IsPdfA()) { return; } - SetChecker(GetCorrectCheckerFromConformance(conformanceLevel)); + SetChecker(GetCorrectCheckerFromConformance(aConformance)); } protected internal virtual void SetChecker(PdfAChecker checker) { - if (!isPdfADocument) { + if (!GetConformance().IsPdfA()) { return; } this.checker = checker; @@ -281,7 +271,7 @@ protected internal virtual void SetChecker(PdfAChecker checker) { } private void SetCheckerIfChanged() { - if (!isPdfADocument) { + if (!GetConformance().IsPdfA()) { return; } if (!GetDiContainer().IsRegistered(typeof(ValidationContainer))) { @@ -293,26 +283,26 @@ private void SetCheckerIfChanged() { } } - private static PdfAChecker GetCorrectCheckerFromConformance(PdfAConformanceLevel conformanceLevel) { + private static PdfAChecker GetCorrectCheckerFromConformance(PdfAConformance aConformance) { PdfAChecker checker; - switch (conformanceLevel.GetPart()) { + switch (aConformance.GetPart()) { case "1": { - checker = new PdfA1Checker(conformanceLevel); + checker = new PdfA1Checker(aConformance); break; } case "2": { - checker = new PdfA2Checker(conformanceLevel); + checker = new PdfA2Checker(aConformance); break; } case "3": { - checker = new PdfA3Checker(conformanceLevel); + checker = new PdfA3Checker(aConformance); break; } case "4": { - checker = new PdfA4Checker(conformanceLevel); + checker = new PdfA4Checker(aConformance); break; } @@ -325,8 +315,8 @@ private static PdfAChecker GetCorrectCheckerFromConformance(PdfAConformanceLevel /// Initializes tagStructureContext to track necessary information of document's tag structure. protected override void InitTagStructureContext() { - if (isPdfADocument) { - tagStructureContext = new TagStructureContext(this, GetPdfVersionForPdfA(checker.GetConformanceLevel())); + if (GetConformance().IsPdfA()) { + tagStructureContext = new TagStructureContext(this, GetPdfVersionForPdfA(checker.GetAConformance())); } else { base.InitTagStructureContext(); @@ -334,7 +324,7 @@ protected override void InitTagStructureContext() { } protected override IPdfPageFactory GetPageFactory() { - if (isPdfADocument) { + if (GetConformance().IsPdfA()) { return pdfAPageFactory; } else { @@ -348,7 +338,7 @@ protected override IPdfPageFactory GetPageFactory() { /// /// protected override void FlushInfoDictionary(bool appendMode) { - if (!isPdfADocument || (!"4".Equals(checker.GetConformanceLevel().GetPart()))) { + if (!GetConformance().IsPdfA() || (!"4".Equals(GetConformance().GetAConformance().GetPart()))) { base.FlushInfoDictionary(appendMode); } else { @@ -366,9 +356,9 @@ internal virtual bool IsClosing() { } //\endcond - private static PdfVersion GetPdfVersionForPdfA(PdfAConformanceLevel conformanceLevel) { + private static PdfVersion GetPdfVersionForPdfA(PdfAConformance aConformance) { PdfVersion version; - switch (conformanceLevel.GetPart()) { + switch (aConformance.GetPart()) { case "1": { version = PdfVersion.PDF_1_4; break; diff --git a/itext/itext.pdfa/itext/pdfa/checker/PdfA1Checker.cs b/itext/itext.pdfa/itext/pdfa/checker/PdfA1Checker.cs index dc8036b234..d4f0f4a623 100644 --- a/itext/itext.pdfa/itext/pdfa/checker/PdfA1Checker.cs +++ b/itext/itext.pdfa/itext/pdfa/checker/PdfA1Checker.cs @@ -79,13 +79,13 @@ public class PdfA1Checker : PdfAChecker { private static readonly ILogger logger = ITextLogManager.GetLogger(typeof(PdfAChecker)); - /// Creates a PdfA1Checker with the required conformance level - /// - /// the required conformance level, a or + /// Creates a PdfA1Checker with the required conformance + /// + /// the required conformance, a or /// b /// - public PdfA1Checker(PdfAConformanceLevel conformanceLevel) - : base(conformanceLevel) { + public PdfA1Checker(PdfAConformance aConformance) + : base(aConformance) { } public override void CheckCanvasStack(char stackOperation) { @@ -419,7 +419,7 @@ protected internal override void CheckFormXObject(PdfStream form) { } protected internal override void CheckLogicalStructure(PdfDictionary catalog) { - if (CheckStructure(conformanceLevel)) { + if (CheckStructure(conformance)) { PdfDictionary markInfo = catalog.GetAsDictionary(PdfName.MarkInfo); if (markInfo == null || markInfo.GetAsBoolean(PdfName.Marked) == null || !markInfo.GetAsBoolean(PdfName.Marked ).GetValue()) { @@ -625,7 +625,7 @@ protected internal override void CheckAnnotation(PdfDictionary annotDic) { throw new PdfAConformanceException(PdfaExceptionMessageConstant.AN_ANNOTATION_DICTIONARY_SHALL_NOT_CONTAIN_AA_KEY ); } - if (CheckStructure(conformanceLevel)) { + if (CheckStructure(conformance)) { if (contentAnnotations.Contains(subtype) && !annotDic.ContainsKey(PdfName.Contents)) { logger.LogWarning(MessageFormatUtil.Format(PdfAConformanceLogMessageConstant.ANNOTATION_OF_TYPE_0_SHOULD_HAVE_CONTENTS_KEY , subtype.GetValue())); diff --git a/itext/itext.pdfa/itext/pdfa/checker/PdfA2Checker.cs b/itext/itext.pdfa/itext/pdfa/checker/PdfA2Checker.cs index 4968b44be9..462e4c4b52 100644 --- a/itext/itext.pdfa/itext/pdfa/checker/PdfA2Checker.cs +++ b/itext/itext.pdfa/itext/pdfa/checker/PdfA2Checker.cs @@ -106,13 +106,13 @@ public class PdfA2Checker : PdfA1Checker { private readonly IDictionary separationColorSpaces = new Dictionary( ); - /// Creates a PdfA2Checker with the required conformance level - /// - /// the required conformance level, a or + /// Creates a PdfA2Checker with the required conformance + /// + /// the required conformance, a or /// u or b /// - public PdfA2Checker(PdfAConformanceLevel conformanceLevel) - : base(conformanceLevel) { + public PdfA2Checker(PdfAConformance aConformance) + : base(aConformance) { } public override void CheckInlineImage(PdfStream inlineImage, PdfDictionary currentColorSpaces) { @@ -417,7 +417,7 @@ protected internal override void CheckAnnotation(PdfDictionary annotDic) { } } CheckAnnotationAgainstActions(annotDic); - if (CheckStructure(conformanceLevel)) { + if (CheckStructure(conformance)) { if (contentAnnotations.Contains(subtype) && !annotDic.ContainsKey(PdfName.Contents)) { logger.LogWarning(MessageFormatUtil.Format(PdfAConformanceLogMessageConstant.ANNOTATION_OF_TYPE_0_SHOULD_HAVE_CONTENTS_KEY , subtype.GetValue())); diff --git a/itext/itext.pdfa/itext/pdfa/checker/PdfA3Checker.cs b/itext/itext.pdfa/itext/pdfa/checker/PdfA3Checker.cs index a5e0fcd893..ace983d0e6 100644 --- a/itext/itext.pdfa/itext/pdfa/checker/PdfA3Checker.cs +++ b/itext/itext.pdfa/itext/pdfa/checker/PdfA3Checker.cs @@ -45,13 +45,13 @@ public class PdfA3Checker : PdfA2Checker { (new HashSet(JavaUtil.ArraysAsList(PdfName.Source, PdfName.Data, PdfName.Alternative, PdfName .Supplement, PdfName.Unspecified))); - /// Creates a PdfA3Checker with the required conformance level - /// - /// the required conformance level, a or + /// Creates a PdfA3Checker with the required conformance + /// + /// the required conformance, a or /// u or b /// - public PdfA3Checker(PdfAConformanceLevel conformanceLevel) - : base(conformanceLevel) { + public PdfA3Checker(PdfAConformance aConformance) + : base(aConformance) { } protected internal override void CheckFileSpec(PdfDictionary fileSpec) { diff --git a/itext/itext.pdfa/itext/pdfa/checker/PdfA4Checker.cs b/itext/itext.pdfa/itext/pdfa/checker/PdfA4Checker.cs index cb0e57bffb..36aaef6922 100644 --- a/itext/itext.pdfa/itext/pdfa/checker/PdfA4Checker.cs +++ b/itext/itext.pdfa/itext/pdfa/checker/PdfA4Checker.cs @@ -91,10 +91,10 @@ public class PdfA4Checker : PdfA3Checker { private IDictionary> iccBasedCmykObjects = new Dictionary>(); - /// Creates a PdfA4Checker with the required conformance level - /// the required conformance level - public PdfA4Checker(PdfAConformanceLevel conformanceLevel) - : base(conformanceLevel) { + /// Creates a PdfA4Checker with the required conformance + /// the required conformance + public PdfA4Checker(PdfAConformance aConformance) + : base(aConformance) { } /// @@ -169,7 +169,7 @@ protected internal override void CheckCatalog(PdfCatalog catalog) { ); } } - if ("F".Equals(conformanceLevel.GetConformance())) { + if ("F".Equals(conformance.GetLevel())) { if (!catalog.NameTreeContainsKey(PdfName.EmbeddedFiles)) { throw new PdfAConformanceException(PdfaExceptionMessageConstant.NAME_DICTIONARY_SHALL_CONTAIN_EMBEDDED_FILES_KEY ); @@ -340,11 +340,11 @@ protected internal override void CheckAnnotation(PdfDictionary annotDic) { /// protected internal override ICollection GetForbiddenAnnotations() { - if ("E".Equals(conformanceLevel.GetConformance())) { + if ("E".Equals(conformance.GetLevel())) { return forbiddenAnnotations4E; } else { - if ("F".Equals(conformanceLevel.GetConformance())) { + if ("F".Equals(conformance.GetLevel())) { return forbiddenAnnotations4F; } } @@ -425,7 +425,7 @@ private static bool HasAAIllegalEntries(PdfDictionary aa) { /// protected internal override ICollection GetForbiddenActions() { - if ("E".Equals(conformanceLevel.GetConformance())) { + if ("E".Equals(conformance.GetLevel())) { return forbiddenActionsE; } return base.GetForbiddenActions(); @@ -529,14 +529,14 @@ private void CheckFileProvenanceSpec(XMPMeta meta) { private void CheckVersionIdentification(XMPMeta meta) { try { XMPProperty prop = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.PART); - if (prop == null || !GetConformanceLevel().GetPart().Equals(prop.GetValue())) { + if (prop == null || !GetAConformance().GetPart().Equals(prop.GetValue())) { throw new PdfAConformanceException(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_PART - , GetConformanceLevel().GetPart())); + , GetAConformance().GetPart())); } } catch (XMPException) { throw new PdfAConformanceException(MessageFormatUtil.Format(PdfaExceptionMessageConstant.XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_PART - , GetConformanceLevel().GetPart())); + , GetAConformance().GetPart())); } try { XMPProperty prop = meta.GetProperty(XMPConst.NS_PDFA_ID, XMPConst.REV); diff --git a/itext/itext.pdfa/itext/pdfa/checker/PdfAChecker.cs b/itext/itext.pdfa/itext/pdfa/checker/PdfAChecker.cs index 828425c9a8..c2af6e997a 100644 --- a/itext/itext.pdfa/itext/pdfa/checker/PdfAChecker.cs +++ b/itext/itext.pdfa/itext/pdfa/checker/PdfAChecker.cs @@ -92,7 +92,7 @@ public abstract class PdfAChecker : IValidationChecker { /// public const int maxGsStackDepth = 28; - protected internal PdfAConformanceLevel conformanceLevel; + protected internal PdfAConformance conformance; protected internal PdfStream pdfAOutputIntentDestProfile; @@ -122,10 +122,10 @@ public abstract class PdfAChecker : IValidationChecker { private bool fullCheckMode = false; - /// Creates a PdfAChecker with the required conformance level. - /// the required conformance level - protected internal PdfAChecker(PdfAConformanceLevel conformanceLevel) { - this.conformanceLevel = conformanceLevel; + /// Creates a PdfAChecker with the required conformance. + /// the required conformance + protected internal PdfAChecker(PdfAConformance aConformance) { + this.conformance = aConformance; } /// @@ -321,12 +321,12 @@ public virtual void CheckPdfObject(PdfObject obj) { /// /// Gets the - /// + /// /// for this file. /// - /// the defined conformance level for this document. - public virtual PdfAConformanceLevel GetConformanceLevel() { - return conformanceLevel; + /// the defined conformance for this document. + public virtual PdfAConformance GetAConformance() { + return conformance; } /// In full check mode all objects will be tested for ISO conformance. @@ -866,16 +866,16 @@ protected internal static bool CheckFlag(int flags, int flag) { return (flags & flag) != 0; } - /// Checks conformance level of PDF/A standard. - /// + /// Checks conformance of PDF/A standard. + /// /// the - /// + /// /// to be checked /// - /// true if the specified conformanceLevel is a for PDF/A-1, PDF/A-2 or PDF/A-3 - protected internal static bool CheckStructure(PdfAConformanceLevel conformanceLevel) { - return conformanceLevel == PdfAConformanceLevel.PDF_A_1A || conformanceLevel == PdfAConformanceLevel.PDF_A_2A - || conformanceLevel == PdfAConformanceLevel.PDF_A_3A; + /// true if the specified aConformance is a for PDF/A-1, PDF/A-2 or PDF/A-3 + protected internal static bool CheckStructure(PdfAConformance aConformance) { + return aConformance == PdfAConformance.PDF_A_1A || aConformance == PdfAConformance.PDF_A_2A || aConformance + == PdfAConformance.PDF_A_3A; } /// Checks whether the specified dictionary has a transparency group. diff --git a/itext/itext.pdfa/itext/pdfa/exceptions/PdfaExceptionMessageConstant.cs b/itext/itext.pdfa/itext/pdfa/exceptions/PdfaExceptionMessageConstant.cs index 5932693b9c..67febcaa05 100644 --- a/itext/itext.pdfa/itext/pdfa/exceptions/PdfaExceptionMessageConstant.cs +++ b/itext/itext.pdfa/itext/pdfa/exceptions/PdfaExceptionMessageConstant.cs @@ -309,7 +309,7 @@ public const String ONLY_STANDARD_BLEND_MODES_SHALL_BE_USED_FOR_THE_VALUE_OF_THE + " contain version identifier pdfaid:rev with four digit integer value"; public const String XMP_METADATA_HEADER_SHALL_CONTAIN_VERSION_IDENTIFIER_CONFORMANCE = "XMP metadata header shall" - + " contain version identifier pdfaid:rev F or E or absent if no conformance level is specified"; + + " contain version identifier pdfaid:rev F or E or absent if no conformance is specified"; public const String XMP_METADATA_HISTORY_ENTRY_SHALL_CONTAIN_KEY = "XMP metadata history entry shall" + " contain key {0}"; diff --git a/itext/itext.pdfua/itext/pdfua/PdfUAConfig.cs b/itext/itext.pdfua/itext/pdfua/PdfUAConfig.cs index 6769a3982a..d3ed959802 100644 --- a/itext/itext.pdfua/itext/pdfua/PdfUAConfig.cs +++ b/itext/itext.pdfua/itext/pdfua/PdfUAConfig.cs @@ -26,29 +26,29 @@ You should have received a copy of the GNU Affero General Public License namespace iText.Pdfua { /// Class that holds the configuration for the PDF/UA document. public class PdfUAConfig { - private readonly PdfUAConformanceLevel conformanceLevel; + private readonly PdfUAConformance conformance; private readonly String title; private readonly String language; /// Creates a new PdfUAConfig instance. - /// The conformance level of the PDF/UA document. - /// The title of the PDF/UA document. - /// The language of the PDF/UA document. - public PdfUAConfig(PdfUAConformanceLevel conformanceLevel, String title, String language) { - this.conformanceLevel = conformanceLevel; + /// the conformance of the PDF/UA document + /// the title of the PDF/UA document + /// the language of the PDF/UA document + public PdfUAConfig(PdfUAConformance conformance, String title, String language) { + this.conformance = conformance; this.title = title; this.language = language; } - /// Gets the conformance level. + /// Gets the UA conformance. /// /// The - /// . + /// . /// - public virtual PdfUAConformanceLevel GetConformanceLevel() { - return conformanceLevel; + public virtual PdfUAConformance GetConformance() { + return conformance; } /// Gets the title. diff --git a/itext/itext.pdfua/itext/pdfua/PdfUADocument.cs b/itext/itext.pdfua/itext/pdfua/PdfUADocument.cs index 35bec2444c..fa406d8991 100644 --- a/itext/itext.pdfua/itext/pdfua/PdfUADocument.cs +++ b/itext/itext.pdfua/itext/pdfua/PdfUADocument.cs @@ -25,7 +25,7 @@ You should have received a copy of the GNU Affero General Public License using iText.Kernel.Pdf; using iText.Kernel.Validation; using iText.Pdfua.Checkers; -using iText.Pdfua.Exceptions; +using iText.Pdfua.Logs; namespace iText.Pdfua { /// Creates a Pdf/UA document. @@ -39,10 +39,10 @@ public class PdfUADocument : PdfDocument { private static readonly ILogger LOGGER = ITextLogManager.GetLogger(typeof(iText.Pdfua.PdfUADocument)); - private PdfUAConfig config; - private bool warnedOnPageFlush = false; + private PdfConformance conformance; + /// Creates a PdfUADocument instance. /// The writer to write the PDF document. /// The configuration for the PDF/UA document. @@ -56,6 +56,7 @@ public PdfUADocument(PdfWriter writer, PdfUAConfig config) /// The configuration for the PDF/UA document. public PdfUADocument(PdfWriter writer, DocumentProperties properties, PdfUAConfig config) : base(ConfigureWriterProperties(writer), properties) { + conformance = new PdfConformance(config.GetConformance()); SetupUAConfiguration(config); } @@ -64,8 +65,7 @@ public PdfUADocument(PdfWriter writer, DocumentProperties properties, PdfUAConfi /// The writer to write the PDF document. /// The configuration for the PDF/UA document. public PdfUADocument(PdfReader reader, PdfWriter writer, PdfUAConfig config) - : base(reader, ConfigureWriterProperties(writer)) { - SetupUAConfiguration(config); + : this(reader, writer, new StampingProperties(), config) { } /// Creates a PdfUADocument instance. @@ -76,12 +76,11 @@ public PdfUADocument(PdfReader reader, PdfWriter writer, PdfUAConfig config) public PdfUADocument(PdfReader reader, PdfWriter writer, StampingProperties properties, PdfUAConfig config ) : base(reader, ConfigureWriterProperties(writer), properties) { + conformance = base.GetConformance(); SetupUAConfiguration(config); - } - - /// {inheritDoc} - public override IConformanceLevel GetConformanceLevel() { - return config.GetConformanceLevel(); + if (!GetConformance().IsPdfUA()) { + LOGGER.LogWarning(PdfUALogMessageConstants.PDF_TO_PDF_UA_CONVERSION_IS_NOT_SUPPORTED); + } } /// The PageFactory for the PDF/UA document. @@ -89,6 +88,10 @@ protected override IPdfPageFactory GetPageFactory() { return pdfPageFactory; } + public override PdfConformance GetConformance() { + return conformance; + } + //\cond DO_NOT_DOCUMENT /// Returns if the document is in the closing state. /// true if the document is closing, false otherwise. @@ -118,7 +121,6 @@ public virtual void DisablePageFlushingWarning() { private void SetupUAConfiguration(PdfUAConfig config) { //basic configuration - this.config = config; this.SetTagged(); this.GetCatalog().SetViewerPreferences(new PdfViewerPreferences().SetDisplayDocTitle(true)); this.GetCatalog().SetLang(new PdfString(config.GetLanguage())); diff --git a/itext/itext.pdfua/itext/pdfua/exceptions/PdfUALogMessageConstants.cs b/itext/itext.pdfua/itext/pdfua/logs/PdfUALogMessageConstants.cs similarity index 90% rename from itext/itext.pdfua/itext/pdfua/exceptions/PdfUALogMessageConstants.cs rename to itext/itext.pdfua/itext/pdfua/logs/PdfUALogMessageConstants.cs index f2fa5476b0..017d5335de 100644 --- a/itext/itext.pdfua/itext/pdfua/exceptions/PdfUALogMessageConstants.cs +++ b/itext/itext.pdfua/itext/pdfua/logs/PdfUALogMessageConstants.cs @@ -22,12 +22,14 @@ You should have received a copy of the GNU Affero General Public License */ using System; -namespace iText.Pdfua.Exceptions { +namespace iText.Pdfua.Logs { /// Class containing the log message constants. public sealed class PdfUALogMessageConstants { public const String PAGE_FLUSHING_DISABLED = "Page flushing is disabled in PDF/UA mode to allow UA checks " + "to be applied. Page will only be flushed on closing."; + public const String PDF_TO_PDF_UA_CONVERSION_IS_NOT_SUPPORTED = "PDF to PDF/UA conversion is not supported."; + private PdfUALogMessageConstants() { } // empty constructor diff --git a/port-hash b/port-hash index d7dad500b9..48629a1cb7 100644 --- a/port-hash +++ b/port-hash @@ -1 +1 @@ -239e843396b57ed6c556d016814dd0d65eaf9019 +2204b357b7acee16bdabb19b2bea98320abfdf89