Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2016-09-28 17:00:30 +02:00
parent b186e3f1ef bfd62aba10
commit cdd59707fc
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java
View File

@@ -21,9 +21,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
@@ -47,9 +45,6 @@ import static org.mockito.Mockito.verify;
*/
public class QualifierDefinitionTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
@Mock
private ConfigurableListableBeanFactory beanFactory;