Browse Source

Fix tests on Java 19

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1904229 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-2_8
Simon Steiner 1 year ago
parent
commit
06812639c5

+ 2
- 2
fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java View File

@@ -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);

+ 4
- 1
fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java View File

@@ -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

+ 2
- 2
fop/build.xml View File

@@ -159,8 +159,8 @@ list of possible build targets.
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
<property name="javac.deprecation" value="on"/>
<property name="javac.source" value="1.7"/>
<property name="javac.target" value="1.7"/>
<property name="javac.source" value="1.8"/>
<property name="javac.target" value="1.8"/>
<property name="javac.fork" value="no"/>
<property name="junit.fork" value="yes"/>
<property name="junit.haltonfailure" value="off"/>

+ 2
- 2
pom.xml View File

@@ -13,7 +13,7 @@
<properties>
<ant.version>1.9.15</ant.version>
<antrun.plugin.version>1.8</antrun.plugin.version>
<batik.version>1.14.0-SNAPSHOT</batik.version>
<batik.version>1.15.0-SNAPSHOT</batik.version>
<build.helper.plugin.version>1.9.1</build.helper.plugin.version>
<checkstyle.plugin.version>2.14</checkstyle.plugin.version>
<commons.io.version>2.11.0</commons.io.version>
@@ -22,7 +22,7 @@
<exec.plugin.version>1.4.0</exec.plugin.version>
<findbugs.plugin.version>3.0.4</findbugs.plugin.version>
<jar.plugin.version>3.1.1</jar.plugin.version>
<java.version>1.7</java.version>
<java.version>1.8</java.version>
<junit.version>4.11</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>

Loading…
Cancel
Save