diff --git a/acyclic-visitor/pom.xml b/acyclic-visitor/pom.xml index e105ea86a..34f16caa0 100644 --- a/acyclic-visitor/pom.xml +++ b/acyclic-visitor/pom.xml @@ -53,8 +53,7 @@ org.mockito - mockito-all - 1.10.19 + mockito-core test diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java index 9e5b4f2ac..66640e3ca 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java @@ -26,7 +26,7 @@ package com.iluwatar.acyclicvisitor; 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 @@ class HayesTest { hayes.accept(mockVisitor); - verifyZeroInteractions(mockVisitor); + verifyNoMoreInteractions(mockVisitor); } } diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java index e07be283a..df7b7e840 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java @@ -27,7 +27,7 @@ package com.iluwatar.acyclicvisitor; 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; diff --git a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java b/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java index 2860da725..4698a092c 100644 --- a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java +++ b/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java @@ -32,11 +32,11 @@ import static org.junit.jupiter.api.Assertions.assertSame; 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.BeforeEach; 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 @@ class ThreadAsyncExecutorTest { assertNotNull(asyncResult); assertFalse(asyncResult.isCompleted()); - verifyZeroInteractions(callback); + verifyNoMoreInteractions(callback); try { asyncResult.getValue(); @@ -296,7 +295,7 @@ class ThreadAsyncExecutorTest { 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); diff --git a/caching/pom.xml b/caching/pom.xml index 0c8704b2c..695281bc2 100644 --- a/caching/pom.xml +++ b/caching/pom.xml @@ -41,8 +41,7 @@ org.mockito - mockito-all - 1.10.19 + mockito-core test diff --git a/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java b/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java index 75e5c5302..be644d9b9 100644 --- a/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java +++ b/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 */ diff --git a/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java b/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java index 95533816b..bf1aef70a 100644 --- a/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java +++ b/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java @@ -33,7 +33,6 @@ import org.bson.Document; 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 diff --git a/composite-view/pom.xml b/composite-view/pom.xml index 88eb6576e..bfeae1420 100644 --- a/composite-view/pom.xml +++ b/composite-view/pom.xml @@ -55,7 +55,6 @@ org.mockito mockito-core - 4.1.0 test diff --git a/dao/pom.xml b/dao/pom.xml index d5026fa42..1d75f1f83 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -46,6 +46,7 @@ org.mockito mockito-core + test diff --git a/dirty-flag/pom.xml b/dirty-flag/pom.xml index 379ad147f..2bbbf285d 100644 --- a/dirty-flag/pom.xml +++ b/dirty-flag/pom.xml @@ -45,11 +45,6 @@ junit-jupiter-engine test - - org.mockito - mockito-junit-jupiter - test - diff --git a/domain-model/pom.xml b/domain-model/pom.xml index 43c3bb2bd..193535502 100644 --- a/domain-model/pom.xml +++ b/domain-model/pom.xml @@ -46,6 +46,7 @@ org.mockito mockito-core + test org.joda diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java index 47e140416..cdaa606e9 100644 --- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java +++ b/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 @@ abstract class EventEmitterTest { } } else { // On any other normal day, the observers should have received nothing at all - verifyZeroInteractions(observers); + verifyNoMoreInteractions(observers); } } diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java index 923478122..649f5bb2c 100644 --- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java +++ b/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 @@ class KingsHandTest extends EventEmitterTest { 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 -> { diff --git a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java index 248894a59..20d381e9b 100644 --- a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java +++ b/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 @@ class ContentStoreTest { 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)); diff --git a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java index 0e556fea5..2266b1b2a 100644 --- a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java +++ b/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 @@ class MenuStoreTest { 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)); diff --git a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java index 314bcf147..bd0713b3b 100644 --- a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java +++ b/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; diff --git a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java index a4c87135c..4574c3b6a 100644 --- a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java +++ b/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; diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java index a87ace422..a3d47a72c 100644 --- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java +++ b/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,7 +46,7 @@ class FilterManagerTest { final var target = mock(Target.class); final var filterManager = new FilterManager(); assertEquals("RUNNING...", filterManager.filterRequest(mock(Order.class))); - verifyZeroInteractions(target); + verifyNoMoreInteractions(target); } @Test @@ -54,7 +54,7 @@ class FilterManagerTest { 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 @@ class FilterManagerTest { assertEquals("filter", filterManager.filterRequest(order)); verify(filter, times(1)).execute(any(Order.class)); - verifyZeroInteractions(target, filter, order); + verifyNoMoreInteractions(target, filter, order); } } \ No newline at end of file diff --git a/leader-followers/pom.xml b/leader-followers/pom.xml index ee2e5bace..d77cd8035 100644 --- a/leader-followers/pom.xml +++ b/leader-followers/pom.xml @@ -39,10 +39,5 @@ junit-jupiter-engine test - - org.mockito - mockito-core - test - diff --git a/leader-followers/src/test/java/com/AppTest.java b/leader-followers/src/test/java/com/iluwatar/leaderfollowers/AppTest.java similarity index 96% rename from leader-followers/src/test/java/com/AppTest.java rename to leader-followers/src/test/java/com/iluwatar/leaderfollowers/AppTest.java index bf07d9d94..acd39e735 100644 --- a/leader-followers/src/test/java/com/AppTest.java +++ b/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; /** diff --git a/leader-followers/src/test/java/com/TaskHandlerTest.java b/leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskHandlerTest.java similarity index 94% rename from leader-followers/src/test/java/com/TaskHandlerTest.java rename to leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskHandlerTest.java index fdb00335e..2d92e2e6b 100644 --- a/leader-followers/src/test/java/com/TaskHandlerTest.java +++ b/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; /** diff --git a/leader-followers/src/test/java/com/TaskSetTest.java b/leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskSetTest.java similarity index 94% rename from leader-followers/src/test/java/com/TaskSetTest.java rename to leader-followers/src/test/java/com/iluwatar/leaderfollowers/TaskSetTest.java index 0cc480800..63559a938 100644 --- a/leader-followers/src/test/java/com/TaskSetTest.java +++ b/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; /** diff --git a/leader-followers/src/test/java/com/WorkCenterTest.java b/leader-followers/src/test/java/com/iluwatar/leaderfollowers/WorkCenterTest.java similarity index 93% rename from leader-followers/src/test/java/com/WorkCenterTest.java rename to leader-followers/src/test/java/com/iluwatar/leaderfollowers/WorkCenterTest.java index ca9123574..f37d7526e 100644 --- a/leader-followers/src/test/java/com/WorkCenterTest.java +++ b/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; /** diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java index 0d3d7300d..dd89ee873 100644 --- a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java +++ b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java @@ -27,7 +27,6 @@ package com.iluwatar.mediator; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; @@ -55,7 +54,7 @@ class PartyImplTest { verify(partyMember2).joinedParty(party); party.act(partyMember1, Action.GOLD); - verifyZeroInteractions(partyMember1); + verifyNoMoreInteractions(partyMember1); verify(partyMember2).partyAction(Action.GOLD); verifyNoMoreInteractions(partyMember1, partyMember2); diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java index e598e19b4..1f9ea0420 100644 --- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java +++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java @@ -27,7 +27,6 @@ package com.iluwatar.model.view.controller; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; @@ -47,12 +46,12 @@ class GiantControllerTest { final var view = mock(GiantView.class); final var controller = new GiantController(model, view); - verifyZeroInteractions(model, view); + verifyNoMoreInteractions(model, view); for (final var health : Health.values()) { controller.setHealth(health); verify(model).setHealth(health); - verifyZeroInteractions(view); + verifyNoMoreInteractions(view); } controller.getHealth(); @@ -71,12 +70,12 @@ class GiantControllerTest { final var view = mock(GiantView.class); final var controller = new GiantController(model, view); - verifyZeroInteractions(model, view); + verifyNoMoreInteractions(model, view); for (final var fatigue : Fatigue.values()) { controller.setFatigue(fatigue); verify(model).setFatigue(fatigue); - verifyZeroInteractions(view); + verifyNoMoreInteractions(view); } controller.getFatigue(); @@ -95,12 +94,12 @@ class GiantControllerTest { final var view = mock(GiantView.class); final var controller = new GiantController(model, view); - verifyZeroInteractions(model, view); + verifyNoMoreInteractions(model, view); for (final var nourishment : Nourishment.values()) { controller.setNourishment(nourishment); verify(model).setNourishment(nourishment); - verifyZeroInteractions(view); + verifyNoMoreInteractions(view); } controller.getNourishment(); @@ -116,7 +115,7 @@ class GiantControllerTest { final var view = mock(GiantView.class); final var controller = new GiantController(model, view); - verifyZeroInteractions(model, view); + verifyNoMoreInteractions(model, view); controller.updateView(); verify(view).displayGiant(model); diff --git a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java index ea10bc0be..96f98a80d 100644 --- a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java +++ b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java @@ -25,13 +25,12 @@ package com.iluwatar.monostate; 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.doNothing; 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 static org.mockito.Mockito.when; import org.junit.jupiter.api.Test; @@ -64,7 +63,7 @@ class LoadBalancerTest { final var loadBalancer = new LoadBalancer(); loadBalancer.addServer(server); - verifyZeroInteractions(server); + verifyNoMoreInteractions(server); final var request = new Request("test"); for (var i = 0; i < loadBalancer.getNoOfServers() * 2; i++) { diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java index 423929c87..bdb055f42 100644 --- a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java +++ b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import com.iluwatar.observer.utils.InMemoryAppender; import org.junit.jupiter.api.AfterEach; @@ -65,7 +64,7 @@ class WeatherTest { final var weather = new Weather(); weather.addObserver(observer); - verifyZeroInteractions(observer); + verifyNoMoreInteractions(observer); weather.timePasses(); assertEquals("The weather changed to rainy.", appender.getLastMessage()); diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java index 338a28691..5ff500480 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import com.iluwatar.observer.WeatherObserver; import com.iluwatar.observer.WeatherType; @@ -67,7 +66,7 @@ class GWeatherTest { final var weather = new GWeather(); weather.addObserver(observer); - verifyZeroInteractions(observer); + verifyNoMoreInteractions(observer); weather.timePasses(); assertEquals("The weather changed to rainy.", appender.getLastMessage()); diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java index 0345ee361..dcfc182f4 100644 --- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java +++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java @@ -27,11 +27,10 @@ package com.iluwatar.poison.pill; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -47,7 +46,7 @@ class ProducerTest { void testSend() throws Exception { final var publishPoint = mock(MqPublishPoint.class); final var producer = new Producer("producer", publishPoint); - verifyZeroInteractions(publishPoint); + verifyNoMoreInteractions(publishPoint); producer.send("Hello!"); @@ -67,7 +66,7 @@ class ProducerTest { void testStop() throws Exception { final var publishPoint = mock(MqPublishPoint.class); final var producer = new Producer("producer", publishPoint); - verifyZeroInteractions(publishPoint); + verifyNoMoreInteractions(publishPoint); producer.stop(); verify(publishPoint).put(eq(Message.POISON_PILL)); diff --git a/pom.xml b/pom.xml index c0ead428c..6f7f6721f 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 1.4 2.25.1 19.0 - 3.5.6 2.66.0 4.0 3.12.8 @@ -226,21 +225,6 @@ - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-inline - ${mockito.version} - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - org.springframework.boot spring-boot-dependencies diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java index 1f4579bb0..73d4424a6 100644 --- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java +++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java @@ -26,7 +26,7 @@ package com.iluwatar.producer.consumer; import static java.time.Duration.ofMillis; import static org.junit.jupiter.api.Assertions.assertTimeout; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java b/promise/src/test/java/com/iluwatar/promise/PromiseTest.java index 72becbc33..99bf9aeed 100644 --- a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java +++ b/promise/src/test/java/com/iluwatar/promise/PromiseTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; 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.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/table-module/pom.xml b/table-module/pom.xml index b50dbe87c..f931a8701 100644 --- a/table-module/pom.xml +++ b/table-module/pom.xml @@ -46,6 +46,7 @@ org.mockito mockito-core + test diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java index 9f9bd72e1..4b94f07e7 100644 --- a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java +++ b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java @@ -27,7 +27,6 @@ package com.iluwatar.threadpool; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; @@ -45,7 +44,7 @@ class WorkerTest { void testRun() { final var task = mock(Task.class); final var worker = new Worker(task); - verifyZeroInteractions(task); + verifyNoMoreInteractions(task); worker.run(); verify(task).getTimeMs(); diff --git a/transaction-script/pom.xml b/transaction-script/pom.xml index 5a92acaf6..af6d4571a 100644 --- a/transaction-script/pom.xml +++ b/transaction-script/pom.xml @@ -46,6 +46,7 @@ org.mockito mockito-core + test diff --git a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java index 969cee961..4175458cb 100644 --- a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java +++ b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java @@ -28,13 +28,12 @@ import static java.lang.Thread.UncaughtExceptionHandler; import static java.lang.Thread.sleep; import static java.time.Duration.ofMillis; import static org.junit.jupiter.api.Assertions.assertTimeout; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; @@ -87,7 +86,7 @@ class BallThreadTest { sleep(1000); - verifyZeroInteractions(ballItem); + verifyNoMoreInteractions(ballItem); ballThread.resumeMe(); sleep(300); diff --git a/unit-of-work/pom.xml b/unit-of-work/pom.xml index 34b212c6d..670c97e8b 100644 --- a/unit-of-work/pom.xml +++ b/unit-of-work/pom.xml @@ -42,6 +42,7 @@ org.mockito mockito-core + test diff --git a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java index 4b90c69cc..070667e2b 100644 --- a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java +++ b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java @@ -24,7 +24,7 @@ */ package com.iluwatar.visitor; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; /** diff --git a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java index 7aeed4ed1..882faa607 100644 --- a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java +++ b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java @@ -24,7 +24,7 @@ */ package com.iluwatar.visitor; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; /** diff --git a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java index 0fc45680c..5868efdc3 100644 --- a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java +++ b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java @@ -24,7 +24,7 @@ */ package com.iluwatar.visitor; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; /** diff --git a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java index 537934505..e8c84ce52 100644 --- a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java +++ b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java @@ -24,7 +24,7 @@ */ package com.iluwatar.visitor; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions;