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

Fix Mockito deprecations

Browse Source
This commit is contained in:
Christoph Dreis
2019-10-30 18:13:02 +01:00
committed by Juergen Hoeller
parent 4beb25b318
commit 3c17178b16
14 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Tests for various parameter binding scenarios with before advice.
@@ -129,7 +129,7 @@ public class AfterReturningAdviceBindingTests {
public void testNoInvokeWhenReturningParameterTypeDoesNotMatch() {
testBeanProxy.setSpouse(this.testBeanProxy);
testBeanProxy.getSpouse();
verifyZeroInteractions(mockCollaborator);
verifyNoInteractions(mockCollaborator);
}
@Test

6
spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.instrument.classloading.LoadTimeWeaver;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Unit tests for @EnableLoadTimeWeaving
@@ -50,7 +50,7 @@ public class EnableLoadTimeWeavingTests {
ctx.register(EnableLTWConfig_withAjWeavingDisabled.class);
ctx.refresh();
LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
verifyZeroInteractions(loadTimeWeaver);
verifyNoInteractions(loadTimeWeaver);
}
@Test
@@ -61,7 +61,7 @@ public class EnableLoadTimeWeavingTests {
LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
// no expectations -> a class file transformer should NOT be added
// because no META-INF/aop.xml is present on the classpath
verifyZeroInteractions(loadTimeWeaver);
verifyNoInteractions(loadTimeWeaver);
}
@Test

4
spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
View File

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* @author Rod Johnson
@@ -175,7 +175,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
.withMessageContaining("businessInterface");
// Expect no methods on home
verifyZeroInteractions(home);
verifyNoInteractions(home);
}

4
spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
View File

@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* @author Rod Johnson
@@ -260,7 +260,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
.withMessageContaining("businessInterface");
// Expect no methods on home
verifyZeroInteractions(home);
verifyNoInteractions(home);
}