You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2019/07/03 07:19:40 UTC
svn commit: r1862448 - in /jackrabbit/oak/trunk/oak-commons: pom.xml
src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
Author: mreutegg
Date: Wed Jul 3 07:19:40 2019
New Revision: 1862448
URL: http://svn.apache.org/viewvc?rev=1862448&view=rev
Log:
OAK-7680: oak-commons: upgrade to project default mockito version
Apply patch provided by Julian Reschke
Modified:
jackrabbit/oak/trunk/oak-commons/pom.xml
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1862448&r1=1862447&r2=1862448&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-commons/pom.xml Wed Jul 3 07:19:40 2019
@@ -123,7 +123,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java?rev=1862448&r1=1862447&r2=1862448&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java Wed Jul 3 07:19:40 2019
@@ -22,8 +22,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.slf4j.Logger;
-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.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -134,7 +134,7 @@ public class PerfLoggerIT {
verify(logger, times(1)).trace(anyString());
}
if (shouldLogEnd) {
- verify(logger, times(1)).trace(anyString(), any(Object[].class));
+ verify(logger, times(1)).trace(anyString(), (Object[])any());
}
}
@@ -142,7 +142,7 @@ public class PerfLoggerIT {
verify(logger, times(enabled)).isDebugEnabled();
if (shouldLog) {
- verify(logger, times(1)).debug(anyString(), any(Object[].class));
+ verify(logger, times(1)).debug(anyString(), (Object[])any());
}
}
@@ -150,7 +150,7 @@ public class PerfLoggerIT {
verify(logger, times(enabled)).isInfoEnabled();
if (shouldLog) {
- verify(logger, times(1)).info(anyString(), any(Object[].class));
+ verify(logger, times(1)).info(anyString(), (Object[])any());
}
}
}
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java?rev=1862448&r1=1862447&r2=1862448&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java Wed Jul 3 07:19:40 2019
@@ -22,8 +22,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.slf4j.Logger;
-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.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -216,7 +216,7 @@ public class PerfLoggerTest {
verify(logger, times(1)).trace(anyString());
}
if (shouldLogEnd) {
- verify(logger, times(1)).trace(anyString(), any(Object[].class));
+ verify(logger, times(1)).trace(anyString(), (Object[])any());
}
}
@@ -224,7 +224,7 @@ public class PerfLoggerTest {
verify(logger, times(enabled)).isDebugEnabled();
if (shouldLog) {
- verify(logger, times(1)).debug(anyString(), any(Object[].class));
+ verify(logger, times(1)).debug(anyString(), (Object[])any());
}
}
@@ -232,7 +232,7 @@ public class PerfLoggerTest {
verify(logger, times(enabled)).isInfoEnabled();
if (shouldLog) {
- verify(logger, times(1)).info(anyString(), any(Object[].class));
+ verify(logger, times(1)).info(anyString(), (Object[])any());
}
}