root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #6842 from izeye/fix-test-20160908 

* pr/6842:
  Fix ResetMocksTestExecutionListenerTests
This commit is contained in:
Phillip Webb 2016-09-08 16:14:47 -07:00
parent 91e6a5fbee 11aa4d0749
commit 6ec3648a10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
View File

@ -75,16 +75,16 @@ public class ResetMocksTestExecutionListenerTests {
@Bean @Bean
public ExampleService after(MockitoBeans mockedBeans) { public ExampleService after(MockitoBeans mockedBeans) {
ExampleService mock = mock(ExampleService.class, MockReset.before()); ExampleService mock = mock(ExampleService.class, MockReset.after());
mockedBeans.add(mock); mockedBeans.add(mock);
return mock; return mock;
} }
@Bean @Bean
public ExampleService none(MockitoBeans mockedBeans) { public ExampleService none(MockitoBeans mockedBeans) {
ExampleService mock = mock(ExampleService.class, MockReset.before()); ExampleService mock = mock(ExampleService.class);
mockedBeans.add(mock); mockedBeans.add(mock);
return mock(ExampleService.class); return mock;
} }
@Bean @Bean