dependencies: Upgrade mockito 3.5 to 4.5 (iluwatar#2316)

* refactor: move tests of leader-followers into correct package

* dep: remove version constraint for Mockito in acyclic-visitor

* dep: remove version constraint for Mockito in caching

* chore: cleanup mockito-core import on some POMs

* dep: upgrade core.mocktio 3.5.6 to 4.5.1

"- org.mockito.Mockito#verifyZeroInteractions an alias of verifyNoMoreInteractions"
mockito/mockito@caf35b2

Author: robertvolkmann

acyclic-visitor/pom.xml

@@ -53,8 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java

@@ -26,7 +26,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
@@ -50,6 +50,6 @@ void testAcceptForUnix() {
 
     hayes.accept(mockVisitor);
 
-    verifyZeroInteractions(mockVisitor);
+    verifyNoMoreInteractions(mockVisitor);
   }
 }

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java

@@ -27,7 +27,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java

@@ -32,11 +32,11 @@
 import static org.junit.jupiter.api.Assertions.assertTimeout;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
@@ -47,7 +47,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -190,7 +189,7 @@ void testLongRunningTaskWithCallback() throws Exception {
       assertNotNull(asyncResult);
       assertFalse(asyncResult.isCompleted());
 
-      verifyZeroInteractions(callback);
+      verifyNoMoreInteractions(callback);
 
       try {
         asyncResult.getValue();
@@ -296,7 +295,7 @@ void testNullTaskWithCallback() throws Exception {
       assertNotNull(asyncResult, "The AsyncResult should not be 'null', even though the task was 'null'.");
       asyncResult.await(); // Prevent timing issues, and wait until the result is available
       assertTrue(asyncResult.isCompleted());
-      verify(callback, times(1)).onComplete(Matchers.isNull(), optionalCaptor.capture());
+      verify(callback, times(1)).onComplete(isNull(), optionalCaptor.capture());
 
       final var optionalException = optionalCaptor.getValue();
       assertNotNull(optionalException);

caching/pom.xml

@@ -41,8 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

caching/src/main/java/com/iluwatar/caching/database/MongoDb.java

@@ -53,6 +53,10 @@ public class MongoDb implements DbManager {
   private MongoClient client;
   private MongoDatabase db;
 
+  void setDB(MongoDatabase db) {
+    this.db = db;
+  }
+
   /**
    * Connect to Db. Check th connection
    */

caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java

@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.internal.util.reflection.Whitebox;
 
 import static com.iluwatar.caching.constants.CachingConstants.ADD_INFO;
 import static com.iluwatar.caching.constants.CachingConstants.USER_ID;
@@ -56,10 +55,8 @@ class MongoDbTest {
   @BeforeEach
   void init() {
     db = mock(MongoDatabase.class);
-    Whitebox.setInternalState(mongoDb, "db", db);
+    mongoDb.setDB(db);
     userAccount = new UserAccount(ID, NAME, ADDITIONAL_INFO);
-
-
   }
 
   @Test

composite-view/pom.xml

@@ -55,7 +55,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.1.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

dao/pom.xml

@@ -46,6 +46,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

dirty-flag/pom.xml

@@ -45,11 +45,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

domain-model/pom.xml

@@ -46,6 +46,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.joda</groupId>

event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java

@@ -24,16 +24,14 @@
  */
 package com.iluwatar.event.aggregator;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import org.junit.jupiter.api.Test;
 
@@ -111,7 +109,7 @@ private void testAllDays(final Weekday specialDay, final Event event, final E em
         }
       } else {
         // On any other normal day, the observers should have received nothing at all
-        verifyZeroInteractions(observers);
+        verifyNoMoreInteractions(observers);
       }
     }
 

event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java

@@ -24,12 +24,11 @@
  */
 package com.iluwatar.event.aggregator;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
@@ -63,7 +62,7 @@ void testPassThrough() throws Exception {
     kingsHand.registerObserver(observer, Event.WHITE_WALKERS_SIGHTED);
 
     // The kings hand should not pass any events before he received one
-    verifyZeroInteractions(observer);
+    verifyNoMoreInteractions(observer);
 
     // Verify if each event is passed on to the observer, nothing less, nothing more.
     Arrays.stream(Event.values()).forEach(event -> {

flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java

@@ -25,12 +25,11 @@
 package com.iluwatar.flux.store;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import com.iluwatar.flux.action.Content;
 import com.iluwatar.flux.action.ContentAction;
@@ -53,11 +52,11 @@ void testOnAction() {
     final var view = mock(View.class);
     contentStore.registerView(view);
 
-    verifyZeroInteractions(view);
+    verifyNoMoreInteractions(view);
 
     // Content should not react on menu action ...
     contentStore.onAction(new MenuAction(MenuItem.PRODUCTS));
-    verifyZeroInteractions(view);
+    verifyNoMoreInteractions(view);
 
     // ... but it should react on a content action
     contentStore.onAction(new ContentAction(Content.COMPANY));

flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java

@@ -25,12 +25,11 @@
 package com.iluwatar.flux.store;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import com.iluwatar.flux.action.Content;
 import com.iluwatar.flux.action.ContentAction;
@@ -53,11 +52,11 @@ void testOnAction() {
     final var view = mock(View.class);
     menuStore.registerView(view);
 
-    verifyZeroInteractions(view);
+    verifyNoMoreInteractions(view);
 
     // Menu should not react on content action ...
     menuStore.onAction(new ContentAction(Content.COMPANY));
-    verifyZeroInteractions(view);
+    verifyNoMoreInteractions(view);
 
     // ... but it should react on a menu action
     menuStore.onAction(new MenuAction(MenuItem.PRODUCTS));

flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java

@@ -24,7 +24,7 @@
  */
 package com.iluwatar.flux.view;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java

@@ -24,7 +24,7 @@
  */
 package com.iluwatar.halfsynchalfasync;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;

intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java

@@ -25,11 +25,11 @@
 package com.iluwatar.intercepting.filter;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.Test;
@@ -46,15 +46,15 @@ void testFilterRequest() {
     final var target = mock(Target.class);
     final var filterManager = new FilterManager();
     assertEquals("RUNNING...", filterManager.filterRequest(mock(Order.class)));
-    verifyZeroInteractions(target);
+    verifyNoMoreInteractions(target);
   }
 
   @Test
   void testAddFilter() {
     final var target = mock(Target.class);
     final var filterManager = new FilterManager();
 
-    verifyZeroInteractions(target);
+    verifyNoMoreInteractions(target);
 
     final var filter = mock(Filter.class);
     when(filter.execute(any(Order.class))).thenReturn("filter");
@@ -65,6 +65,6 @@ void testAddFilter() {
     assertEquals("filter", filterManager.filterRequest(order));
 
     verify(filter, times(1)).execute(any(Order.class));
-    verifyZeroInteractions(target, filter, order);
+    verifyNoMoreInteractions(target, filter, order);
   }
 }

leader-followers/pom.xml

@@ -39,10 +39,5 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

leader-followers/src/test/java/com/AppTest.java renamed to leader-followers/src/test/java/com/iluwatar/leaderfollowers/AppTest.java

@@ -22,12 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com;
+package com.iluwatar.leaderfollowers;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.iluwatar.leaderfollowers.App;
-
 import org.junit.jupiter.api.Test;
 
 /**

leader-followers/src/test/java/com/TaskHandlerTest.java renamed to leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskHandlerTest.java

@@ -22,12 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com;
+package com.iluwatar.leaderfollowers;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.iluwatar.leaderfollowers.Task;
-import com.iluwatar.leaderfollowers.TaskHandler;
 import org.junit.jupiter.api.Test;
 
 /**

leader-followers/src/test/java/com/TaskSetTest.java renamed to leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskSetTest.java

@@ -22,12 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com;
+package com.iluwatar.leaderfollowers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.iluwatar.leaderfollowers.Task;
-import com.iluwatar.leaderfollowers.TaskSet;
 import org.junit.jupiter.api.Test;
 
 /**

leader-followers/src/test/java/com/WorkCenterTest.java renamed to leader-followers/src/test/java/com/iluwatar/leaderfollowers/WorkCenterTest.java

@@ -22,14 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com;
+package com.iluwatar.leaderfollowers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import com.iluwatar.leaderfollowers.TaskHandler;
-import com.iluwatar.leaderfollowers.TaskSet;
-import com.iluwatar.leaderfollowers.WorkCenter;
 import org.junit.jupiter.api.Test;
 
 /**