FOP-3087 Add fonts element after auto-detect element is added to it

Author: Joao Goncalves

fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java

@@ -160,9 +160,9 @@ protected Configuration getEffectiveConfiguration() {
             if (autoFonts) {
                 DefaultConfiguration c = new DefaultConfiguration("cfg");
                 DefaultConfiguration fonts = new DefaultConfiguration("fonts");
-                c.addChild(fonts);
                 DefaultConfiguration autodetect = new DefaultConfiguration("auto-detect");
                 fonts.addChild(autodetect);
+                c.addChild(fonts);
                 effCfg = c;
             }
         }

fop-core/src/test/java/org/apache/fop/AbstractBasicTranscoderTest.java renamed to fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import java.io.File;
 import java.io.InputStream;

fop-core/src/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java renamed to fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java

@@ -17,11 +17,15 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 import org.apache.batik.transcoder.Transcoder;
 
-import org.apache.fop.svg.PDFTranscoder;
+import org.apache.fop.configuration.Configuration;
 
 /**
  * Basic runtime test for the PDF transcoder. It is used to verify that
@@ -34,4 +38,18 @@ protected Transcoder createTranscoder() {
         return new PDFTranscoder();
     }
 
+    @Test
+    public void testFontAutoDetect() {
+        //Create transcoder
+        PDFTranscoder transcoder = (PDFTranscoder) createTranscoder();
+
+        Configuration effectiveConfiguration = transcoder.getEffectiveConfiguration();
+        Configuration autoDetectConf = effectiveConfiguration.getChild("fonts").getChild("auto-detect");
+
+        assertEquals("The auto-detect conf must be added to it's parent (fonts) "
+                        + "before the parent (fonts) is added to cfg",
+                "DefaultConfiguration",
+                autoDetectConf.getClass().getSimpleName());
+    }
+
 }

fop-core/src/test/java/org/apache/fop/BasicPSTranscoderTestCase.java renamed to fop-core/src/test/java/org/apache/fop/svg/BasicPSTranscoderTestCase.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import org.apache.batik.transcoder.Transcoder;
 

fop-core/src/test/java/org/apache/fop/BasicTranscoderTestSuite.java renamed to fop-core/src/test/java/org/apache/fop/svg/BasicTranscoderTestSuite.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

fop/build.xml

@@ -696,7 +696,8 @@ list of possible build targets.
         <include name="fop-transcoder.jar"/>
       </fileset>
     </path>
-    <junit-run classpath="transcoder-classpath" title="basic functionality for fop-transcoder.jar" testsuite="org.apache.fop.BasicTranscoderTestSuite" outfile="TEST-transcoder"/>
+      <junit-run classpath="transcoder-classpath" title="basic functionality for fop-transcoder.jar"
+                 testsuite="org.apache.fop.svg.BasicTranscoderTestSuite" outfile="TEST-transcoder"/>
     <echo message="Running basic functionality tests for fop-transcoder-allinone.jar"/>
     <!-- These are the same tests as in the block above but testing the "allinone" JAR
          instead. Please don't add any additional paths other than the test classes, the
@@ -716,7 +717,7 @@ list of possible build targets.
         <include name="batik*.jar"/>
       </fileset>
     </path>
-    <junit-run classpath="transcoder-all-classpath" title="basic functionality for fop-transcoder-allinone.jar" testsuite="org.apache.fop.BasicTranscoderTestSuite" outfile="TEST-transcoder-allinone"/>
+    <junit-run classpath="transcoder-all-classpath" title="basic functionality for fop-transcoder-allinone.jar" testsuite="org.apache.fop.svg.BasicTranscoderTestSuite" outfile="TEST-transcoder-allinone"/>
   </target>
   <target name="hyphenation-present" depends="junit-compile" if="junit.present">
     <condition property="hyphenation.present">