From 5775b737afea3be0a19087316a73966094df0d29 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Sun, 23 Mar 2014 20:09:42 +0100 Subject: [PATCH] Migrate from FEST 2 to AssertJ, fixes #493 In the future assertj-joda-time (http://joel-costigliola.github.io/assertj/assertj-joda-time.html) and assertj-guava (http://joel-costigliola.github.io/assertj/assertj-guava.html) might also come in handy for writing more concise tests for Dropwizard (which is using both, JodaTime and Google Guava). --- docs/source/manual/testing.rst | 12 ++++++------ .../java/io/dropwizard/assets/AssetsBundleTest.java | 2 +- .../io/dropwizard/auth/CachingAuthenticatorTest.java | 2 +- .../dropwizard/auth/basic/BasicAuthProviderTest.java | 4 ++-- .../dropwizard/auth/basic/BasicCredentialsTest.java | 2 +- .../io/dropwizard/auth/oauth/OAuthProviderTest.java | 4 ++-- .../io/dropwizard/client/HttpClientBuilderTest.java | 2 +- .../dropwizard/client/JerseyClientBuilderTest.java | 4 ++-- .../ConfigurationFactoryFactoryTest.java | 2 +- .../configuration/ConfigurationFactoryTest.java | 6 +++--- .../ConfigurationValidationExceptionTest.java | 2 +- .../FileConfigurationSourceProviderTest.java | 2 +- .../UrlConfigurationSourceProviderTest.java | 2 +- .../src/test/java/io/dropwizard/ApplicationTest.java | 2 +- .../test/java/io/dropwizard/ConfigurationTest.java | 2 +- .../java/io/dropwizard/cli/CheckCommandTest.java | 2 +- .../src/test/java/io/dropwizard/cli/CliTest.java | 2 +- .../java/io/dropwizard/cli/ServerCommandTest.java | 4 ++-- .../dropwizard/server/DefaultServerFactoryTest.java | 2 +- .../dropwizard/server/SimpleServerFactoryTest.java | 2 +- .../io/dropwizard/setup/AdminEnvironmentTest.java | 2 +- .../test/java/io/dropwizard/setup/BootstrapTest.java | 2 +- .../java/io/dropwizard/db/DataSourceFactoryTest.java | 2 +- .../dropwizard/db/ManagedPooledDataSourceTest.java | 4 ++-- .../io/dropwizard/hibernate/AbstractDAOTest.java | 2 +- .../io/dropwizard/hibernate/HibernateBundleTest.java | 2 +- .../dropwizard/hibernate/JerseyIntegrationTest.java | 4 ++-- .../hibernate/SessionFactoryFactoryTest.java | 2 +- .../hibernate/SessionFactoryHealthCheckTest.java | 2 +- .../hibernate/UnitOfWorkRequestDispatcherTest.java | 4 ++-- .../UnitOfWorkResourceMethodDispatchAdapterTest.java | 2 +- ...UnitOfWorkResourceMethodDispatchProviderTest.java | 2 +- .../java/io/dropwizard/hibernate/UnitOfWorkTest.java | 2 +- ...nnotationSensitivePropertyNamingStrategyTest.java | 2 +- .../jackson/DiscoverableSubtypeResolverTest.java | 2 +- .../io/dropwizard/jackson/FuzzyEnumModuleTest.java | 4 ++-- .../io/dropwizard/jackson/GuavaExtrasModuleTest.java | 2 +- .../io/dropwizard/jackson/LogbackModuleTest.java | 2 +- .../src/test/java/io/dropwizard/jdbi/JDBITest.java | 2 +- .../jersey/DropwizardResourceConfigTest.java | 2 +- ...eControlledResourceMethodDispatchAdapterTest.java | 2 +- .../jersey/errors/LoggingExceptionMapperTest.java | 4 ++-- .../OptionalQueryParamInjectableProviderTest.java | 2 +- .../OptionalResourceMethodDispatchAdapterTest.java | 4 ++-- .../jackson/JacksonMessageBodyProviderTest.java | 4 ++-- .../jackson/JsonProcessingExceptionMapperTest.java | 4 ++-- .../dropwizard/jersey/params/BooleanParamTest.java | 4 ++-- .../dropwizard/jersey/params/DateTimeParamTest.java | 2 +- .../io/dropwizard/jersey/params/IntParamTest.java | 4 ++-- .../io/dropwizard/jersey/params/LongParamTest.java | 4 ++-- .../io/dropwizard/jersey/params/UUIDParamTest.java | 4 ++-- .../jersey/sessions/FlashProviderTest.java | 2 +- .../jersey/sessions/HttpSessionProviderTest.java | 2 +- .../ConstraintViolationExceptionMapperTest.java | 4 ++-- .../io/dropwizard/jetty/GzipFilterFactoryTest.java | 2 +- .../dropwizard/jetty/HttpConnectorFactoryTest.java | 2 +- .../dropwizard/jetty/HttpsConnectorFactoryTest.java | 2 +- .../jetty/MutableServletContextHandlerTest.java | 2 +- .../jetty/NonblockingServletHolderTest.java | 2 +- .../io/dropwizard/jetty/RequestLogFactoryTest.java | 2 +- .../java/io/dropwizard/jetty/RoutingHandlerTest.java | 2 +- .../io/dropwizard/jetty/Slf4jRequestLogTest.java | 2 +- .../jetty/setup/ServletEnvironmentTest.java | 2 +- .../lifecycle/setup/LifecycleEnvironmentTest.java | 2 +- .../logging/ConsoleAppenderFactoryTest.java | 2 +- .../io/dropwizard/logging/DropwizardLayoutTest.java | 2 +- .../dropwizard/logging/FileAppenderFactoryTest.java | 2 +- .../io/dropwizard/logging/LoggingFactoryTest.java | 2 +- .../PrefixedExtendedThrowableProxyConverterTest.java | 2 +- ...xedRootCauseFirstThrowableProxyConverterTest.java | 2 +- .../logging/PrefixedThrowableProxyConverterTest.java | 2 +- .../logging/SyslogAppenderFactoryTest.java | 2 +- .../metrics/ganglia/GangliaReporterFactoryTest.java | 2 +- .../graphite/GraphiteReporterFactoryTest.java | 2 +- .../metrics/ConsoleReporterFactoryTest.java | 2 +- .../dropwizard/metrics/CsvReporterFactoryTest.java | 2 +- .../io/dropwizard/metrics/MetricsFactoryTest.java | 2 +- .../dropwizard/metrics/Slf4jReporterFactoryTest.java | 2 +- .../java/io/dropwizard/servlets/ServletsTest.java | 2 +- .../dropwizard/servlets/assets/AssetServletTest.java | 2 +- .../dropwizard/servlets/assets/ResourceURLTest.java | 4 ++-- .../java/io/dropwizard/servlets/tasks/TaskTest.java | 2 +- .../dropwizard/spdy/NonePushStrategyFactoryTest.java | 2 +- .../spdy/ReferrerPushStrategyFactoryTest.java | 2 +- .../dropwizard/spdy/Spdy3ConnectorFactoryTest.java | 2 +- dropwizard-testing/pom.xml | 6 +++--- .../io/dropwizard/testing/FixtureHelpersTest.java | 2 +- .../testing/app/GzipDefaultVaryBehaviourTest.java | 2 +- .../dropwizard/testing/app/PersonResourceTest.java | 2 +- .../test/java/io/dropwizard/util/DurationTest.java | 2 +- .../java/io/dropwizard/util/JarLocationTest.java | 2 +- .../src/test/java/io/dropwizard/util/SizeTest.java | 2 +- .../test/java/io/dropwizard/util/SizeUnitTest.java | 2 +- .../dropwizard/validation/DurationValidatorTest.java | 2 +- .../dropwizard/validation/MethodValidatorTest.java | 2 +- .../io/dropwizard/validation/OneOfValidatorTest.java | 2 +- .../validation/PortRangeValidatorTest.java | 2 +- .../io/dropwizard/validation/SizeValidatorTest.java | 2 +- .../OptionalValidatedValueUnwrapperTest.java | 2 +- .../views/freemarker/FreemarkerViewRendererTest.java | 2 +- .../views/mustache/MustacheViewRendererTest.java | 2 +- .../src/test/java/io/dropwizard/views/ViewTest.java | 2 +- pom.xml | 6 +++--- 103 files changed, 132 insertions(+), 132 deletions(-) diff --git a/docs/source/manual/testing.rst b/docs/source/manual/testing.rst index 6e5a5482972..9a55dfaa89a 100644 --- a/docs/source/manual/testing.rst +++ b/docs/source/manual/testing.rst @@ -89,7 +89,7 @@ Next, write a test for serializing a ``Person`` instance to JSON: .. code-block:: java import static io.dropwizard.testing.FixtureHelpers.*; - import static org.fest.assertions.api.Assertions.assertThat; + import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.jackson.Jackson; import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; @@ -106,11 +106,11 @@ Next, write a test for serializing a ``Person`` instance to JSON: } } -This test uses `FEST matchers`_ and JUnit_ to test that when a ``Person`` instance is serialized +This test uses `AssertJ assertions`_ and JUnit_ to test that when a ``Person`` instance is serialized via Jackson it matches the JSON in the fixture file. (The comparison is done via a normalized JSON string representation, so whitespace doesn't affect the results.) -.. _FEST matchers: https://code.google.com/p/fest/ +.. _AssertJ assertions: http://assertj.org/assertj-core-conditions.html .. _JUnit: http://www.junit.org/ .. _man-testing-representations-deserialization: @@ -123,7 +123,7 @@ Next, write a test for deserializing a ``Person`` instance from JSON: .. code-block:: java import static io.dropwizard.testing.FixtureHelpers.*; - import static org.fest.assertions.api.Assertions.assertThat; + import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.jackson.Jackson; import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; @@ -141,7 +141,7 @@ Next, write a test for deserializing a ``Person`` instance from JSON: } -This test uses `FEST matchers`_ and JUnit_ to test that when a ``Person`` instance is +This test uses `AssertJ assertions`_ and JUnit_ to test that when a ``Person`` instance is deserialized via Jackson from the specified JSON fixture it matches the given object. .. _man-testing-resources: @@ -157,7 +157,7 @@ loads a given resource instance in an in-memory Jersey server: .. code-block:: java - import static org.fest.assertions.api.Assertions.assertThat; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class PersonResourceTest { diff --git a/dropwizard-assets/src/test/java/io/dropwizard/assets/AssetsBundleTest.java b/dropwizard-assets/src/test/java/io/dropwizard/assets/AssetsBundleTest.java index 88df15c8ee7..edc4a8058ef 100644 --- a/dropwizard-assets/src/test/java/io/dropwizard/assets/AssetsBundleTest.java +++ b/dropwizard-assets/src/test/java/io/dropwizard/assets/AssetsBundleTest.java @@ -12,7 +12,7 @@ import javax.servlet.ServletRegistration; import java.net.URL; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class AssetsBundleTest { diff --git a/dropwizard-auth/src/test/java/io/dropwizard/auth/CachingAuthenticatorTest.java b/dropwizard-auth/src/test/java/io/dropwizard/auth/CachingAuthenticatorTest.java index 64d5e48f839..c45d7c872f4 100644 --- a/dropwizard-auth/src/test/java/io/dropwizard/auth/CachingAuthenticatorTest.java +++ b/dropwizard-auth/src/test/java/io/dropwizard/auth/CachingAuthenticatorTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.mockito.InOrder; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class CachingAuthenticatorTest { diff --git a/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicAuthProviderTest.java b/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicAuthProviderTest.java index 1811bd55f33..bd24d1db8b4 100644 --- a/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicAuthProviderTest.java +++ b/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicAuthProviderTest.java @@ -19,8 +19,8 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class BasicAuthProviderTest extends JerseyTest { diff --git a/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java b/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java index 949b7ac761b..0d32d0d674e 100644 --- a/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java +++ b/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class BasicCredentialsTest { private final BasicCredentials credentials = new BasicCredentials("u", "p"); diff --git a/dropwizard-auth/src/test/java/io/dropwizard/auth/oauth/OAuthProviderTest.java b/dropwizard-auth/src/test/java/io/dropwizard/auth/oauth/OAuthProviderTest.java index 4ce1d632978..46244356669 100644 --- a/dropwizard-auth/src/test/java/io/dropwizard/auth/oauth/OAuthProviderTest.java +++ b/dropwizard-auth/src/test/java/io/dropwizard/auth/oauth/OAuthProviderTest.java @@ -19,8 +19,8 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class OAuthProviderTest extends JerseyTest { static { diff --git a/dropwizard-client/src/test/java/io/dropwizard/client/HttpClientBuilderTest.java b/dropwizard-client/src/test/java/io/dropwizard/client/HttpClientBuilderTest.java index 01d2b9513e4..4a61c5812aa 100644 --- a/dropwizard-client/src/test/java/io/dropwizard/client/HttpClientBuilderTest.java +++ b/dropwizard-client/src/test/java/io/dropwizard/client/HttpClientBuilderTest.java @@ -32,7 +32,7 @@ import java.io.IOException; import java.lang.reflect.Field; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientBuilderTest.java b/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientBuilderTest.java index f8f3523693a..02e6f79fc22 100644 --- a/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientBuilderTest.java +++ b/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientBuilderTest.java @@ -25,8 +25,8 @@ import java.lang.reflect.Type; import java.util.concurrent.ExecutorService; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.*; public class JerseyClientBuilderTest { diff --git a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryFactoryTest.java b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryFactoryTest.java index 92423beec06..c8bf8bbe54e 100644 --- a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryFactoryTest.java +++ b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryFactoryTest.java @@ -1,6 +1,6 @@ package io.dropwizard.configuration; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.configuration.ConfigurationFactoryTest.Example; import io.dropwizard.jackson.Jackson; diff --git a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryTest.java b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryTest.java index 3a89837df8b..e02e48341c2 100644 --- a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryTest.java +++ b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationFactoryTest.java @@ -5,7 +5,7 @@ import com.google.common.collect.Maps; import com.google.common.io.Resources; import io.dropwizard.jackson.Jackson; -import org.fest.assertions.data.MapEntry; +import org.assertj.core.data.MapEntry; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -17,8 +17,8 @@ import java.io.File; import java.util.*; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class ConfigurationFactoryTest { diff --git a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationValidationExceptionTest.java b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationValidationExceptionTest.java index e5561b84584..39a62d70da8 100644 --- a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationValidationExceptionTest.java +++ b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/ConfigurationValidationExceptionTest.java @@ -10,7 +10,7 @@ import java.util.Locale; import java.util.Set; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assume.assumeThat; diff --git a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/FileConfigurationSourceProviderTest.java b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/FileConfigurationSourceProviderTest.java index 47966c6b205..145d45127c8 100644 --- a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/FileConfigurationSourceProviderTest.java +++ b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/FileConfigurationSourceProviderTest.java @@ -7,7 +7,7 @@ import java.io.InputStream; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class FileConfigurationSourceProviderTest { private final ConfigurationSourceProvider provider = new FileConfigurationSourceProvider(); diff --git a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/UrlConfigurationSourceProviderTest.java b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/UrlConfigurationSourceProviderTest.java index a003aca9304..daab62e5e54 100644 --- a/dropwizard-configuration/src/test/java/io/dropwizard/configuration/UrlConfigurationSourceProviderTest.java +++ b/dropwizard-configuration/src/test/java/io/dropwizard/configuration/UrlConfigurationSourceProviderTest.java @@ -7,7 +7,7 @@ import java.io.InputStream; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class UrlConfigurationSourceProviderTest { private final ConfigurationSourceProvider provider = new UrlConfigurationSourceProvider(); diff --git a/dropwizard-core/src/test/java/io/dropwizard/ApplicationTest.java b/dropwizard-core/src/test/java/io/dropwizard/ApplicationTest.java index 0e7328a534d..db93b99e3bf 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/ApplicationTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/ApplicationTest.java @@ -4,7 +4,7 @@ import io.dropwizard.setup.Environment; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ApplicationTest { private static class FakeConfiguration extends Configuration {} diff --git a/dropwizard-core/src/test/java/io/dropwizard/ConfigurationTest.java b/dropwizard-core/src/test/java/io/dropwizard/ConfigurationTest.java index 07e39af0dfe..1fd6585cd81 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/ConfigurationTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/ConfigurationTest.java @@ -7,7 +7,7 @@ import io.dropwizard.logging.AppenderFactory; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ConfigurationTest { private final Configuration configuration = new Configuration(); diff --git a/dropwizard-core/src/test/java/io/dropwizard/cli/CheckCommandTest.java b/dropwizard-core/src/test/java/io/dropwizard/cli/CheckCommandTest.java index 5aca8def5f4..20d0d139d5f 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/cli/CheckCommandTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/cli/CheckCommandTest.java @@ -7,7 +7,7 @@ import net.sourceforge.argparse4j.inf.Namespace; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/dropwizard-core/src/test/java/io/dropwizard/cli/CliTest.java b/dropwizard-core/src/test/java/io/dropwizard/cli/CliTest.java index 6c11609bf08..be4514c176c 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/cli/CliTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/cli/CliTest.java @@ -12,7 +12,7 @@ import java.io.ByteArrayOutputStream; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class CliTest { diff --git a/dropwizard-core/src/test/java/io/dropwizard/cli/ServerCommandTest.java b/dropwizard-core/src/test/java/io/dropwizard/cli/ServerCommandTest.java index dfc7f13b9f5..5689f36b413 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/cli/ServerCommandTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/cli/ServerCommandTest.java @@ -14,8 +14,8 @@ import java.io.IOException; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/dropwizard-core/src/test/java/io/dropwizard/server/DefaultServerFactoryTest.java b/dropwizard-core/src/test/java/io/dropwizard/server/DefaultServerFactoryTest.java index 3c380e20c4a..095ed66ebb0 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/server/DefaultServerFactoryTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/server/DefaultServerFactoryTest.java @@ -1,6 +1,6 @@ package io.dropwizard.server; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.configuration.ConfigurationFactory; import io.dropwizard.jackson.DiscoverableSubtypeResolver; import io.dropwizard.jackson.Jackson; diff --git a/dropwizard-core/src/test/java/io/dropwizard/server/SimpleServerFactoryTest.java b/dropwizard-core/src/test/java/io/dropwizard/server/SimpleServerFactoryTest.java index cf46a7b40c3..a907dc36007 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/server/SimpleServerFactoryTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/server/SimpleServerFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SimpleServerFactoryTest { @Test diff --git a/dropwizard-core/src/test/java/io/dropwizard/setup/AdminEnvironmentTest.java b/dropwizard-core/src/test/java/io/dropwizard/setup/AdminEnvironmentTest.java index 5442b3793ea..e900c994318 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/setup/AdminEnvironmentTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/setup/AdminEnvironmentTest.java @@ -10,7 +10,7 @@ import javax.servlet.ServletRegistration; import java.io.PrintWriter; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class AdminEnvironmentTest { private final MutableServletContextHandler handler = new MutableServletContextHandler(); diff --git a/dropwizard-core/src/test/java/io/dropwizard/setup/BootstrapTest.java b/dropwizard-core/src/test/java/io/dropwizard/setup/BootstrapTest.java index 4748dd5fc1b..bcdb109fb7d 100644 --- a/dropwizard-core/src/test/java/io/dropwizard/setup/BootstrapTest.java +++ b/dropwizard-core/src/test/java/io/dropwizard/setup/BootstrapTest.java @@ -8,7 +8,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class BootstrapTest { private final Application application = new Application() { diff --git a/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java b/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java index 48a6a47cff4..de6fb5eff92 100644 --- a/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java +++ b/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java @@ -9,7 +9,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DataSourceFactoryTest { private final MetricRegistry metricRegistry = new MetricRegistry(); diff --git a/dropwizard-db/src/test/java/io/dropwizard/db/ManagedPooledDataSourceTest.java b/dropwizard-db/src/test/java/io/dropwizard/db/ManagedPooledDataSourceTest.java index 3951cd512d2..b1a5fdffc24 100644 --- a/dropwizard-db/src/test/java/io/dropwizard/db/ManagedPooledDataSourceTest.java +++ b/dropwizard-db/src/test/java/io/dropwizard/db/ManagedPooledDataSourceTest.java @@ -6,8 +6,8 @@ import java.sql.SQLFeatureNotSupportedException; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class ManagedPooledDataSourceTest { private final PoolProperties config = new PoolProperties(); diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/AbstractDAOTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/AbstractDAOTest.java index c6fffc7321b..e190ed2c084 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/AbstractDAOTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/AbstractDAOTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/HibernateBundleTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/HibernateBundleTest.java index 91fd0b34ad9..b17fd745b0a 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/HibernateBundleTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/HibernateBundleTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class HibernateBundleTest { diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/JerseyIntegrationTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/JerseyIntegrationTest.java index 24d3b22dd99..b8328bfff5a 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/JerseyIntegrationTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/JerseyIntegrationTest.java @@ -26,8 +26,8 @@ import javax.ws.rs.core.MediaType; import java.util.TimeZone; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryFactoryTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryFactoryTest.java index 6d173355203..26b1550e8ff 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryFactoryTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryFactoryTest.java @@ -15,7 +15,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class SessionFactoryFactoryTest { diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryHealthCheckTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryHealthCheckTest.java index 07b64c8e717..bd8e6c91bb7 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryHealthCheckTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/SessionFactoryHealthCheckTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.mockito.InOrder; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkRequestDispatcherTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkRequestDispatcherTest.java index ddf232cc09f..f1c4318bf37 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkRequestDispatcherTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkRequestDispatcherTest.java @@ -10,8 +10,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.*; @SuppressWarnings("HibernateResourceOpenedButNotSafelyClosed") diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchAdapterTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchAdapterTest.java index 817f8f14b6c..d4ee708a7fe 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchAdapterTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchAdapterTest.java @@ -4,7 +4,7 @@ import org.hibernate.SessionFactory; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class UnitOfWorkResourceMethodDispatchAdapterTest { diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchProviderTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchProviderTest.java index 5e01f56aba8..1148df13040 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchProviderTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkResourceMethodDispatchProviderTest.java @@ -8,7 +8,7 @@ import java.lang.reflect.Method; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkTest.java b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkTest.java index c26f9b6c4cb..7d670e4f5b1 100644 --- a/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkTest.java +++ b/dropwizard-hibernate/src/test/java/io/dropwizard/hibernate/UnitOfWorkTest.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class UnitOfWorkTest { private static class Example { diff --git a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategyTest.java b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategyTest.java index 0b7f208cc0a..b95adb36123 100644 --- a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategyTest.java +++ b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategyTest.java @@ -6,7 +6,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class AnnotationSensitivePropertyNamingStrategyTest { public static class RegularExample { diff --git a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/DiscoverableSubtypeResolverTest.java b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/DiscoverableSubtypeResolverTest.java index 0e1fdbc59cc..0f7c3f4e5e8 100644 --- a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/DiscoverableSubtypeResolverTest.java +++ b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/DiscoverableSubtypeResolverTest.java @@ -4,7 +4,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DiscoverableSubtypeResolverTest { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/FuzzyEnumModuleTest.java b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/FuzzyEnumModuleTest.java index c88bc887fd8..6f744be59fc 100644 --- a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/FuzzyEnumModuleTest.java +++ b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/FuzzyEnumModuleTest.java @@ -9,8 +9,8 @@ import java.sql.ClientInfoStatus; import java.util.concurrent.TimeUnit; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class FuzzyEnumModuleTest { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/GuavaExtrasModuleTest.java b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/GuavaExtrasModuleTest.java index 3a4ae4dbed2..ab4bf60464f 100644 --- a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/GuavaExtrasModuleTest.java +++ b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/GuavaExtrasModuleTest.java @@ -9,7 +9,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class GuavaExtrasModuleTest { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/LogbackModuleTest.java b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/LogbackModuleTest.java index 8455750ace6..9bcaa569d6f 100644 --- a/dropwizard-jackson/src/test/java/io/dropwizard/jackson/LogbackModuleTest.java +++ b/dropwizard-jackson/src/test/java/io/dropwizard/jackson/LogbackModuleTest.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class LogbackModuleTest { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/dropwizard-jdbi/src/test/java/io/dropwizard/jdbi/JDBITest.java b/dropwizard-jdbi/src/test/java/io/dropwizard/jdbi/JDBITest.java index 604eeb2bb90..9c679f2e481 100755 --- a/dropwizard-jdbi/src/test/java/io/dropwizard/jdbi/JDBITest.java +++ b/dropwizard-jdbi/src/test/java/io/dropwizard/jdbi/JDBITest.java @@ -25,7 +25,7 @@ import java.sql.Types; import java.util.List; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/DropwizardResourceConfigTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/DropwizardResourceConfigTest.java index 0367f9a807f..96b245427cb 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/DropwizardResourceConfigTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/DropwizardResourceConfigTest.java @@ -9,7 +9,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("unchecked") public class DropwizardResourceConfigTest { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/caching/CacheControlledResourceMethodDispatchAdapterTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/caching/CacheControlledResourceMethodDispatchAdapterTest.java index cdffc506b8e..e17dc47a089 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/caching/CacheControlledResourceMethodDispatchAdapterTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/caching/CacheControlledResourceMethodDispatchAdapterTest.java @@ -9,7 +9,7 @@ import javax.ws.rs.core.HttpHeaders; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class CacheControlledResourceMethodDispatchAdapterTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/errors/LoggingExceptionMapperTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/errors/LoggingExceptionMapperTest.java index c8e4ab7efee..f2388a3e3d9 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/errors/LoggingExceptionMapperTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/errors/LoggingExceptionMapperTest.java @@ -9,8 +9,8 @@ import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class LoggingExceptionMapperTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalQueryParamInjectableProviderTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalQueryParamInjectableProviderTest.java index 1103f1a1240..b0f7e3155db 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalQueryParamInjectableProviderTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalQueryParamInjectableProviderTest.java @@ -6,7 +6,7 @@ import io.dropwizard.logging.LoggingFactory; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class OptionalQueryParamInjectableProviderTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalResourceMethodDispatchAdapterTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalResourceMethodDispatchAdapterTest.java index 6f733b98e58..c5b3d22f198 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalResourceMethodDispatchAdapterTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/guava/OptionalResourceMethodDispatchAdapterTest.java @@ -7,8 +7,8 @@ import io.dropwizard.logging.LoggingFactory; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class OptionalResourceMethodDispatchAdapterTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java index 6b2b7da2cb8..4d21be370db 100755 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java @@ -29,8 +29,8 @@ import java.lang.reflect.Type; import java.util.*; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assume.assumeThat; import static org.mockito.Mockito.doReturn; diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JsonProcessingExceptionMapperTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JsonProcessingExceptionMapperTest.java index ee1bec27a47..6e46ea59bfc 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JsonProcessingExceptionMapperTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/jackson/JsonProcessingExceptionMapperTest.java @@ -10,8 +10,8 @@ import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Fail.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown; public class JsonProcessingExceptionMapperTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/BooleanParamTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/BooleanParamTest.java index ad1291133dd..0b6a965aa28 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/BooleanParamTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/BooleanParamTest.java @@ -5,8 +5,8 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class BooleanParamTest { @Test diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/DateTimeParamTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/DateTimeParamTest.java index 0783d24412f..9ccda09a7a3 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/DateTimeParamTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/DateTimeParamTest.java @@ -4,7 +4,7 @@ import org.joda.time.DateTimeZone; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DateTimeParamTest { @Test diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/IntParamTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/IntParamTest.java index c60288acab2..e0803227f9f 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/IntParamTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/IntParamTest.java @@ -5,8 +5,8 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class IntParamTest { @Test diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/LongParamTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/LongParamTest.java index cb5953e4d90..0ad882f37c7 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/LongParamTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/LongParamTest.java @@ -5,8 +5,8 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class LongParamTest { @Test diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/UUIDParamTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/UUIDParamTest.java index 7acaa05bf9b..44d88a8e52a 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/UUIDParamTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/params/UUIDParamTest.java @@ -6,8 +6,8 @@ import javax.ws.rs.core.Response; import java.util.UUID; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; public class UUIDParamTest { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/FlashProviderTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/FlashProviderTest.java index 68a971d903c..69f4385e74f 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/FlashProviderTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/FlashProviderTest.java @@ -12,7 +12,7 @@ import javax.ws.rs.core.NewCookie; import java.util.List; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class FlashProviderTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/HttpSessionProviderTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/HttpSessionProviderTest.java index fcec858715b..c8085b03a7c 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/HttpSessionProviderTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/sessions/HttpSessionProviderTest.java @@ -12,7 +12,7 @@ import javax.ws.rs.core.NewCookie; import java.util.List; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class HttpSessionProviderTest extends JerseyTest { static { diff --git a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/validation/ConstraintViolationExceptionMapperTest.java b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/validation/ConstraintViolationExceptionMapperTest.java index bb9da4228d1..3bdba29e7d6 100644 --- a/dropwizard-jersey/src/test/java/io/dropwizard/jersey/validation/ConstraintViolationExceptionMapperTest.java +++ b/dropwizard-jersey/src/test/java/io/dropwizard/jersey/validation/ConstraintViolationExceptionMapperTest.java @@ -10,8 +10,8 @@ import javax.ws.rs.core.MediaType; import java.util.Locale; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assume.assumeThat; diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/GzipFilterFactoryTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/GzipFilterFactoryTest.java index ba50273b310..7e6b53175cb 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/GzipFilterFactoryTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/GzipFilterFactoryTest.java @@ -11,7 +11,7 @@ import javax.validation.Validation; import java.io.File; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class GzipFilterFactoryTest { private GzipFilterFactory gzip; diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpConnectorFactoryTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpConnectorFactoryTest.java index 44d216694ac..040b623b647 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpConnectorFactoryTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpConnectorFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class HttpConnectorFactoryTest { @Test diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpsConnectorFactoryTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpsConnectorFactoryTest.java index 7f846e6000c..79c6151156f 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpsConnectorFactoryTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/HttpsConnectorFactoryTest.java @@ -17,7 +17,7 @@ import com.google.common.base.Function; import com.google.common.collect.Collections2; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; public class HttpsConnectorFactoryTest { diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/MutableServletContextHandlerTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/MutableServletContextHandlerTest.java index 3707e46c237..ad319843fa8 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/MutableServletContextHandlerTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/MutableServletContextHandlerTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class MutableServletContextHandlerTest { private final MutableServletContextHandler handler = new MutableServletContextHandler(); diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java index 069b942e183..a19ce183140 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java @@ -8,7 +8,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class NonblockingServletHolderTest { diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RequestLogFactoryTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RequestLogFactoryTest.java index 960d9849fee..bb5864e1fa9 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RequestLogFactoryTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RequestLogFactoryTest.java @@ -14,7 +14,7 @@ import java.io.File; import java.util.TimeZone; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class RequestLogFactoryTest { private RequestLogFactory requestLog; diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RoutingHandlerTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RoutingHandlerTest.java index cce64449a7a..bead8c50397 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RoutingHandlerTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/RoutingHandlerTest.java @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class RoutingHandlerTest { diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/Slf4jRequestLogTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/Slf4jRequestLogTest.java index bd333b68a5a..9346a068cea 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/Slf4jRequestLogTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/Slf4jRequestLogTest.java @@ -16,7 +16,7 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class Slf4jRequestLogTest { diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java index 42e2fdbb49b..167ca387643 100644 --- a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java +++ b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java @@ -14,7 +14,7 @@ import javax.servlet.*; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; public class ServletEnvironmentTest { diff --git a/dropwizard-lifecycle/src/test/java/io/dropwizard/lifecycle/setup/LifecycleEnvironmentTest.java b/dropwizard-lifecycle/src/test/java/io/dropwizard/lifecycle/setup/LifecycleEnvironmentTest.java index e20766d78ba..b2b3eb605ee 100644 --- a/dropwizard-lifecycle/src/test/java/io/dropwizard/lifecycle/setup/LifecycleEnvironmentTest.java +++ b/dropwizard-lifecycle/src/test/java/io/dropwizard/lifecycle/setup/LifecycleEnvironmentTest.java @@ -7,7 +7,7 @@ import org.eclipse.jetty.util.component.LifeCycle; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class LifecycleEnvironmentTest { diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/ConsoleAppenderFactoryTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/ConsoleAppenderFactoryTest.java index 4b5933f15d4..42d59010369 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/ConsoleAppenderFactoryTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/ConsoleAppenderFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ConsoleAppenderFactoryTest { @Test diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/DropwizardLayoutTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/DropwizardLayoutTest.java index b542b9e3ff9..089a29263b7 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/DropwizardLayoutTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/DropwizardLayoutTest.java @@ -5,7 +5,7 @@ import java.util.TimeZone; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class DropwizardLayoutTest { diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java index 8cac8bdc275..c5b887102dc 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java @@ -7,7 +7,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class FileAppenderFactoryTest { @Test diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/LoggingFactoryTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/LoggingFactoryTest.java index abca68b5411..b215437b216 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/LoggingFactoryTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/LoggingFactoryTest.java @@ -12,7 +12,7 @@ import javax.validation.Validation; import java.io.File; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class LoggingFactoryTest { private final ObjectMapper objectMapper = Jackson.newObjectMapper(); diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedExtendedThrowableProxyConverterTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedExtendedThrowableProxyConverterTest.java index 6eecdfbf093..ec5ea6d85ad 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedExtendedThrowableProxyConverterTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedExtendedThrowableProxyConverterTest.java @@ -7,7 +7,7 @@ import java.io.IOException; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PrefixedExtendedThrowableProxyConverterTest { private final PrefixedExtendedThrowableProxyConverter converter = new PrefixedExtendedThrowableProxyConverter(); diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedRootCauseFirstThrowableProxyConverterTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedRootCauseFirstThrowableProxyConverterTest.java index 1eb1ba39f51..455a582786c 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedRootCauseFirstThrowableProxyConverterTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedRootCauseFirstThrowableProxyConverterTest.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.net.SocketTimeoutException; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests {@link PrefixedRootCauseFirstThrowableProxyConverter}. diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedThrowableProxyConverterTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedThrowableProxyConverterTest.java index 0cbaaa5221b..3684c9c48d1 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedThrowableProxyConverterTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/PrefixedThrowableProxyConverterTest.java @@ -7,7 +7,7 @@ import java.io.IOException; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PrefixedThrowableProxyConverterTest { private final PrefixedThrowableProxyConverter converter = new PrefixedThrowableProxyConverter(); diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/SyslogAppenderFactoryTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/SyslogAppenderFactoryTest.java index 59c5f301a6f..021d4a4e716 100644 --- a/dropwizard-logging/src/test/java/io/dropwizard/logging/SyslogAppenderFactoryTest.java +++ b/dropwizard-logging/src/test/java/io/dropwizard/logging/SyslogAppenderFactoryTest.java @@ -11,7 +11,7 @@ import java.lang.reflect.Field; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SyslogAppenderFactoryTest { @Test diff --git a/dropwizard-metrics-ganglia/src/test/java/io/dropwizard/metrics/ganglia/GangliaReporterFactoryTest.java b/dropwizard-metrics-ganglia/src/test/java/io/dropwizard/metrics/ganglia/GangliaReporterFactoryTest.java index 1dc6a2529a6..ff2ca5ab470 100644 --- a/dropwizard-metrics-ganglia/src/test/java/io/dropwizard/metrics/ganglia/GangliaReporterFactoryTest.java +++ b/dropwizard-metrics-ganglia/src/test/java/io/dropwizard/metrics/ganglia/GangliaReporterFactoryTest.java @@ -1,7 +1,7 @@ package io.dropwizard.metrics.ganglia; import io.dropwizard.jackson.DiscoverableSubtypeResolver; -import org.fest.assertions.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.Test; public class GangliaReporterFactoryTest { diff --git a/dropwizard-metrics-graphite/src/test/java/io/dropwizard/metrics/graphite/GraphiteReporterFactoryTest.java b/dropwizard-metrics-graphite/src/test/java/io/dropwizard/metrics/graphite/GraphiteReporterFactoryTest.java index caf17df053e..2cadd4be722 100644 --- a/dropwizard-metrics-graphite/src/test/java/io/dropwizard/metrics/graphite/GraphiteReporterFactoryTest.java +++ b/dropwizard-metrics-graphite/src/test/java/io/dropwizard/metrics/graphite/GraphiteReporterFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class GraphiteReporterFactoryTest { @Test diff --git a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/ConsoleReporterFactoryTest.java b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/ConsoleReporterFactoryTest.java index c2e5a9ba959..42f5b87b036 100644 --- a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/ConsoleReporterFactoryTest.java +++ b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/ConsoleReporterFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ConsoleReporterFactoryTest { @Test diff --git a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/CsvReporterFactoryTest.java b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/CsvReporterFactoryTest.java index 2b66836de50..45f71f666c2 100644 --- a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/CsvReporterFactoryTest.java +++ b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/CsvReporterFactoryTest.java @@ -13,7 +13,7 @@ import javax.validation.Validation; import java.io.File; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class CsvReporterFactoryTest { private final ObjectMapper objectMapper = Jackson.newObjectMapper(); diff --git a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/MetricsFactoryTest.java b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/MetricsFactoryTest.java index ca4cf031877..30e224c3588 100644 --- a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/MetricsFactoryTest.java +++ b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/MetricsFactoryTest.java @@ -12,7 +12,7 @@ import javax.validation.Validation; import java.io.File; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class MetricsFactoryTest { static { diff --git a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/Slf4jReporterFactoryTest.java b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/Slf4jReporterFactoryTest.java index 1bdaf3cba7d..43cfb126616 100644 --- a/dropwizard-metrics/src/test/java/io/dropwizard/metrics/Slf4jReporterFactoryTest.java +++ b/dropwizard-metrics/src/test/java/io/dropwizard/metrics/Slf4jReporterFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class Slf4jReporterFactoryTest { @Test diff --git a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/ServletsTest.java b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/ServletsTest.java index a27f2e52d44..9fb55aceafd 100644 --- a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/ServletsTest.java +++ b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/ServletsTest.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/AssetServletTest.java b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/AssetServletTest.java index 9ca9f1da27f..529686b49c0 100644 --- a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/AssetServletTest.java +++ b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/AssetServletTest.java @@ -8,7 +8,7 @@ import org.junit.Before; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class AssetServletTest { private static final String DUMMY_SERVLET = "/dummy_servlet/"; diff --git a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/ResourceURLTest.java b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/ResourceURLTest.java index 4e804619fe8..033f1da9dd5 100644 --- a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/ResourceURLTest.java +++ b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/assets/ResourceURLTest.java @@ -10,8 +10,8 @@ import java.net.URL; import java.util.jar.JarEntry; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Assertions.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; public class ResourceURLTest { private File directory; diff --git a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/tasks/TaskTest.java b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/tasks/TaskTest.java index cf53495e141..a6d325e4842 100644 --- a/dropwizard-servlets/src/test/java/io/dropwizard/servlets/tasks/TaskTest.java +++ b/dropwizard-servlets/src/test/java/io/dropwizard/servlets/tasks/TaskTest.java @@ -5,7 +5,7 @@ import java.io.PrintWriter; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TaskTest { private final Task task = new Task("test") { diff --git a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/NonePushStrategyFactoryTest.java b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/NonePushStrategyFactoryTest.java index 6c0c2d4bb7b..ff530079117 100644 --- a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/NonePushStrategyFactoryTest.java +++ b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/NonePushStrategyFactoryTest.java @@ -4,7 +4,7 @@ import org.eclipse.jetty.spdy.server.http.PushStrategy; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class NonePushStrategyFactoryTest { private final NonePushStrategyFactory factory = new NonePushStrategyFactory(); diff --git a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/ReferrerPushStrategyFactoryTest.java b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/ReferrerPushStrategyFactoryTest.java index 863459b7ef3..8f0c6af736a 100644 --- a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/ReferrerPushStrategyFactoryTest.java +++ b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/ReferrerPushStrategyFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ReferrerPushStrategyFactoryTest { @Test diff --git a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/Spdy3ConnectorFactoryTest.java b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/Spdy3ConnectorFactoryTest.java index f8d0372e373..ada86d4faa9 100644 --- a/dropwizard-spdy/src/test/java/io/dropwizard/spdy/Spdy3ConnectorFactoryTest.java +++ b/dropwizard-spdy/src/test/java/io/dropwizard/spdy/Spdy3ConnectorFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.jackson.DiscoverableSubtypeResolver; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class Spdy3ConnectorFactoryTest { @Test diff --git a/dropwizard-testing/pom.xml b/dropwizard-testing/pom.xml index 47fc1836152..408a06e6b74 100644 --- a/dropwizard-testing/pom.xml +++ b/dropwizard-testing/pom.xml @@ -65,9 +65,9 @@ 2.1 - org.easytesting - fest-assert-core - 2.0M10 + org.assertj + assertj-core + 1.6.0 diff --git a/dropwizard-testing/src/test/java/io/dropwizard/testing/FixtureHelpersTest.java b/dropwizard-testing/src/test/java/io/dropwizard/testing/FixtureHelpersTest.java index 3182751e4d2..6443ecc6cd8 100644 --- a/dropwizard-testing/src/test/java/io/dropwizard/testing/FixtureHelpersTest.java +++ b/dropwizard-testing/src/test/java/io/dropwizard/testing/FixtureHelpersTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static io.dropwizard.testing.FixtureHelpers.fixture; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class FixtureHelpersTest { @Test diff --git a/dropwizard-testing/src/test/java/io/dropwizard/testing/app/GzipDefaultVaryBehaviourTest.java b/dropwizard-testing/src/test/java/io/dropwizard/testing/app/GzipDefaultVaryBehaviourTest.java index 769a5793c92..20eaae52024 100644 --- a/dropwizard-testing/src/test/java/io/dropwizard/testing/app/GzipDefaultVaryBehaviourTest.java +++ b/dropwizard-testing/src/test/java/io/dropwizard/testing/app/GzipDefaultVaryBehaviourTest.java @@ -13,7 +13,7 @@ import static javax.ws.rs.core.HttpHeaders.ACCEPT_ENCODING; import static javax.ws.rs.core.HttpHeaders.CONTENT_ENCODING; import static javax.ws.rs.core.HttpHeaders.VARY; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class GzipDefaultVaryBehaviourTest { diff --git a/dropwizard-testing/src/test/java/io/dropwizard/testing/app/PersonResourceTest.java b/dropwizard-testing/src/test/java/io/dropwizard/testing/app/PersonResourceTest.java index 3e291a95c40..35ae6e81565 100644 --- a/dropwizard-testing/src/test/java/io/dropwizard/testing/app/PersonResourceTest.java +++ b/dropwizard-testing/src/test/java/io/dropwizard/testing/app/PersonResourceTest.java @@ -10,7 +10,7 @@ import java.util.logging.Logger; import static org.mockito.Mockito.*; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests {@link ResourceTestRule}. diff --git a/dropwizard-util/src/test/java/io/dropwizard/util/DurationTest.java b/dropwizard-util/src/test/java/io/dropwizard/util/DurationTest.java index cc292780500..150e4b78707 100644 --- a/dropwizard-util/src/test/java/io/dropwizard/util/DurationTest.java +++ b/dropwizard-util/src/test/java/io/dropwizard/util/DurationTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DurationTest { @Test diff --git a/dropwizard-util/src/test/java/io/dropwizard/util/JarLocationTest.java b/dropwizard-util/src/test/java/io/dropwizard/util/JarLocationTest.java index 31020c45fd1..9928fc18b6d 100644 --- a/dropwizard-util/src/test/java/io/dropwizard/util/JarLocationTest.java +++ b/dropwizard-util/src/test/java/io/dropwizard/util/JarLocationTest.java @@ -3,7 +3,7 @@ import com.google.common.base.Optional; import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class JarLocationTest { @Test diff --git a/dropwizard-util/src/test/java/io/dropwizard/util/SizeTest.java b/dropwizard-util/src/test/java/io/dropwizard/util/SizeTest.java index 5ed94ebbd32..fe70589d521 100644 --- a/dropwizard-util/src/test/java/io/dropwizard/util/SizeTest.java +++ b/dropwizard-util/src/test/java/io/dropwizard/util/SizeTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SizeTest { @Test diff --git a/dropwizard-util/src/test/java/io/dropwizard/util/SizeUnitTest.java b/dropwizard-util/src/test/java/io/dropwizard/util/SizeUnitTest.java index 650efbabf4e..a8f1fb76b48 100644 --- a/dropwizard-util/src/test/java/io/dropwizard/util/SizeUnitTest.java +++ b/dropwizard-util/src/test/java/io/dropwizard/util/SizeUnitTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SizeUnitTest { // BYTES diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java index dce467597ca..4e19437abbd 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java @@ -9,7 +9,7 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DurationValidatorTest { @SuppressWarnings("unused") diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/MethodValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/MethodValidatorTest.java index 3a179a5fa02..bc525fe2a69 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/MethodValidatorTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/MethodValidatorTest.java @@ -7,7 +7,7 @@ import javax.validation.Validation; import javax.validation.Validator; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings({"FieldMayBeFinal","MethodMayBeStatic","UnusedDeclaration"}) public class MethodValidatorTest { diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/OneOfValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/OneOfValidatorTest.java index 18f37dec18b..d4f9c91f3ba 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/OneOfValidatorTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/OneOfValidatorTest.java @@ -7,7 +7,7 @@ import java.util.Locale; import static io.dropwizard.validation.ConstraintViolations.format; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; public class OneOfValidatorTest { diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/PortRangeValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/PortRangeValidatorTest.java index 2e26392948c..d704c5c7672 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/PortRangeValidatorTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/PortRangeValidatorTest.java @@ -7,7 +7,7 @@ import javax.validation.Validator; import java.util.Locale; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assume.assumeThat; diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/SizeValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/SizeValidatorTest.java index 708386db559..ae50d4c8618 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/SizeValidatorTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/SizeValidatorTest.java @@ -8,7 +8,7 @@ import javax.validation.Validator; import java.util.Locale; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SizeValidatorTest { @SuppressWarnings("unused") diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/valuehandling/OptionalValidatedValueUnwrapperTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/valuehandling/OptionalValidatedValueUnwrapperTest.java index 614fe490835..501e59caf4f 100644 --- a/dropwizard-validation/src/test/java/io/dropwizard/validation/valuehandling/OptionalValidatedValueUnwrapperTest.java +++ b/dropwizard-validation/src/test/java/io/dropwizard/validation/valuehandling/OptionalValidatedValueUnwrapperTest.java @@ -13,7 +13,7 @@ import java.util.Set; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class OptionalValidatedValueUnwrapperTest { diff --git a/dropwizard-views-freemarker/src/test/java/io/dropwizard/views/freemarker/FreemarkerViewRendererTest.java b/dropwizard-views-freemarker/src/test/java/io/dropwizard/views/freemarker/FreemarkerViewRendererTest.java index 62e66764c96..13cd356e46a 100644 --- a/dropwizard-views-freemarker/src/test/java/io/dropwizard/views/freemarker/FreemarkerViewRendererTest.java +++ b/dropwizard-views-freemarker/src/test/java/io/dropwizard/views/freemarker/FreemarkerViewRendererTest.java @@ -17,7 +17,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class FreemarkerViewRendererTest extends JerseyTest { static { diff --git a/dropwizard-views-mustache/src/test/java/io/dropwizard/views/mustache/MustacheViewRendererTest.java b/dropwizard-views-mustache/src/test/java/io/dropwizard/views/mustache/MustacheViewRendererTest.java index c0824bc25c9..5bf7a9d71e5 100644 --- a/dropwizard-views-mustache/src/test/java/io/dropwizard/views/mustache/MustacheViewRendererTest.java +++ b/dropwizard-views-mustache/src/test/java/io/dropwizard/views/mustache/MustacheViewRendererTest.java @@ -17,7 +17,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class MustacheViewRendererTest extends JerseyTest { static { diff --git a/dropwizard-views/src/test/java/io/dropwizard/views/ViewTest.java b/dropwizard-views/src/test/java/io/dropwizard/views/ViewTest.java index 0df52c11580..7ba41e6d7f5 100644 --- a/dropwizard-views/src/test/java/io/dropwizard/views/ViewTest.java +++ b/dropwizard-views/src/test/java/io/dropwizard/views/ViewTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ViewTest { private final View view = new View("/blah.tmp") {}; diff --git a/pom.xml b/pom.xml index 5cdb4302de3..44360a46812 100644 --- a/pom.xml +++ b/pom.xml @@ -263,9 +263,9 @@ test - org.easytesting - fest-assert-core - 2.0M10 + org.assertj + assertj-core + 1.6.1 test