From dafb3e8cd9a08db49292a8799bfa8a19c1117cc6 Mon Sep 17 00:00:00 2001 From: allanmckenzie Date: Thu, 12 Jan 2023 17:31:49 +0000 Subject: [PATCH] Update mockito to 4.11.10 --- CHANGELOG.md | 6 +++++- example-context/example-persistence/pom.xml | 2 +- .../example/cakeshop/persistence/CakeRepositoryIT.java | 2 +- .../cakeshop/command/api/MakeCakeCommandApiTest.java | 4 ++-- .../cakeshop/command/api/OrderCakeCommandApiTest.java | 2 +- .../cakeshop/command/api/RecipeCommandApiTest.java | 2 +- .../cakeshop/command/handler/EventFactoryTest.java | 2 +- .../command/handler/MakeCakeCommandHandlerTest.java | 2 +- .../command/handler/OrderCakeCommandHandlerTest.java | 2 +- .../command/handler/RecipeCommandHandlerTest.java | 6 +++--- .../example-custom/example-custom-api/pom.xml | 2 +- .../example/cakeshop/custom/api/OvenCustomApiTest.java | 2 +- .../cakeshop/custom/api/response/OvenStatusTest.java | 2 +- .../cakeshop/custom/api/response/OvensStatusTest.java | 2 +- .../event/listener/CakeMadeEventListenerTest.java | 8 +------- .../event/listener/CakeOrderedEventListenerTest.java | 2 +- .../event/listener/RecipeEventListenerTest.java | 4 ++-- .../RecipeAddedToIngredientsConverterTest.java | 2 +- .../converter/RecipeAddedToRecipeConverterTest.java | 2 +- .../interceptor/ExceptionThrowingInterceptorTest.java | 2 +- .../example-service/example-feature-control/pom.xml | 2 +- .../example-service/example-healthcheck/pom.xml | 2 +- .../CakeShopIgnoredHealthcheckNamesProvider.java | 1 - .../CakeShopIgnoredHealthcheckNamesProviderTest.java | 2 +- example-context/example-service/example-it/pom.xml | 10 +++++----- .../example/cakeshop/it/CakeShopConcurrencyIT.java | 2 +- .../example/cakeshop/it/CakeShopEventBufferingIT.java | 4 ++-- .../example/cakeshop/it/CakeShopFailuresIT.java | 2 +- .../example/cakeshop/it/CakeShopFileServiceIT.java | 2 +- .../example/cakeshop/it/CakeShopFilteringIT.java | 2 +- .../services/example/cakeshop/it/CakeShopIT.java | 2 +- .../example/cakeshop/it/CakeShopTimeStampIT.java | 6 ++---- .../example/cakeshop/it/CatchupPerformanceIT.java | 1 - .../services/example/cakeshop/it/HealthcheckIT.java | 2 +- .../cakeshop/it/MultipleEventListenerCakeShopIT.java | 2 +- .../example/cakeshop/it/SnapshotCakeShopIT.java | 2 +- .../services/example/cakeshop/it/SuspendIT.java | 2 +- .../example/cakeshop/it/UnifiedSearchIndexerIT.java | 2 +- .../example-query/example-query-api/pom.xml | 2 +- .../cakeshop/query/api/RecipesQueryApiTest.java | 2 +- .../example-query/example-query-view/pom.xml | 2 +- .../cakeshop/query/api/request/CakesQueryViewTest.java | 2 +- .../cakeshop/query/view/CakeOrdersQueryViewTest.java | 4 ++-- .../cakeshop/query/view/IndexQueryViewTest.java | 4 ++-- .../cakeshop/query/view/RecipesQueryViewTest.java | 2 +- .../query/view/service/CakeOrderServiceTest.java | 8 +++++--- .../cakeshop/query/view/service/CakeServiceTest.java | 4 ++-- .../cakeshop/query/view/service/IndexServiceTest.java | 6 +++--- .../cakeshop/query/view/service/RecipeServiceTest.java | 2 +- pom.xml | 6 +++--- 50 files changed, 73 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60ab4c5f..5a87b17d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,9 +22,13 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to - Handled the move to the new Cloudsmith.io maven repository - Updated slf4j/log4j bridge jar from slf4j-log4j12 to slf4j-reload4j - Added Artemis healthcheck -- Update common bom to 11.0.0-M19 in order to: +- Update common bom in order to: - Update jboss-logging version to 3.5.0.Final - Update jackson libraries to 2.12.7 + - Update mockito version to 4.11.0 + - Update slf4j version to 2.0.6 + - Update hamcrest version to 2.2 + -Update slf4j version to 2.0.6 ### Added - Added support for feature toggling with an integration test showing it working diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml index df77413e..501e4e31 100644 --- a/example-context/example-persistence/pom.xml +++ b/example-context/example-persistence/pom.xml @@ -43,7 +43,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-persistence/src/test/java/uk/gov/justice/services/example/cakeshop/persistence/CakeRepositoryIT.java b/example-context/example-persistence/src/test/java/uk/gov/justice/services/example/cakeshop/persistence/CakeRepositoryIT.java index d22e78c6..d94d85b8 100644 --- a/example-context/example-persistence/src/test/java/uk/gov/justice/services/example/cakeshop/persistence/CakeRepositoryIT.java +++ b/example-context/example-persistence/src/test/java/uk/gov/justice/services/example/cakeshop/persistence/CakeRepositoryIT.java @@ -1,9 +1,9 @@ package uk.gov.justice.services.example.cakeshop.persistence; import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import uk.gov.justice.services.example.cakeshop.persistence.entity.Cake; import uk.gov.justice.services.test.utils.persistence.BaseTransactionalTest; diff --git a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/MakeCakeCommandApiTest.java b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/MakeCakeCommandApiTest.java index 35ad4c9b..954cee39 100644 --- a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/MakeCakeCommandApiTest.java +++ b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/MakeCakeCommandApiTest.java @@ -2,8 +2,8 @@ import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; @@ -24,7 +24,7 @@ import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class MakeCakeCommandApiTest { diff --git a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/OrderCakeCommandApiTest.java b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/OrderCakeCommandApiTest.java index 598ecec6..24be6420 100644 --- a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/OrderCakeCommandApiTest.java +++ b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/OrderCakeCommandApiTest.java @@ -19,7 +19,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class OrderCakeCommandApiTest { diff --git a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/RecipeCommandApiTest.java b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/RecipeCommandApiTest.java index 271f3a12..44ea0beb 100644 --- a/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/RecipeCommandApiTest.java +++ b/example-context/example-service/example-command/example-command-api/src/test/java/uk/gov/justice/services/example/cakeshop/command/api/RecipeCommandApiTest.java @@ -26,7 +26,7 @@ import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; @RunWith(MockitoJUnitRunner.class) diff --git a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java index 6d959b19..f6b1cc9e 100644 --- a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java +++ b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.command.handler; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithDefaults; diff --git a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/MakeCakeCommandHandlerTest.java b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/MakeCakeCommandHandlerTest.java index 346df805..442796c1 100644 --- a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/MakeCakeCommandHandlerTest.java +++ b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/MakeCakeCommandHandlerTest.java @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class MakeCakeCommandHandlerTest { diff --git a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/OrderCakeCommandHandlerTest.java b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/OrderCakeCommandHandlerTest.java index 007f3aae..f1ed4403 100644 --- a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/OrderCakeCommandHandlerTest.java +++ b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/OrderCakeCommandHandlerTest.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class OrderCakeCommandHandlerTest { diff --git a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/RecipeCommandHandlerTest.java b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/RecipeCommandHandlerTest.java index c773e591..3b659b7c 100644 --- a/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/RecipeCommandHandlerTest.java +++ b/example-context/example-service/example-command/example-command-handler/src/test/java/uk/gov/justice/services/example/cakeshop/command/handler/RecipeCommandHandlerTest.java @@ -9,10 +9,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -46,7 +46,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipeCommandHandlerTest { diff --git a/example-context/example-service/example-custom/example-custom-api/pom.xml b/example-context/example-service/example-custom/example-custom-api/pom.xml index 94f50d5b..9e431b73 100644 --- a/example-context/example-service/example-custom/example-custom-api/pom.xml +++ b/example-context/example-service/example-custom/example-custom-api/pom.xml @@ -64,7 +64,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/OvenCustomApiTest.java b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/OvenCustomApiTest.java index 81ba898a..bd12a408 100644 --- a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/OvenCustomApiTest.java +++ b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/OvenCustomApiTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class OvenCustomApiTest { diff --git a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvenStatusTest.java b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvenStatusTest.java index e47aafff..f00bd3c6 100644 --- a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvenStatusTest.java +++ b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvenStatusTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.custom.api.response; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import java.util.UUID; diff --git a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvensStatusTest.java b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvensStatusTest.java index 12e49bb2..980cd13d 100644 --- a/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvensStatusTest.java +++ b/example-context/example-service/example-custom/example-custom-api/src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvensStatusTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.custom.api.response; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; import java.util.List; diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeMadeEventListenerTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeMadeEventListenerTest.java index 339ae811..417190f2 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeMadeEventListenerTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeMadeEventListenerTest.java @@ -7,15 +7,12 @@ import uk.gov.justice.services.example.cakeshop.persistence.CakeRepository; import uk.gov.justice.services.example.cakeshop.persistence.entity.Cake; import uk.gov.justice.services.messaging.Envelope; -import uk.gov.justice.services.messaging.Metadata; - -import java.util.Optional; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakeMadeEventListenerTest { @@ -32,9 +29,6 @@ public void shouldSaveCake() { final Envelope envelope = mock(Envelope.class); final Cake cake = mock(Cake.class); when(envelope.payload()).thenReturn(cake); - final Metadata metadata = mock(Metadata.class); - when(envelope.metadata()).thenReturn(metadata); - when(metadata.streamId()).thenReturn(Optional.empty()); cakeMadeEventListener.handle(envelope); verify(cakeRepository).save(cake); diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeOrderedEventListenerTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeOrderedEventListenerTest.java index eaaee146..2cccaa5a 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeOrderedEventListenerTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/CakeOrderedEventListenerTest.java @@ -16,7 +16,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakeOrderedEventListenerTest { diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/RecipeEventListenerTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/RecipeEventListenerTest.java index 75891367..4ec694bf 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/RecipeEventListenerTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/RecipeEventListenerTest.java @@ -3,7 +3,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipeEventListenerTest { diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToIngredientsConverterTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToIngredientsConverterTest.java index 2da9c11d..c705a291 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToIngredientsConverterTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToIngredientsConverterTest.java @@ -14,7 +14,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipeAddedToIngredientsConverterTest { diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToRecipeConverterTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToRecipeConverterTest.java index 88951f06..f2f9e7ad 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToRecipeConverterTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/converter/RecipeAddedToRecipeConverterTest.java @@ -13,7 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipeAddedToRecipeConverterTest { diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/interceptor/ExceptionThrowingInterceptorTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/interceptor/ExceptionThrowingInterceptorTest.java index 25a2e58a..2300d13f 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/interceptor/ExceptionThrowingInterceptorTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/interceptor/ExceptionThrowingInterceptorTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ExceptionThrowingInterceptorTest { diff --git a/example-context/example-service/example-feature-control/pom.xml b/example-context/example-service/example-feature-control/pom.xml index 0031b041..3c63f3f1 100644 --- a/example-context/example-service/example-feature-control/pom.xml +++ b/example-context/example-service/example-feature-control/pom.xml @@ -39,7 +39,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-service/example-healthcheck/pom.xml b/example-context/example-service/example-healthcheck/pom.xml index 01bbbcdc..ce57572b 100644 --- a/example-context/example-service/example-healthcheck/pom.xml +++ b/example-context/example-service/example-healthcheck/pom.xml @@ -41,7 +41,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-service/example-healthcheck/src/main/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProvider.java b/example-context/example-service/example-healthcheck/src/main/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProvider.java index e1100cf3..1533d1bb 100644 --- a/example-context/example-service/example-healthcheck/src/main/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProvider.java +++ b/example-context/example-service/example-healthcheck/src/main/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProvider.java @@ -4,7 +4,6 @@ import static uk.gov.justice.services.healthcheck.healthchecks.JobStoreHealthcheck.JOB_STORE_HEALTHCHECK_NAME; import uk.gov.justice.services.healthcheck.api.DefaultIgnoredHealthcheckNamesProvider; -import uk.gov.justice.services.healthcheck.healthchecks.JobStoreHealthcheck; import java.util.List; diff --git a/example-context/example-service/example-healthcheck/src/test/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProviderTest.java b/example-context/example-service/example-healthcheck/src/test/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProviderTest.java index 027ad836..972aba0f 100644 --- a/example-context/example-service/example-healthcheck/src/test/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProviderTest.java +++ b/example-context/example-service/example-healthcheck/src/test/java/uk/gov/justice/services/example/cakeshop/healthcheck/CakeShopIgnoredHealthcheckNamesProviderTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakeShopIgnoredHealthcheckNamesProviderTest { diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml index 6cf6a5ca..3a61d89e 100644 --- a/example-context/example-service/example-it/pom.xml +++ b/example-context/example-service/example-it/pom.xml @@ -88,11 +88,11 @@ event-buffer-core test - - org.exparity - hamcrest-date - test - + + + + + uk.gov.justice.services file-service-api diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java index 4118e07f..149f5b6c 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java @@ -1,11 +1,11 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.randomUUID; import static javax.json.Json.createArrayBuilder; import static javax.json.Json.createObjectBuilder; import static javax.ws.rs.client.Entity.entity; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java index 9e65b478..d251c04e 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java @@ -1,11 +1,11 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static javax.ws.rs.client.Entity.entity; -import static org.hamcrest.core.Is.is; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopMediaTypes.ADD_RECIPE_MEDIA_TYPE; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopMediaTypes.CONTEXT_NAME; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopUris.RECIPES_RESOURCE_URI; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java index ac2b5d91..3c3fffe2 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java @@ -1,6 +1,5 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -11,6 +10,7 @@ import static javax.ws.rs.core.Response.Status.BAD_REQUEST; import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopMediaTypes.ADD_RECIPE_MEDIA_TYPE; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java index 41af6abd..ffeaff0b 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java @@ -1,7 +1,6 @@ package uk.gov.justice.services.example.cakeshop.it; import static com.google.common.io.Resources.getResource; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.lang.String.format; import static java.util.UUID.randomUUID; @@ -12,6 +11,7 @@ import static org.apache.commons.io.IOUtils.contentEquals; import static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM; import static org.apache.http.entity.mime.HttpMultipartMode.BROWSER_COMPATIBLE; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java index 00a4779e..6bc24387 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java @@ -1,12 +1,12 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.emptyCollection; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsCollectionContaining.hasItem; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java index c273ef44..b5cddfe4 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java @@ -1,6 +1,5 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; @@ -9,6 +8,7 @@ import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java index 57f4780e..2c81c9b6 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java @@ -1,14 +1,12 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; -import static java.time.temporal.ChronoUnit.SECONDS; import static java.util.UUID.randomUUID; import static javax.json.Json.createObjectBuilder; import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; -import static org.exparity.hamcrest.date.ZonedDateTimeMatchers.within; +import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -101,6 +99,6 @@ public void shouldSetDateCreatedTimestampInEventStore() { final Event event = events.findFirst().get(); assertThat(event.getCreatedAt(), is(notNullValue())); - assertThat(event.getCreatedAt(), is(within(10L, SECONDS, new UtcClock().now()))); + assertThat(event.getCreatedAt().isAfter(new UtcClock().now().minusSeconds(10)), is(true)); } } diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java index 61925fce..287c5c2e 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java @@ -1,7 +1,6 @@ package uk.gov.justice.services.example.cakeshop.it; import static java.lang.Integer.parseInt; -import static java.lang.Integer.valueOf; import static java.lang.String.format; import static java.lang.System.getProperty; import static java.util.Optional.empty; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java index 359c0079..08008f9f 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java @@ -1,8 +1,8 @@ package uk.gov.justice.services.example.cakeshop.it; import static com.jayway.jsonassert.JsonAssert.with; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopUris.HEALTHCHECK_URI; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java index 56dfaec0..ffd71d3a 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java @@ -1,12 +1,12 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; import static javax.json.Json.createArrayBuilder; import static javax.json.Json.createObjectBuilder; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsCollectionContaining.hasItem; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java index f1f68b0a..6c6f71df 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java @@ -1,8 +1,8 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.randomUUID; +import static org.awaitility.Awaitility.await; import static org.hamcrest.core.IsCollectionContaining.hasItem; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java index 910732b8..411f3be8 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java @@ -1,6 +1,5 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.lang.Integer.parseInt; import static java.lang.String.format; @@ -12,6 +11,7 @@ import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.OK; import static junit.framework.TestCase.fail; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsCollectionContaining.hasItem; import static org.slf4j.LoggerFactory.getLogger; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java index 3d36557b..b28cb7bc 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java @@ -1,12 +1,12 @@ package uk.gov.justice.services.example.cakeshop.it; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.randomUUID; import static javax.json.Json.createObjectBuilder; import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopMediaTypes.ORDER_CAKE_MEDIA_TYPE; diff --git a/example-context/example-service/example-query/example-query-api/pom.xml b/example-context/example-service/example-query/example-query-api/pom.xml index d8e8fe9c..a77673f8 100644 --- a/example-context/example-service/example-query/example-query-api/pom.xml +++ b/example-context/example-service/example-query/example-query-api/pom.xml @@ -68,7 +68,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/RecipesQueryApiTest.java b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/RecipesQueryApiTest.java index 22ea5482..6e5d06c4 100644 --- a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/RecipesQueryApiTest.java +++ b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/RecipesQueryApiTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.query.api; -import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; diff --git a/example-context/example-service/example-query/example-query-view/pom.xml b/example-context/example-service/example-query/example-query-view/pom.xml index f4a181fb..67160d5e 100644 --- a/example-context/example-service/example-query/example-query-view/pom.xml +++ b/example-context/example-service/example-query/example-query-view/pom.xml @@ -57,7 +57,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/request/CakesQueryViewTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/request/CakesQueryViewTest.java index aa86b2f2..46a3da00 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/request/CakesQueryViewTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/request/CakesQueryViewTest.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakesQueryViewTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/CakeOrdersQueryViewTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/CakeOrdersQueryViewTest.java index 0636b6a6..9aed9d43 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/CakeOrdersQueryViewTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/CakeOrdersQueryViewTest.java @@ -1,8 +1,8 @@ package uk.gov.justice.services.example.cakeshop.query.view; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakeOrdersQueryViewTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/IndexQueryViewTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/IndexQueryViewTest.java index 293660d2..0ea40e61 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/IndexQueryViewTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/IndexQueryViewTest.java @@ -1,8 +1,8 @@ package uk.gov.justice.services.example.cakeshop.query.view; import static java.util.UUID.randomUUID; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class IndexQueryViewTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/RecipesQueryViewTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/RecipesQueryViewTest.java index 84ff2cc4..799d2ced 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/RecipesQueryViewTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/RecipesQueryViewTest.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipesQueryViewTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeOrderServiceTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeOrderServiceTest.java index 343e9a94..afdeabce 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeOrderServiceTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeOrderServiceTest.java @@ -1,10 +1,10 @@ package uk.gov.justice.services.example.cakeshop.query.view.service; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import uk.gov.justice.services.example.cakeshop.persistence.CakeOrderRepository; @@ -18,7 +18,9 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; + +; @RunWith(MockitoJUnitRunner.class) public class CakeOrderServiceTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeServiceTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeServiceTest.java index c33ad103..bce7a4c7 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeServiceTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeServiceTest.java @@ -2,8 +2,8 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; import uk.gov.justice.services.example.cakeshop.persistence.CakeRepository; @@ -16,7 +16,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CakeServiceTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/IndexServiceTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/IndexServiceTest.java index cf46c44a..8f10873b 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/IndexServiceTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/IndexServiceTest.java @@ -2,10 +2,10 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import uk.gov.justice.services.example.cakeshop.persistence.IndexRepository; @@ -19,7 +19,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class IndexServiceTest { diff --git a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/RecipeServiceTest.java b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/RecipeServiceTest.java index ca2bfaaf..68340b43 100644 --- a/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/RecipeServiceTest.java +++ b/example-context/example-service/example-query/example-query-view/src/test/java/uk/gov/justice/services/example/cakeshop/query/view/service/RecipeServiceTest.java @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class RecipeServiceTest { diff --git a/pom.xml b/pom.xml index f56570b6..71f452ee 100644 --- a/pom.xml +++ b/pom.xml @@ -34,9 +34,9 @@ 26.1.2.Final 3.2.0.Final - 11.0.0-M27 - 11.0.0-M28 - 11.0.0-M29 + 11.0.0-M29 + 11.0.0-M31 + 11.0.0-M32