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 re...@apache.org on 2019/07/16 10:50:59 UTC
svn commit: r1863121 - in /jackrabbit/oak/branches/1.10: ./
oak-commons/pom.xml
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
Author: reschke
Date: Tue Jul 16 10:50:58 2019
New Revision: 1863121
URL: http://svn.apache.org/viewvc?rev=1863121&view=rev
Log:
OAK-7680: oak-commons: upgrade to project default mockito version (merged r1862448 into 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-commons/pom.xml
jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 16 10:50:58 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859350-1859351,1859359,1859365,1859533,1859609,1859612,1859619,1859711,1859716,1859772,1859776
,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1860931,1861270,1861626,1862044,1862093,1862531,1862728,1862881
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859350-1859351,1859359,1859365,1859533,1859609,1859612,1859619,1859711,1859716,1859772,1859776
,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1860931,1861270,1861626,1862044,1862093,1862448,1862531,1862728,1862881
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-commons/pom.xml?rev=1863121&r1=1863120&r2=1863121&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-commons/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-commons/pom.xml Tue Jul 16 10:50:58 2019
@@ -116,7 +116,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java?rev=1863121&r1=1863120&r2=1863121&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java (original)
+++ jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerIT.java Tue Jul 16 10:50:58 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/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java?rev=1863121&r1=1863120&r2=1863121&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java (original)
+++ jackrabbit/oak/branches/1.10/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PerfLoggerTest.java Tue Jul 16 10:50:58 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());
}
}