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 2018/08/07 03:29:47 UTC
svn commit: r1837569 - in /jackrabbit/oak/trunk/oak-core: pom.xml
src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
Author: reschke
Date: Tue Aug 7 03:29:47 2018
New Revision: 1837569
URL: http://svn.apache.org/viewvc?rev=1837569&view=rev
Log:
OAK-7679: oak-core: update Mockito version and fix test case to be compatible with it
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1837569&r1=1837568&r2=1837569&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Tue Aug 7 03:29:47 2018
@@ -247,7 +247,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java?rev=1837569&r1=1837568&r2=1837569&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java Tue Aug 7 03:29:47 2018
@@ -74,7 +74,7 @@ public class NodeCounterMBeanEstimatorTe
when(counter.getEstimatedNodeCount(anyString())).then((invocation -> {
String path = (String) invocation.getArguments()[0];
if (counts.containsKey(path)) {
- return counts.get(path);
+ return (long)counts.get(path);
}
return -1;
}));