Fix tests on Java 19

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

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 20d42e395899f86806076e57e6a3bdc370ef161a..e80a3772523455ea760ffdd0ce2b05cd3ccabc9b 100644 (file)
--- 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 eb0bc382a049d4d8ba7f00358723320d1080c5ab..e98e3066d533fe3e1fbdc8f55c4ed22a8b700673 100644 (file)
--- 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

diff --git a/fop/build.xml b/fop/build.xml
index e30da5133ec388bb392d72a21a396221f85fc8d1..2daaf627e9bc214b162ca1f15188a22b5665fcd0 100644 (file)
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -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"/>

diff --git a/pom.xml b/pom.xml
index dd14cecd5415dd339417e0532098d000672d89c9..846278026029335ecf8f33d783d5c50c07244328 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>