FOP-2424: Allow for type1 afm/pfm files to be in a different path than the pfb file

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

2 files changed, 7 insertions, 5 deletions

diff --git a/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java b/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
index 4c89d00da..c4b471ee5 100644
--- a/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
+++ b/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
@@ -47,7 +47,8 @@ public class DejaVuLGCSerifTestCase {
     @Before
     public void setUp() throws Exception {
         File file = new File("test/resources/fonts/ttf/DejaVuLGCSerif.ttf");
-        font = FontLoader.loadFont(file.toURI(), "", true, EmbeddingMode.AUTO, EncodingMode.AUTO,
+        FontUris fontUris = new FontUris(file.toURI(), null);
+        font = FontLoader.loadFont(fontUris, "", true, EmbeddingMode.AUTO, EncodingMode.AUTO,
                 false, false, resolver);
     }
 
diff --git a/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java b/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
index c8099f860..e4179f1f6 100644
--- a/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
+++ b/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
@@ -52,8 +52,8 @@ public class EmbedFontInfoTestCase {
     public void setUp() {
         List<FontTriplet> triplets = new ArrayList<FontTriplet>();
         triplets.add(triplet);
-        sut = new EmbedFontInfo(metricsURI, kerning, useAdvanced, triplets, embedURI, subFontName,
-                encMode, embedMode);
+        FontUris fontUris = new FontUris(embedURI, metricsURI);
+        sut = new EmbedFontInfo(fontUris, kerning, useAdvanced, triplets, subFontName, encMode, embedMode);
     }
 
     @Test
@@ -82,8 +82,9 @@ public class EmbedFontInfoTestCase {
 
     @Test
     public void testQuirkyBoundaryCasesIsEmbedded() {
-        sut = new EmbedFontInfo(metricsURI, kerning, useAdvanced, sut.getFontTriplets(), null,
-                subFontName, encMode, embedMode);
+        FontUris fontUris = new FontUris(null, metricsURI);
+        sut = new EmbedFontInfo(fontUris, kerning, useAdvanced, sut.getFontTriplets(), subFontName, encMode,
+                embedMode);
         sut.setEmbedded(true);
         assertFalse(sut.isEmbedded());