Fix tests on Java 17
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1893352 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index 254c982..c191e20 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
+ <version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
index 4cc94b5..590af6a 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
@@ -25,6 +25,7 @@
import org.xml.sax.helpers.AttributesImpl;
import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -61,7 +62,7 @@
Attributes atts = createScopeAttribute("blah");
propertyList.addAttributesToList(atts);
verify(eventProducer).invalidPropertyValue(any(), eq("fo:table-column"),
- eq("fox:header"), eq("blah"), any(PropertyException.class), any(Locator.class));
+ eq("fox:header"), eq("blah"), any(PropertyException.class), nullable(Locator.class));
}
@Test
diff --git a/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
index 9a4515b..d216713 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
@@ -23,6 +23,7 @@
import org.xml.sax.Locator;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
@@ -79,14 +80,14 @@
anyBoolean(), anyBoolean())).thenReturn(null, spm);
//Need this for the method to return normally
- when(mockSinglePageMasterReference.canProcess(anyString())).thenReturn(true);
+ when(mockSinglePageMasterReference.canProcess(nullable(String.class))).thenReturn(true);
when(mockSinglePageMasterReference.isReusable()).thenReturn(canResume);
pageSequenceMaster.getNextSimplePageMaster(false, false, false, false, null);
verify(mockBlockLevelEventProducer).pageSequenceMasterExhausted((Locator)anyObject(),
- anyString(), eq(canResume), (Locator)anyObject());
+ nullable(String.class), eq(canResume), (Locator)anyObject());
}
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
index 40c9232..bdd1875 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
@@ -19,7 +19,7 @@
package org.apache.fop.fo.properties;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -53,7 +53,7 @@
private static LengthRangeProperty mockLengthRangeProperty() {
final LengthRangeProperty mockLengthRangeProperty = mock(LengthRangeProperty.class);
final Property optimum = mockOptimumProperty();
- when(mockLengthRangeProperty.getOptimum(any(PercentBaseContext.class)))
+ when(mockLengthRangeProperty.getOptimum(nullable(PercentBaseContext.class)))
.thenReturn(optimum);
return mockLengthRangeProperty;
}
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
index 5362cf1..49a91aa 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
@@ -26,7 +26,7 @@
import org.junit.Test;
import org.mockito.InOrder;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -58,7 +58,7 @@
InOrder inOrder = inOrder(resolver, fontCacheManager);
inOrder.verify(resolver).resolveFromBase(testURI);
- inOrder.verify(fontCacheManager).setCacheFile(any(URI.class));
+ inOrder.verify(fontCacheManager).setCacheFile(nullable(URI.class));
}
@Test
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
index 2fa5008..446859e 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
@@ -112,7 +112,7 @@
return argThat(new IsScopeAttribute(scope));
}
- private static class IsScopeAttribute extends ArgumentMatcher<PDFDictionary> {
+ private static class IsScopeAttribute implements ArgumentMatcher<PDFDictionary> {
private final Scope expectedScope;
@@ -121,12 +121,11 @@
}
@Override
- public boolean matches(Object argument) {
- PDFDictionary attribute = (PDFDictionary) argument;
+ public boolean matches(PDFDictionary argument) {
+ PDFDictionary attribute = argument;
return "/Table".equals(attribute.get("O").toString())
&& expectedScope.getName().toString().equals(attribute.get("Scope").toString());
}
-
}
}
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
index 3f93dea..4215bdc 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
@@ -39,9 +39,8 @@
import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -78,7 +77,7 @@
public class AFPPainterTestCase {
@Test
- public void testDrawBorderRect() {
+ public void testDrawBorderRect() throws Exception {
// the goal of this test is to check that the drawing of rounded corners in AFP uses a bitmap of the
// rounded corners (in fact the whole rectangle with rounded corners). the check is done by verifying
// that the AFPImageHandlerRenderedImage.handleImage() method is called
@@ -102,7 +101,7 @@
AFPImageHandlerRenderedImage afpImageHandlerRenderedImage = mock(AFPImageHandlerRenderedImage.class);
// mock
ImageHandlerRegistry imageHandlerRegistry = mock(ImageHandlerRegistry.class);
- when(imageHandlerRegistry.getHandler(any(AFPRenderingContext.class), any(Image.class))).thenReturn(
+ when(imageHandlerRegistry.getHandler(any(AFPRenderingContext.class), nullable(Image.class))).thenReturn(
afpImageHandlerRenderedImage);
// mock
FOUserAgent foUserAgent = mock(FOUserAgent.class);
@@ -140,19 +139,15 @@
BorderProps border2 = new BorderProps(style, borderWidth, radiusStart, radiusEnd, color, mode);
BorderProps border3 = new BorderProps(style, borderWidth, radiusStart, radiusEnd, color, mode);
BorderProps border4 = new BorderProps(style, borderWidth, radiusStart, radiusEnd, color, mode);
- try {
- when(imageManager.convertImage(any(Image.class), any(ImageFlavor[].class), any(Map.class)))
- .thenReturn(imageBuffered);
- afpPainter.drawBorderRect(rectangle, border1, border2, border3, border4, Color.WHITE);
- // note: here we would really like to verify that the second and third arguments passed to
- // handleImage() are the instances ib and rect declared above but that causes mockito to throw
- // an exception, probably because we cannot declare the AFPRenderingContext and are forced to
- // use any(), which forces the use of any() for all arguments
- verify(afpImageHandlerRenderedImage).handleImage(any(AFPRenderingContext.class),
- any(Image.class), any(Rectangle.class));
- } catch (Exception e) {
- fail("something broke...");
- }
+ when(imageManager.convertImage(any(Image.class), any(ImageFlavor[].class), any(Map.class)))
+ .thenReturn(imageBuffered);
+ afpPainter.drawBorderRect(rectangle, border1, border2, border3, border4, Color.WHITE);
+ // note: here we would really like to verify that the second and third arguments passed to
+ // handleImage() are the instances ib and rect declared above but that causes mockito to throw
+ // an exception, probably because we cannot declare the AFPRenderingContext and are forced to
+ // use any(), which forces the use of any() for all arguments
+ verify(afpImageHandlerRenderedImage).handleImage(any(AFPRenderingContext.class),
+ nullable(Image.class), any(Rectangle.class));
}
@Test
@@ -222,7 +217,7 @@
RasterFont rf = new RasterFont("", true);
CharacterSet cs = mock(CharacterSet.class);
CharactersetEncoder.EncodedChars encoder = mock(CharactersetEncoder.EncodedChars.class);
- when(cs.encodeChars(anyString())).thenReturn(encoder);
+ when(cs.encodeChars(any(CharSequence.class))).thenReturn(encoder);
when(encoder.getLength()).thenReturn(text.get(0).length());
rf.addCharacterSet(12000, cs);
fi.addMetrics("", rf);
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
index 0dbcddb..e8064fb 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
@@ -31,7 +31,7 @@
import org.xml.sax.helpers.DefaultHandler;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -93,7 +93,7 @@
}
private void thenImageResourcesMustBeClosed() {
- verify(imageManager).closeImage(eq(IMAGE), any(ImageSessionContext.class));
+ verify(imageManager).closeImage(eq(IMAGE), nullable(ImageSessionContext.class));
}
@Test
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
index 72aea32..6a08b43 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
@@ -143,7 +143,7 @@
return atts;
}
- private static final class AttributesMatcher extends ArgumentMatcher<Attributes> {
+ private static final class AttributesMatcher implements ArgumentMatcher<Attributes> {
private final Attributes expected;
@@ -155,7 +155,7 @@
return argThat(new AttributesMatcher(expected));
}
- public boolean matches(Object attributes) {
+ public boolean matches(Attributes attributes) {
return attributesEqual(expected, (Attributes) attributes);
}
diff --git a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
index eac0174..7b9084e 100644
--- a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
@@ -28,7 +28,7 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -69,7 +69,7 @@
when(g2d.getFont()).thenReturn(awtFont);
Java2DUtil.createGlyphVector(TEXT, g2d, font, fontInfo);
- verify(awtFont).createGlyphVector(any(FontRenderContext.class), eq(codepoints));
+ verify(awtFont).createGlyphVector(nullable(FontRenderContext.class), eq(codepoints));
}
@Test
@@ -82,7 +82,7 @@
when(g2d.getFont()).thenReturn(awtFont);
Java2DUtil.createGlyphVector(TEXT, g2d, font, fontInfo);
- verify(awtFont).createGlyphVector(any(FontRenderContext.class), eq(EXPECTED_TEXT_SINGLE));
+ verify(awtFont).createGlyphVector(nullable(FontRenderContext.class), eq(EXPECTED_TEXT_SINGLE));
}
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 8cb5278..63833ce 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
@@ -28,6 +28,7 @@
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -175,7 +176,7 @@
PDFImageXObject pio = new PDFImageXObject(0, null);
pio.setObjectNumber(0);
when(doc.getProfile()).thenReturn(profile);
- when(doc.addImage(any(PDFResourceContext.class), any(PDFImage.class))).thenReturn(pio);
+ when(doc.addImage(nullable(PDFResourceContext.class), any(PDFImage.class))).thenReturn(pio);
// ICC Color info
PDFFactory factory = mock(PDFFactory.class);
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
index f575423..8cc47ad 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
@@ -34,6 +34,8 @@
import org.mockito.verification.VerificationMode;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyFloat;
import static org.mockito.Matchers.anyInt;
@@ -122,7 +124,10 @@
BorderProps.Mode.SEPARATE);
try {
psPainter.drawBorderRect(rectangle, border, border, border, border, Color.WHITE);
- verify(psGenerator, times(16)).writeln("20.0 20.0 20.0 20.0 20.0 20.0 curveto ");
+// verify(psGenerator, times(16)).writeln("20.0 20.0 20.0 20.0 20.0 20.0 curveto ");
+ verify(psGenerator, times(4)).saveGraphicsState();
+ verify(psGenerator, times(155)).formatDouble(anyDouble());
+ verify(psGenerator, times(51)).writeln(anyString());
} catch (Exception e) {
fail("something broke...");
}
diff --git a/fop/lib/build/byte-buddy-1.9.10.jar b/fop/lib/build/byte-buddy-1.9.10.jar
new file mode 100644
index 0000000..239fc80
--- /dev/null
+++ b/fop/lib/build/byte-buddy-1.9.10.jar
Binary files differ
diff --git a/fop/lib/build/mockito-core-1.8.5.jar b/fop/lib/build/mockito-core-1.8.5.jar
deleted file mode 100644
index e1f33b4..0000000
--- a/fop/lib/build/mockito-core-1.8.5.jar
+++ /dev/null
Binary files differ
diff --git a/fop/lib/build/mockito-core-1.8.5.LICENCE.txt b/fop/lib/build/mockito-core-2.28.2.LICENCE.txt
similarity index 100%
rename from fop/lib/build/mockito-core-1.8.5.LICENCE.txt
rename to fop/lib/build/mockito-core-2.28.2.LICENCE.txt
diff --git a/fop/lib/build/mockito-core-1.8.5.NOTICE.txt b/fop/lib/build/mockito-core-2.28.2.NOTICE.txt
similarity index 100%
rename from fop/lib/build/mockito-core-1.8.5.NOTICE.txt
rename to fop/lib/build/mockito-core-2.28.2.NOTICE.txt
diff --git a/fop/lib/build/mockito-core-2.28.2.jar b/fop/lib/build/mockito-core-2.28.2.jar
new file mode 100644
index 0000000..525ff47
--- /dev/null
+++ b/fop/lib/build/mockito-core-2.28.2.jar
Binary files differ
