From 4e970b8a7dda134f2594f9d7f258af4a90ff7a64 Mon Sep 17 00:00:00 2001
From: Maximilian Berger <maxberger@apache.org>
Date: Thu, 24 Sep 2009 10:09:55 +0000
Subject: [PATCH] Added Testcase from Bug #47872 (thanks to alex kiel) and
 fixed it in FontLoader

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@818424 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/fonts/FontLoader.java |  4 +-
 .../org/apache/fop/StandardTestSuite.java     |  2 +
 .../apache/fop/fonts/DejaVuLGCSerifTest.java  | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java

diff --git a/src/java/org/apache/fop/fonts/FontLoader.java b/src/java/org/apache/fop/fonts/FontLoader.java
index aaca5b3fd..93d4ae03f 100644
--- a/src/java/org/apache/fop/fonts/FontLoader.java
+++ b/src/java/org/apache/fop/fonts/FontLoader.java
@@ -87,8 +87,8 @@ public abstract class FontLoader {
      */
     public static CustomFont loadFont(File fontFile, String subFontName,
             boolean embedded, EncodingMode encodingMode, FontResolver resolver) throws IOException {
-        return loadFont(fontFile.getAbsolutePath(), subFontName,
-                embedded, encodingMode, true, resolver);
+        return loadFont(fontFile.toURI().toURL(), subFontName,
+                embedded, encodingMode, resolver);
     }
 
     /**
diff --git a/test/java/org/apache/fop/StandardTestSuite.java b/test/java/org/apache/fop/StandardTestSuite.java
index b8bb541cd..250ddaad6 100644
--- a/test/java/org/apache/fop/StandardTestSuite.java
+++ b/test/java/org/apache/fop/StandardTestSuite.java
@@ -22,6 +22,7 @@ package org.apache.fop;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.fop.fonts.DejaVuLGCSerifTest;
 import org.apache.fop.fonts.TrueTypeAnsiTestCase;
 import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
 import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
@@ -54,6 +55,7 @@ public class StandardTestSuite {
         suite.addTest(new TestSuite(PDFCMapTestCase.class));
         suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
         suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
+        suite.addTest(new TestSuite(DejaVuLGCSerifTest.class));
         suite.addTest(RichTextFormatTestSuite.suite());
         suite.addTest(new TestSuite(ImageLoaderTestCase.class));
         suite.addTest(new TestSuite(ImagePreloaderTestCase.class));
diff --git a/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java b/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
new file mode 100644
index 000000000..181fff448
--- /dev/null
+++ b/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.fonts;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ */
+public class DejaVuLGCSerifTest extends TestCase {
+
+    private FontResolver fontResolver = FontManager.createMinimalFontResolver();
+    private CustomFont font;
+
+    /**
+     * sets up the testcase by loading the DejaVu Font.
+     * 
+     * @throws Exception
+     *             if the test fails.
+     */
+    public void setUp() throws Exception {
+        File file = new File("test/resources/fonts/DejaVuLGCSerif.ttf");
+        font = FontLoader.loadFont(file, "", true, EncodingMode.AUTO,
+                fontResolver);
+    }
+
+    /**
+     * Simple test to see if font name was detected correctly.
+     */
+    public void testFontName() {
+        assertEquals("DejaVu", font.getFontName());
+    }
+}
-- 
2.39.5