Browse Source

FOP-2950: Display font error at top level exception

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1879330 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-2_6
Simon Steiner 3 years ago
parent
commit
83f9092f85

+ 2
- 2
fop-core/src/main/java/org/apache/fop/fonts/LazyFont.java View File

@@ -123,10 +123,10 @@ public class LazyFont extends Typeface implements FontDescriptor, Substitutable,
realFontDescriptor = (FontDescriptor) realFont;
}
} catch (RuntimeException e) {
String error = "Failed to read font file " + fontUris.getEmbed();
String error = "Failed to read font file " + fontUris.getEmbed() + " " + e.getMessage();
throw new RuntimeException(error, e);
} catch (Exception e) {
String error = "Failed to read font file " + fontUris.getEmbed();
String error = "Failed to read font file " + fontUris.getEmbed() + " " + e.getMessage();
log.error(error, e);
if (fail) {
throw new RuntimeException(error, e);

+ 6
- 2
fop-core/src/test/java/org/apache/fop/fonts/LazyFontTestCase.java View File

@@ -24,17 +24,21 @@ import java.net.URISyntaxException;
import org.junit.Assert;
import org.junit.Test;

import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;

public class LazyFontTestCase {
@Test
public void testFontError() throws URISyntaxException {
FontUris fontUris = new FontUris(new URI("test"), null);
LazyFont lazyFont = new LazyFont(new EmbedFontInfo(fontUris, true, true, null, null), null, true);
InternalResourceResolver rr = ResourceResolverFactory.createDefaultInternalResourceResolver(new URI("."));
LazyFont lazyFont = new LazyFont(new EmbedFontInfo(fontUris, true, true, null, null), rr, true);
String ex = null;
try {
lazyFont.getAscender();
} catch (RuntimeException e) {
ex = e.getMessage();
}
Assert.assertEquals(ex, "Failed to read font file test");
Assert.assertEquals(ex, "Failed to read font file test URI is not absolute");
}
}

Loading…
Cancel
Save