diff options
| author | Simon Steiner <ssteiner@apache.org> | 2022-09-23 10:15:44 +0000 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2022-09-23 10:15:44 +0000 |
| commit | 06812639c573b6973553d188f78e1ac57ccfa864 (patch) | |
| tree | 3c8bb60519548d2b922ab51dd9d155a32380e55e /fop-core | |
| parent | 3f35111f4c780b42f1e8d3ec78228d3528cdb7f0 (diff) | |
| download | xmlgraphics-fop-06812639c573b6973553d188f78e1ac57ccfa864.tar.gz xmlgraphics-fop-06812639c573b6973553d188f78e1ac57ccfa864.zip | |
Fix tests on Java 19
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1904229 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop-core')
| -rw-r--r-- | fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java | 4 | ||||
| -rw-r--r-- | fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java index 20d42e395..e80a37725 100644 --- a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java @@ -20,6 +20,7 @@ package org.apache.fop.render.pdf; import java.awt.Color; +import java.awt.color.ColorSpace; import java.awt.color.ICC_Profile; import java.awt.image.BufferedImage; import java.awt.image.IndexColorModel; @@ -181,8 +182,7 @@ public class ImageRenderedAdapterTestCase { // ICC Color info PDFFactory factory = mock(PDFFactory.class); PDFICCStream iccStream = mock(PDFICCStream.class); - ICC_Profile iccProfile = mock(ICC_Profile.class); - when(iccProfile.getNumComponents()).thenReturn(4); + ICC_Profile iccProfile = ICC_Profile.getInstance(ColorSpace.CS_sRGB); when(iccStream.getICCProfile()).thenReturn(iccProfile); when(factory.makePDFICCStream()).thenReturn(iccStream); PDFICCBasedColorSpace iccbcs = new PDFICCBasedColorSpace(null, iccStream); diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java index eb0bc382a..e98e3066d 100644 --- a/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java @@ -168,7 +168,10 @@ public class BasicGlyphVectorTestCase extends FOPGVTGlyphVectorTest { for (int i = 0; i < 3; i++) { glyphVector.setGlyphTransform(i, new AffineTransform(0.7, 0.7, -0.7, 0.7, 0, 0)); } - assertEquals(new Rectangle2D.Float(-2.8f, -5.6f, 37.8f, 16.8f), glyphVector.getLogicalBounds()); + Rectangle2D bounds = glyphVector.getLogicalBounds(); + assertEquals(new Rectangle2D.Float(-2.8f, -5.6f, 37.8f, 16.8f), + new Rectangle2D.Float((float) bounds.getX(), (float) bounds.getY(), + (float) bounds.getWidth(), (float) bounds.getHeight())); } @Test |