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

@@ -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();
      }

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");
     }

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