svn commit: r1885717 - in /jackrabbit/oak/trunk: oak-parent/pom.xml oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java

[fortino]

Author: fortino
Date: Wed Jan 20 14:46:38 2021
New Revision: 1885717

URL: http://svn.apache.org/viewvc?rev=1885717&view=rev
Log:
OAK-9329: bump mockito to version 3.7.7 (fixes compatibility with java 15)

Modified:
    jackrabbit/oak/trunk/oak-parent/pom.xml
    
jackrabbit/oak/trunk/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1885717&r1=1885716&r2=1885717&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Jan 20 14:46:38 2021
@@ -579,7 +579,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.3.3</version>
+        <version>3.7.7</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>

Modified: 
jackrabbit/oak/trunk/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java?rev=1885717&r1=1885716&r2=1885717&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
 Wed Jan 20 14:46:38 2021
@@ -18,10 +18,9 @@ package org.apache.jackrabbit.oak.segmen
 
 import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.FieldSetter;
+import org.mockito.internal.util.reflection.InstanceField;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -38,7 +37,6 @@ import java.util.concurrent.atomic.Atomi
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -82,7 +80,7 @@ public class SegmentWriteQueueTest {
         });
 
         Mockito.when(queue.offer(any(SegmentWriteAction.class), anyLong(), 
any(TimeUnit.class))).thenThrow(new InterruptedException());
-        FieldSetter.setField(queueBlocked, 
queueBlocked.getClass().getDeclaredField("queue"), queue);
+        new InstanceField(queueBlocked.getClass().getDeclaredField("queue"), 
queueBlocked).set(queue);
 
         try {
             queueBlocked.addToQueue(tarEntry(0), EMPTY_DATA, 0, 0);