Remove to depcrecated junit assertThat(...)

CJSCommonPlatform · Nov 17, 2020 · efd35cf · efd35cf
1 parent 9ba1b21
commit efd35cf
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 30 deletions.
diff --git a/.../src/test/java/uk/gov/justice/services/example/cakeshop/persistence/CakeRepositoryIT.java b/.../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/...est/java/uk/gov/justice/services/example/cakeshop/command/api/MakeCakeCommandApiTest.java b/...est/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/...st/java/uk/gov/justice/services/example/cakeshop/command/api/OrderCakeCommandApiTest.java b/...st/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/.../test/java/uk/gov/justice/services/example/cakeshop/command/api/RecipeCommandApiTest.java b/.../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/.../test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java b/.../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/.../src/test/java/uk/gov/justice/services/example/cakeshop/custom/api/OvenCustomApiTest.java b/.../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/...est/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvenStatusTest.java b/...est/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/...st/java/uk/gov/justice/services/example/cakeshop/custom/api/response/OvensStatusTest.java b/...st/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/...ices/example/cakeshop/event/listener/converter/RecipeAddedToIngredientsConverterTest.java b/...ices/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/.../services/example/cakeshop/event/listener/converter/RecipeAddedToRecipeConverterTest.java b/.../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/...le/cakeshop/event/listener/provider/ExampleEventListenerInterceptorChainProviderTest.java b/...le/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/...t/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java b/...t/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/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java b/...le-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-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java b/.../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/...ample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java b/...ample-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/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java b/...le-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/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/...rvice/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/.../test/java/uk/gov/justice/services/example/cakeshop/query/api/CakeOrdersQueryApiTest.java b/.../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/...i/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/CakesQueryApiTest.java b/...i/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/...i/src/test/java/uk/gov/justice/services/example/cakeshop/query/api/IndexQueryApiTest.java b/...i/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/...src/test/java/uk/gov/justice/services/example/cakeshop/query/api/RecipesQueryApiTest.java b/...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/...t/java/uk/gov/justice/services/example/cakeshop/query/api/request/CakesQueryViewTest.java b/...t/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/...est/java/uk/gov/justice/services/example/cakeshop/query/view/CakeOrdersQueryViewTest.java b/...est/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/...src/test/java/uk/gov/justice/services/example/cakeshop/query/view/IndexQueryViewTest.java b/...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/...c/test/java/uk/gov/justice/services/example/cakeshop/query/view/RecipesQueryViewTest.java b/...c/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/...ava/uk/gov/justice/services/example/cakeshop/query/view/service/CakeOrderServiceTest.java b/...ava/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/...est/java/uk/gov/justice/services/example/cakeshop/query/view/service/CakeServiceTest.java b/...est/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/...st/java/uk/gov/justice/services/example/cakeshop/query/view/service/IndexServiceTest.java b/...st/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;