diff --git a/core/src/test/java/com/bobocode/bring/core/injection/constructor/BringConstructorInjectionTest.java b/core/src/test/java/com/bobocode/bring/core/injection/constructor/BringConstructorInjectionTest.java index 217e8f0c..1dacbb46 100644 --- a/core/src/test/java/com/bobocode/bring/core/injection/constructor/BringConstructorInjectionTest.java +++ b/core/src/test/java/com/bobocode/bring/core/injection/constructor/BringConstructorInjectionTest.java @@ -117,13 +117,15 @@ void shouldThrowExceptionWhenYouYouHaveMultipleConstructorButNoOneOfItWasMarketA @DisplayName("Should inject implementations of Interface to Set Constructor in appropriate Order") @Test - void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { + void shouldInjectListOfInterfaceImplementationToSetConstructorInOrder() { // given var bringApplicationContext = BringApplication.run(TEST_DATA_PACKAGE + ".positive.setconstructorinjector"); + var children = Set.of( - testdata.di.positive.setconstructorinjector.B.class, - testdata.di.positive.setconstructorinjector.D.class, - testdata.di.positive.setconstructorinjector.C.class); + bringApplicationContext.getBean(testdata.di.positive.setconstructorinjector.B.class), + bringApplicationContext.getBean(testdata.di.positive.setconstructorinjector.D.class), + bringApplicationContext.getBean(testdata.di.positive.setconstructorinjector.C.class) + ); // when var aBean = bringApplicationContext.getBean(AConstructor.class); @@ -131,7 +133,8 @@ void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { // then assertThat(aBean).isNotNull(); assertThat(aBean.getSet()).isNotNull(); - assertThat(aBean.getSet()).allSatisfy(child -> assertThat(children).contains(child.getClass())); + assertThat(aBean.getSet()).hasSize(3) + .containsAll(children); } @DisplayName("Should inject implementations of Interface to Constructor") diff --git a/core/src/test/java/com/bobocode/bring/core/injection/field/BringFieldInjectionTest.java b/core/src/test/java/com/bobocode/bring/core/injection/field/BringFieldInjectionTest.java index c880eba7..16d8fd1a 100644 --- a/core/src/test/java/com/bobocode/bring/core/injection/field/BringFieldInjectionTest.java +++ b/core/src/test/java/com/bobocode/bring/core/injection/field/BringFieldInjectionTest.java @@ -110,9 +110,10 @@ void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { // given var bringApplicationContext = BringApplication.run(TEST_DATA_PACKAGE + ".positive.setfieldinjector"); var children = Set.of( - testdata.di.positive.setfieldinjector.B.class, - testdata.di.positive.setfieldinjector.D.class, - testdata.di.positive.setfieldinjector.C.class); + bringApplicationContext.getBean(testdata.di.positive.setfieldinjector.B.class), + bringApplicationContext.getBean(testdata.di.positive.setfieldinjector.D.class), + bringApplicationContext.getBean(testdata.di.positive.setfieldinjector.C.class) + ); // when var aBean = bringApplicationContext.getBean(AField.class); @@ -120,6 +121,7 @@ void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { // then assertThat(aBean).isNotNull(); assertThat(aBean.getSet()).isNotNull(); - assertThat(aBean.getSet()).allSatisfy(child -> assertThat(children).contains(child.getClass())); + assertThat(aBean.getSet()).hasSize(3) + .containsAll(children); } } diff --git a/core/src/test/java/com/bobocode/bring/core/injection/setter/BringSetterInjectionTest.java b/core/src/test/java/com/bobocode/bring/core/injection/setter/BringSetterInjectionTest.java index e507af77..7d41a2e4 100644 --- a/core/src/test/java/com/bobocode/bring/core/injection/setter/BringSetterInjectionTest.java +++ b/core/src/test/java/com/bobocode/bring/core/injection/setter/BringSetterInjectionTest.java @@ -76,14 +76,15 @@ void shouldThrowExceptionWhenDependencyImplementationIsMissingViaSetter() { assertThat(noSuchBeanException.getMessage()).isEqualTo(expectedMessage); } - @DisplayName("Should inject implementations of Interface to Set Constructor in appropriate Order") + @DisplayName("Should inject implementations of Interface to Set Setter in appropriate Order") @Test - void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { + void shouldInjectListOfInterfaceImplementationToSetSetterInOrder() { // given var bringApplicationContext = BringApplication.run(TEST_DATA_PACKAGE + ".positive.setsetterinjector"); var children = Set.of( - testdata.di.positive.setsetterinjector.B.class, - testdata.di.positive.setsetterinjector.C.class); + bringApplicationContext.getBean(testdata.di.positive.setsetterinjector.B.class), + bringApplicationContext.getBean(testdata.di.positive.setsetterinjector.C.class) + ); // when var aBean = bringApplicationContext.getBean(ASetter.class); @@ -91,7 +92,8 @@ void shouldInjectListOfInterfaceImplementationToSetFieldInOrder() { // then assertThat(aBean).isNotNull(); assertThat(aBean.getSet()).isNotNull(); - assertThat(aBean.getSet()).allSatisfy(child -> assertThat(children).contains(child.getClass())); + assertThat(aBean.getSet()).hasSize(2) + .containsAll(children); } diff --git a/core/src/test/java/testdata/di/positive/setconstructorinjector/D.java b/core/src/test/java/testdata/di/positive/setconstructorinjector/D.java index 60aa7c0e..259cf588 100644 --- a/core/src/test/java/testdata/di/positive/setconstructorinjector/D.java +++ b/core/src/test/java/testdata/di/positive/setconstructorinjector/D.java @@ -2,7 +2,6 @@ import com.bobocode.bring.core.annotation.Component; import com.bobocode.bring.core.annotation.Order; -import testdata.di.positive.listfieldinjector.IA; @Component @Order(5)