Merge pull request eugenp#7491 from amit2103/BAEL-16045-19

lor6 · web-flow · commit e4ceadb37ee7 · 2019-10-14T22:23:12.000+03:00
[BAEL-16045] - Check Article Code Matches GitHub for https://www.bael…
diff --git a/spring-mockito/src/main/resources/application.properties b/spring-mockito/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
diff --git a/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java b/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
@@ -11,7 +11,7 @@
 public class NameServiceTestConfiguration {
     @Bean
     @Primary
-    public NameService nameServiceTest() {
+    public NameService nameService() {
         return Mockito.mock(NameService.class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+spring.main.allow-bean-definition-overriding=true`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`public class NameServiceTestConfiguration {`
`12`	`12`	`@Bean`
`13`	`13`	`@Primary`
`14`		`- public NameService nameServiceTest() {`
	`14`	`+ public NameService nameService() {`
`15`	`15`	`return Mockito.mock(NameService.class);`
`16`	`16`	`}`
`17`	`17`	`}`