You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2021/12/08 09:31:40 UTC
svn commit: r1895684 - in /xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop: apps/io/ fo/ fo/flow/table/ fo/pagination/ fo/properties/ fonts/ fonts/truetype/ layoutmgr/ pdf/ render/intermediate/ render/java2d/ render/pdf/ render/ps/ svg/font/
Author: ssteiner
Date: Wed Dec 8 09:31:40 2021
New Revision: 1895684
URL: http://svn.apache.org/viewvc?rev=1895684&view=rev
Log:
Fix mockito warnings
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java Wed Dec 8 09:31:40 2021
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java Wed Dec 8 09:31:40 2021
@@ -21,8 +21,8 @@ package org.apache.fop.fo;
import java.io.IOException;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java Wed Dec 8 09:31:40 2021
@@ -25,10 +25,10 @@ import org.xml.sax.Locator;
import org.xml.sax.helpers.AttributesImpl;
import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java Wed Dec 8 09:31:40 2021
@@ -23,12 +23,11 @@ import org.junit.Test;
import org.xml.sax.Locator;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -86,8 +85,8 @@ public class PageSequenceMasterTestCase
pageSequenceMaster.getNextSimplePageMaster(false, false, false, false, null);
- verify(mockBlockLevelEventProducer).pageSequenceMasterExhausted((Locator)anyObject(),
- nullable(String.class), eq(canResume), (Locator)anyObject());
+ verify(mockBlockLevelEventProducer).pageSequenceMasterExhausted(nullable(Object.class),
+ nullable(String.class), eq(canResume), nullable(Locator.class));
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java Wed Dec 8 09:31:40 2021
@@ -22,8 +22,8 @@ package org.apache.fop.fo.pagination;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java Wed Dec 8 09:31:40 2021
@@ -19,7 +19,7 @@
package org.apache.fop.fo.properties;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java Wed Dec 8 09:31:40 2021
@@ -25,8 +25,8 @@ import org.mockito.invocation.Invocation
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java Wed Dec 8 09:31:40 2021
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java Wed Dec 8 09:31:40 2021
@@ -22,7 +22,7 @@ package org.apache.fop.layoutmgr;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java Wed Dec 8 09:31:40 2021
@@ -24,9 +24,9 @@ import org.mockito.ArgumentMatcher;
import org.mockito.verification.VerificationMode;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java Wed Dec 8 09:31:40 2021
@@ -31,8 +31,8 @@ import org.junit.Test;
import org.xml.sax.helpers.DefaultHandler;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java Wed Dec 8 09:31:40 2021
@@ -42,9 +42,9 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java Wed Dec 8 09:31:40 2021
@@ -28,9 +28,9 @@ import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java Wed Dec 8 09:31:40 2021
@@ -28,8 +28,8 @@ import java.awt.image.RenderedImage;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java Wed Dec 8 09:31:40 2021
@@ -24,8 +24,8 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.endsWith;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.endsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java Wed Dec 8 09:31:40 2021
@@ -37,7 +37,7 @@ import org.mockito.invocation.Invocation
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.endsWith;
+import static org.mockito.ArgumentMatchers.endsWith;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java Wed Dec 8 09:31:40 2021
@@ -34,11 +34,11 @@ import org.junit.Test;
import org.mockito.verification.VerificationMode;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java Wed Dec 8 09:31:40 2021
@@ -32,8 +32,8 @@ import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java Wed Dec 8 09:31:40 2021
@@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java?rev=1895684&r1=1895683&r2=1895684&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java Wed Dec 8 09:31:40 2021
@@ -25,8 +25,8 @@ import java.text.StringCharacterIterator
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org