svn commit: r1357639 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/apps/FopFactory.java test/java/org/apache/fop/apps/FopFactoryTestCase.java test/java/org/apache/fop/config/SingleFopConfParseTestCase.java

[ph...@apache.org]

Author: phancock
Date: Thu Jul  5 14:41:54 2012
New Revision: 1357639

URL: http://svn.apache.org/viewvc?rev=1357639&view=rev
Log:
Removed FopFactory.getRendererConfig from public API

Added:
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java
Removed:
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java
Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=1357639&r1=1357638&r2=1357639&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Thu Jul  5 14:41:54 2012
@@ -295,7 +295,7 @@ public final class FopFactory implements
      * @return the config object
      * @throws FOPException when an error occurs while creating the configuration object
      */
-    public RendererConfig getRendererConfig(FOUserAgent userAgent, Configuration cfg,
+    RendererConfig getRendererConfig(FOUserAgent userAgent, Configuration cfg,
             RendererConfigParser configCreator) throws FOPException {
         RendererConfig config = rendererConfig.get(configCreator.getMimeType());
         if (config == null) {

Added: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java?rev=1357639&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java (added)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java Thu Jul  5 14:41:54 2012
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
+import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.config.BaseConstructiveUserConfigTest;
+import org.apache.fop.render.RendererConfig.RendererConfigParser;
+import org.apache.fop.render.pdf.PDFRendererConfig;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class FopFactoryTestCase extends BaseConstructiveUserConfigTest {
+
+    public FopFactoryTestCase() throws SAXException, IOException {
+        super(new FopConfBuilder().setStrictValidation(true)
+                .startRendererConfig(PDFRendererConfBuilder.class)
+                .startFontsConfig()
+                    .startFont(null, "test/resources/fonts/ttf/glb12.ttf.xml")
+                        .addTriplet("Gladiator", "normal", "normal")
+                    .endFont()
+                .endFontConfig()
+            .endRendererConfig().build());
+    }
+
+    @Test
+    @Override
+    public void testUserConfig() throws Exception {
+        RendererConfigParser mock = mock(RendererConfigParser.class);
+        when(mock.getMimeType()).thenReturn(MimeConstants.MIME_PDF);
+        try {
+            convertFO();
+            PDFRendererConfig config = (PDFRendererConfig) fopFactory.getRendererConfig(null, null,
+                    mock);
+            convertFO();
+            assertEquals(config, fopFactory.getRendererConfig(null, null, mock));
+        } catch (Exception e) {
+            // this should *not* happen!
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org