diff --git a/injector/src/test/java/ch/jalu/injector/InjectorBuilderTest.java b/injector/src/test/java/ch/jalu/injector/InjectorBuilderTest.java index accffdd..0e71db6 100644 --- a/injector/src/test/java/ch/jalu/injector/InjectorBuilderTest.java +++ b/injector/src/test/java/ch/jalu/injector/InjectorBuilderTest.java @@ -33,8 +33,8 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link InjectorBuilder}. diff --git a/injector/src/test/java/ch/jalu/injector/InjectorDemoTest.java b/injector/src/test/java/ch/jalu/injector/InjectorDemoTest.java index cba8ae4..eb71826 100644 --- a/injector/src/test/java/ch/jalu/injector/InjectorDemoTest.java +++ b/injector/src/test/java/ch/jalu/injector/InjectorDemoTest.java @@ -3,8 +3,8 @@ import ch.jalu.injector.demo.MyApp; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; /** * Test for {@link MyApp} to ensure it returns the expected result. diff --git a/injector/src/test/java/ch/jalu/injector/InjectorImplTest.java b/injector/src/test/java/ch/jalu/injector/InjectorImplTest.java index 17f8b53..e5a0b8d 100644 --- a/injector/src/test/java/ch/jalu/injector/InjectorImplTest.java +++ b/injector/src/test/java/ch/jalu/injector/InjectorImplTest.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.stream.Stream; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -51,8 +52,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; @@ -508,15 +507,13 @@ void shouldForwardExceptionFromProviderHandler() throws Exception { doThrow(IllegalStateException.class).when(handler).onProvider(any(Class.class), any(Provider.class)); config.getHandlers().add(handler); - try { - // when - injector.registerProvider(Delta.class, new Delta1Provider()); - fail("Expected exception"); - } catch (InjectorException e) { - // then - assertThat(e.getMessage(), containsString("An error occurred")); - assertThat(e.getCause(), instanceOf(IllegalStateException.class)); - } + // when + InjectorException ex = assertThrows(InjectorException.class, + () -> injector.registerProvider(Delta.class, new Delta1Provider())); + + // then + assertThat(ex.getMessage(), containsString("An error occurred")); + assertThat(ex.getCause(), instanceOf(IllegalStateException.class)); } @Test @@ -526,19 +523,16 @@ void shouldForwardExceptionFromProviderClassHandler() throws Exception { doThrow(UnsupportedOperationException.class).when(handler).onProviderClass(any(Class.class), any(Class.class)); config.getHandlers().add(handler); - try { - // when - injector.registerProvider(Delta.class, Delta1Provider.class); - fail("Expected exception"); - } catch (InjectorException e) { - // then - assertThat(e.getMessage(), containsString("An error occurred")); - assertThat(e.getCause(), instanceOf(UnsupportedOperationException.class)); - } + // when + InjectorException ex = assertThrows(InjectorException.class, + () -> injector.registerProvider(Delta.class, Delta1Provider.class)); + + // then + assertThat(ex.getMessage(), containsString("An error occurred")); + assertThat(ex.getCause(), instanceOf(UnsupportedOperationException.class)); } @Test - @SuppressWarnings("unchecked") void shouldThrowForNullReturnedAsDependency() throws Exception { // given Handler handler = mock(Handler.class); diff --git a/injector/src/test/java/ch/jalu/injector/context/ObjectIdentifierTest.java b/injector/src/test/java/ch/jalu/injector/context/ObjectIdentifierTest.java index da8dcd3..328b07c 100644 --- a/injector/src/test/java/ch/jalu/injector/context/ObjectIdentifierTest.java +++ b/injector/src/test/java/ch/jalu/injector/context/ObjectIdentifierTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/context/ResolutionContextTest.java b/injector/src/test/java/ch/jalu/injector/context/ResolutionContextTest.java index fcc54a1..9466a73 100644 --- a/injector/src/test/java/ch/jalu/injector/context/ResolutionContextTest.java +++ b/injector/src/test/java/ch/jalu/injector/context/ResolutionContextTest.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link ResolutionContext}. diff --git a/injector/src/test/java/ch/jalu/injector/handlers/dependency/FactoryDependencyHandlerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/dependency/FactoryDependencyHandlerTest.java index 95db3c1..a02140c 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/dependency/FactoryDependencyHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/dependency/FactoryDependencyHandlerTest.java @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/dependency/SavedAnnotationsHandlerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/dependency/SavedAnnotationsHandlerTest.java index cfb7d6a..9eb459b 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/dependency/SavedAnnotationsHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/dependency/SavedAnnotationsHandlerTest.java @@ -15,7 +15,7 @@ import static ch.jalu.injector.InjectorTestHelper.unwrapFromSimpleResolution; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/dependency/SingletonStoreDependencyHandlerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/dependency/SingletonStoreDependencyHandlerTest.java index b0e6e98..5d72f71 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/dependency/SingletonStoreDependencyHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/dependency/SingletonStoreDependencyHandlerTest.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/dependency/TypeSafeAnnotationHandlerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/dependency/TypeSafeAnnotationHandlerTest.java index 78b3930..933036d 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/dependency/TypeSafeAnnotationHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/dependency/TypeSafeAnnotationHandlerTest.java @@ -14,7 +14,7 @@ import static ch.jalu.injector.InjectorTestHelper.newSizeAnnotation; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * Test for {@link TypeSafeAnnotationHandler}. diff --git a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/DefaultInjectionProviderTest.java b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/DefaultInjectionProviderTest.java index 5d21638..610e39f 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/DefaultInjectionProviderTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/DefaultInjectionProviderTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/InstantiationCacheTest.java b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/InstantiationCacheTest.java index 4957f75..ae828da 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/InstantiationCacheTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/InstantiationCacheTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/ProviderHandlerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/ProviderHandlerTest.java index 4a0531f..7641db4 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/ProviderHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/ProviderHandlerTest.java @@ -27,8 +27,8 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; diff --git a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/StandardInjectionTest.java b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/StandardInjectionTest.java index cfd0ad8..1fb450d 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/instantiation/StandardInjectionTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/instantiation/StandardInjectionTest.java @@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructMethodInvokerTest.java b/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructMethodInvokerTest.java index 37a5d19..ce1392f 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructMethodInvokerTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructMethodInvokerTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructRemappingTest.java b/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructRemappingTest.java index 65ffe50..76bb818 100644 --- a/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructRemappingTest.java +++ b/injector/src/test/java/ch/jalu/injector/handlers/postconstruct/PostConstructRemappingTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * Tests that handler implementations can change the object that will be stored on post construct. diff --git a/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionExtensionIntegrationTest.java b/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionExtensionIntegrationTest.java index dfd0a85..8df4b62 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionExtensionIntegrationTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionExtensionIntegrationTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionRunnerIntegrationTest.java b/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionRunnerIntegrationTest.java index f8f8fab..6aa9459 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionRunnerIntegrationTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/DelayedInjectionRunnerIntegrationTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectExtensionIntegrationTest.java b/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectExtensionIntegrationTest.java index aa0b349..8fe3b7a 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectExtensionIntegrationTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectExtensionIntegrationTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; /** diff --git a/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectRunnerIntegrationTest.java b/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectRunnerIntegrationTest.java index db02bba..6d2450c 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectRunnerIntegrationTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/MultipleDelayedInjectRunnerIntegrationTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; /** diff --git a/injector/src/test/java/ch/jalu/injector/testing/runner/DelayedInjectionRunnerValidatorTest.java b/injector/src/test/java/ch/jalu/injector/testing/runner/DelayedInjectionRunnerValidatorTest.java index ab2f109..6d06c5e 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/runner/DelayedInjectionRunnerValidatorTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/runner/DelayedInjectionRunnerValidatorTest.java @@ -11,7 +11,7 @@ import org.mockito.InjectMocks; import static org.hamcrest.Matchers.containsString; -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 org.mockito.Mockito.verifyNoInteractions; diff --git a/injector/src/test/java/ch/jalu/injector/testing/runner/MockDependencyHandlerTest.java b/injector/src/test/java/ch/jalu/injector/testing/runner/MockDependencyHandlerTest.java index ce298cb..72ea3e4 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/runner/MockDependencyHandlerTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/runner/MockDependencyHandlerTest.java @@ -18,8 +18,8 @@ import static ch.jalu.injector.InjectorTestHelper.unwrapFromSimpleResolution; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; @@ -37,7 +37,7 @@ class MockDependencyHandlerTest { private Injector injector; @Test - void shouldProvideMock() throws Exception { + void shouldProvideMock() { // given DelayedInjectionRunnerIntegrationTest runnerTest = new DelayedInjectionRunnerIntegrationTest(); MockitoAnnotations.initMocks(runnerTest); diff --git a/injector/src/test/java/ch/jalu/injector/testing/runner/RunDelayedInjectsTest.java b/injector/src/test/java/ch/jalu/injector/testing/runner/RunDelayedInjectsTest.java index c68c5e4..94c03f5 100644 --- a/injector/src/test/java/ch/jalu/injector/testing/runner/RunDelayedInjectsTest.java +++ b/injector/src/test/java/ch/jalu/injector/testing/runner/RunDelayedInjectsTest.java @@ -16,8 +16,8 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/injector/src/test/java/ch/jalu/injector/utils/InjectorUtilsTest.java b/injector/src/test/java/ch/jalu/injector/utils/InjectorUtilsTest.java index e86dda2..228554b 100644 --- a/injector/src/test/java/ch/jalu/injector/utils/InjectorUtilsTest.java +++ b/injector/src/test/java/ch/jalu/injector/utils/InjectorUtilsTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/injector/src/test/java/ch/jalu/injector/utils/ReflectionUtilsTest.java b/injector/src/test/java/ch/jalu/injector/utils/ReflectionUtilsTest.java index d618cf4..0bfa799 100644 --- a/injector/src/test/java/ch/jalu/injector/utils/ReflectionUtilsTest.java +++ b/injector/src/test/java/ch/jalu/injector/utils/ReflectionUtilsTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions;