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

2 files changed, 4 insertions, 3 deletions

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