2023-09 spring-07-advanced-config updated

2023-09/spring-07-advanced-config/test-configuration-solution-1/src/test/java/ru/otus/example/testconfigurationdemo/demo/NestedConfigurationDemoTest.java

@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
 import ru.otus.example.testconfigurationdemo.family.FamilyMember;
 import ru.otus.example.testconfigurationdemo.family.pets.Dog;
 
@@ -16,6 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @DisplayName("В NestedConfigurationDemoTest семья должна ")
 @SpringBootTest
+//@SpringBootTest(classes = Dog.class)
+//@ContextConfiguration(classes = Dog.class)
 public class NestedConfigurationDemoTest {
 
     @ComponentScan("ru.otus.example.testconfigurationdemo.family.pets")

2023-09/spring-07-advanced-config/test-configuration-solution-2/src/test/java/ru/otus/example/testconfigurationdemo/demo/NestedTestConfigurationDemoTest.java

@@ -6,8 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.TestPropertySource;
 import ru.otus.example.testconfigurationdemo.family.FamilyMember;
 import ru.otus.example.testconfigurationdemo.family.parents.Father;
+import ru.otus.example.testconfigurationdemo.family.pets.Dog;
 
 import java.util.Map;
 
@@ -15,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @DisplayName("В NestedTestConfigurationDemoTest семья должна ")
 @SpringBootTest
+//@TestPropertySource(properties = "spring.main.allow-bean-definition-overriding=true")
 public class NestedTestConfigurationDemoTest {
 
     @TestConfiguration
@@ -23,6 +26,18 @@ public class NestedTestConfigurationDemoTest {
         FamilyMember father() {
             return new Father();
         }
+
+/*
+        @Bean
+        FamilyMember dog() {
+            return new Dog() {
+                @Override
+                public String getName() {
+                    return "Злая собака";
+                }
+            };
+        }
+*/
     }
 
     @Autowired