Removed FopFactory.getRendererConfig from public API

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1357639 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/FopFactory.java b/src/java/org/apache/fop/apps/FopFactory.java
index 4508ea7fac930e908f23edded4585ecffe0a2265..6796385e4522564db3c8e1d5516c8d641ae1ac2d 100644 (file)
--- a/src/java/org/apache/fop/apps/FopFactory.java
+++ b/src/java/org/apache/fop/apps/FopFactory.java
@@ -295,7 +295,7 @@ public final class FopFactory implements ImageContext {
      * @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) {

diff --git a/test/java/org/apache/fop/apps/FopFactoryTestCase.java b/test/java/org/apache/fop/apps/FopFactoryTestCase.java
new file mode 100644 (file)
index 0000000..8ac21c9
--- /dev/null
+++ b/test/java/org/apache/fop/apps/FopFactoryTestCase.java
@@ -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());
+        }
+    }
+}

diff --git a/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java b/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java
deleted file mode 100644 (file)
index 430de31..0000000
--- a/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.config;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import org.apache.fop.apps.FopConfBuilder;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.PDFRendererConfBuilder;
-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 SingleFopConfParseTestCase extends BaseConstructiveUserConfigTest {
-
-    public SingleFopConfParseTestCase() 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());
-        }
-    }
-}