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-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
View File

@@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Abstract support class to test {@link TransactionAspectSupport} with reactive methods.
@@ -79,7 +79,7 @@ public abstract class AbstractReactiveTransactionAspectTests {
checkReactiveTransaction(false);
// expect no calls
verifyZeroInteractions(rtm);
verifyNoInteractions(rtm);
}
/**

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
View File

@@ -42,7 +42,7 @@ import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Mock object based tests for transaction aspects. A true unit test in that it
@@ -90,7 +90,7 @@ public abstract class AbstractTransactionAspectTests {
checkTransactionStatus(false);
// expect no calls
verifyZeroInteractions(ptm);
verifyNoInteractions(ptm);
}
/**

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
View File

@@ -45,7 +45,7 @@ import org.springframework.transaction.TransactionStatus;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Test cases for AOP transaction management.
@@ -148,7 +148,7 @@ public class BeanFactoryTransactionTests {
assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue();
// Expect no methods
verifyZeroInteractions(ptm);
verifyNoInteractions(ptm);
// Install facade expecting a call
final TransactionStatus ts = mock(TransactionStatus.class);