From efd35cf1c9d2ab6224b9d924c949a5d637908546 Mon Sep 17 00:00:00 2001 From: amckenzie Date: Tue, 17 Nov 2020 10:05:24 +0000 Subject: [PATCH] Remove to depcrecated junit assertThat(...) --- .../example/cakeshop/persistence/CakeRepositoryIT.java | 2 +- .../example/cakeshop/command/api/MakeCakeCommandApiTest.java | 2 +- .../example/cakeshop/command/api/OrderCakeCommandApiTest.java | 2 +- .../example/cakeshop/command/api/RecipeCommandApiTest.java | 3 +-- .../example/cakeshop/command/handler/EventFactoryTest.java | 2 +- .../example/cakeshop/custom/api/OvenCustomApiTest.java | 2 +- .../example/cakeshop/custom/api/response/OvenStatusTest.java | 2 +- .../example/cakeshop/custom/api/response/OvensStatusTest.java | 2 +- .../converter/RecipeAddedToIngredientsConverterTest.java | 2 +- .../listener/converter/RecipeAddedToRecipeConverterTest.java | 2 +- .../ExampleEventListenerInterceptorChainProviderTest.java | 2 +- .../services/example/cakeshop/it/CakeShopEventBufferingIT.java | 2 +- .../services/example/cakeshop/it/CatchupPerformanceIT.java | 2 +- .../justice/services/example/cakeshop/it/EventHealingIT.java | 2 +- .../services/example/cakeshop/it/EventValidationIT.java | 2 +- .../services/example/cakeshop/it/ListSystemCommandsIT.java | 3 +-- .../uk/gov/justice/services/example/cakeshop/it/RebuildIT.java | 2 +- .../example/cakeshop/query/api/CakeOrdersQueryApiTest.java | 2 +- .../services/example/cakeshop/query/api/CakesQueryApiTest.java | 2 +- .../services/example/cakeshop/query/api/IndexQueryApiTest.java | 2 +- .../example/cakeshop/query/api/RecipesQueryApiTest.java | 2 +- .../example/cakeshop/query/api/request/CakesQueryViewTest.java | 2 +- .../example/cakeshop/query/view/CakeOrdersQueryViewTest.java | 2 +- .../example/cakeshop/query/view/IndexQueryViewTest.java | 2 +- .../example/cakeshop/query/view/RecipesQueryViewTest.java | 2 +- .../cakeshop/query/view/service/CakeOrderServiceTest.java | 2 +- .../example/cakeshop/query/view/service/CakeServiceTest.java | 2 +- .../example/cakeshop/query/view/service/IndexServiceTest.java | 2 +- 28 files changed, 28 insertions(+), 30 deletions(-) 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 eb824198..d22e78c6 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 @@ -3,7 +3,7 @@ import static java.util.UUID.randomUUID; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +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 3ad791d3..35ad4c9b 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 @@ -3,7 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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; 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 0abf948e..598ecec6 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 @@ -2,7 +2,7 @@ import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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; 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 221dd41a..271f3a12 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 @@ -3,7 +3,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.List; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; 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 fbbdfddc..ea3ff4e4 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.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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-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 6cca7065..81ba898a 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 @@ -3,7 +3,7 @@ import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isCustomHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; 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 b3c905c3..e47aafff 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.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 3d520945..12e49bb2 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.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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/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 370aa5b7..2da9c11d 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 @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.event.listener.converter; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import uk.gov.justice.services.example.cakeshop.domain.event.RecipeAdded; 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 54973ab3..88951f06 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 @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.event.listener.converter; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import uk.gov.justice.services.example.cakeshop.domain.Ingredient; import uk.gov.justice.services.example.cakeshop.domain.event.RecipeAdded; diff --git a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/provider/ExampleEventListenerInterceptorChainProviderTest.java b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/provider/ExampleEventListenerInterceptorChainProviderTest.java index d5b554ca..a8722209 100644 --- a/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/provider/ExampleEventListenerInterceptorChainProviderTest.java +++ b/example-context/example-service/example-event/example-event-listener/src/test/java/uk/gov/justice/services/example/cakeshop/event/listener/provider/ExampleEventListenerInterceptorChainProviderTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.event.listener.provider; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import uk.gov.justice.services.core.interceptor.InterceptorChainEntry; 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 9aa524a4..77c217af 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 @@ -5,7 +5,7 @@ import static java.util.UUID.randomUUID; import static javax.ws.rs.client.Entity.entity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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/CatchupPerformanceIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java index 1eda242d..3d9056d0 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 @@ -6,7 +6,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; import static uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand.CATCHUP; import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java index bdd99834..d0662907 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java @@ -8,7 +8,7 @@ import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; import static uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand.CATCHUP; 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/EventValidationIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java index 0360882c..32f9442b 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java @@ -6,7 +6,7 @@ import static java.util.Optional.of; import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_COMPLETE; import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_FAILED; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java index 27f5fe27..0e400ea0 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java @@ -5,7 +5,7 @@ import static java.util.stream.Collectors.toMap; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.eventstore.management.commands.AddTriggerCommand.ADD_TRIGGER; import static uk.gov.justice.services.eventstore.management.commands.DisablePublishingCommand.DISABLE_PUBLISHING; import static uk.gov.justice.services.eventstore.management.commands.EnablePublishingCommand.ENABLE_PUBLISHING; @@ -27,7 +27,6 @@ import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient; import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory; import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters; -import uk.gov.justice.services.management.suspension.commands.RefreshFeatureControlCacheCommand; import java.util.List; import java.util.Map; diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java index 8cb11f31..d90a492f 100644 --- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java +++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java @@ -8,7 +8,7 @@ import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; import static uk.gov.justice.services.eventstore.management.commands.RebuildCommand.REBUILD; import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters; diff --git a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakeOrdersQueryApiTest.java b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakeOrdersQueryApiTest.java index 99ae5e71..76369f11 100644 --- a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakeOrdersQueryApiTest.java +++ b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakeOrdersQueryApiTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.services.example.cakeshop.query.api; -import static org.junit.Assert.assertThat; +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; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; diff --git a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakesQueryApiTest.java b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakesQueryApiTest.java index 28448a40..ce4392aa 100644 --- a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakesQueryApiTest.java +++ b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakesQueryApiTest.java @@ -1,6 +1,6 @@ package uk.gov.justice.services.example.cakeshop.query.api; -import static org.junit.Assert.assertThat; +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; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; diff --git a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/IndexQueryApiTest.java b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/IndexQueryApiTest.java index fb58f29c..a743e662 100644 --- a/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/IndexQueryApiTest.java +++ b/example-context/example-service/example-query/example-query-api/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/IndexQueryApiTest.java @@ -1,6 +1,6 @@ package uk.gov.justice.services.example.cakeshop.query.api; -import static org.junit.Assert.assertThat; +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; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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 7e28df35..22ea5482 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 @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.allOf; -import static org.junit.Assert.assertThat; +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; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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 f101973b..aa86b2f2 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 @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; 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 e191c03a..0636b6a6 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 @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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; 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 3006ce53..293660d2 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 @@ -2,7 +2,7 @@ import static java.util.UUID.randomUUID; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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; 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 aa725953..df97da4b 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 @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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; 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 2bcf51d0..343e9a94 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 @@ -3,7 +3,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; 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 ea6bb633..c33ad103 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 @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import uk.gov.justice.services.example.cakeshop.persistence.CakeRepository; 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 d4aed067..cf46c44a 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 @@ -4,7 +4,7 @@ import static java.util.UUID.randomUUID; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when;