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

Avoid deprecated Mockito methods

Browse Source 
Issue: SPR-14880
This commit is contained in:
Juergen Hoeller
2016-11-04 20:39:53 +01:00
parent 9b10541111
commit 7f4904ed22
2 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -2706,13 +2706,13 @@ public class DefaultListableBeanFactoryTests {
bf.addEmbeddedValueResolver(r3);
given(r1.resolveStringValue("A")).willReturn("B");
given(r2.resolveStringValue("B")).willReturn(null);
given(r3.resolveStringValue(isNull(String.class))).willThrow(new IllegalArgumentException());
given(r3.resolveStringValue(isNull())).willThrow(new IllegalArgumentException());
bf.resolveEmbeddedValue("A");
verify(r1).resolveStringValue("A");
verify(r2).resolveStringValue("B");
verify(r3, never()).resolveStringValue(isNull(String.class));
verify(r3, never()).resolveStringValue(isNull());
}
@Test