From 6087e3d7085791007f1cd997f5a114348442351d Mon Sep 17 00:00:00 2001 From: Mehdi Houshmand Date: Thu, 5 Jul 2012 09:22:26 +0000 Subject: [PATCH] Command line parameters override fop conf settings when set (they won't override when not set) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1357517 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/cli/CommandLineOptions.java | 6 ++++++ .../java/org/apache/fop/afp/AFPEventProcessingTestCase.java | 5 +++-- test/java/org/apache/fop/apps/FopConfParserTestCase.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/fop/cli/CommandLineOptions.java b/src/java/org/apache/fop/cli/CommandLineOptions.java index 5a770c3ba..ea5a20d27 100644 --- a/src/java/org/apache/fop/cli/CommandLineOptions.java +++ b/src/java/org/apache/fop/cli/CommandLineOptions.java @@ -1040,6 +1040,12 @@ public class CommandLineOptions { } catch (SAXException e) { throw new FOPException(e); } + if (!strictValidation) { + fopFactoryBuilder.setStrictFOValidation(strictValidation); + } + if (useComplexScriptFeatures) { + fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures); + } } factory = fopFactoryBuilder.build(); } diff --git a/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java b/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java index 521deacea..d1b47846b 100644 --- a/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java +++ b/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.apache.xmlgraphics.util.MimeConstants; +import org.apache.fop.apps.FOPException; import org.apache.fop.events.EventProcessingTestCase; @@ -49,12 +50,12 @@ public class AFPEventProcessingTestCase { testInvalidConfigEvent("afp-font-missing.xconf", ".fontConfigMissing"); } - @Test + @Test(expected = FOPException.class) public void testInvalidCharactersetName() throws Exception { testInvalidConfigEvent("afp-invalid-characterset.xconf", ".characterSetNameInvalid"); } - @Test + @Test(expected = FOPException.class) public void testinvalidConfig() throws Exception { testInvalidConfigEvent("afp-invalid-config.xconf", ".invalidConfiguration"); } diff --git a/test/java/org/apache/fop/apps/FopConfParserTestCase.java b/test/java/org/apache/fop/apps/FopConfParserTestCase.java index 2fe939f76..775bca30a 100644 --- a/test/java/org/apache/fop/apps/FopConfParserTestCase.java +++ b/test/java/org/apache/fop/apps/FopConfParserTestCase.java @@ -77,7 +77,7 @@ public class FopConfParserTestCase { @Test public void testStrictUserConfigValidation() { builder.setStrictValidation(false); - assertFalse(buildFactory().validateUserConfigStrictly()); + assertFalse(buildFactory().validateStrictly()); } @Test -- 2.39.5