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

Migrate to Mockito.mock(T...) where feasible

Browse Source
This commit is contained in:
Sam Brannen
2023-01-19 14:32:29 +01:00
parent c3d123fef7
commit c4c786596f
369 changed files with 2267 additions and 2707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java
View File

@@ -74,7 +74,7 @@ public class PersistenceExceptionTranslationInterceptorTests extends Persistence
interceptor.setAlwaysTranslate(true);
RuntimeException exception = new RuntimeException();
MethodInvocation invocation = mock(MethodInvocation.class);
MethodInvocation invocation = mock();
given(invocation.proceed()).willThrow(exception);
assertThatThrownBy(() -> interceptor.invoke(invocation)).isSameAs(exception);

6
spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
View File

@@ -55,7 +55,7 @@ public class LocalConnectionFactoryBeanTests {
@Test
public void testCreatesVanillaConnectionFactoryIfNoConnectionManagerHasBeenConfigured() throws Exception {
final Object CONNECTION_FACTORY = new Object();
ManagedConnectionFactory managedConnectionFactory = mock(ManagedConnectionFactory.class);
ManagedConnectionFactory managedConnectionFactory = mock();
given(managedConnectionFactory.createConnectionFactory()).willReturn(CONNECTION_FACTORY);
LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean();
factory.setManagedConnectionFactory(managedConnectionFactory);
@@ -65,8 +65,8 @@ public class LocalConnectionFactoryBeanTests {
@Test
public void testCreatesManagedConnectionFactoryIfAConnectionManagerHasBeenConfigured() throws Exception {
ManagedConnectionFactory managedConnectionFactory = mock(ManagedConnectionFactory.class);
ConnectionManager connectionManager = mock(ConnectionManager.class);
ManagedConnectionFactory managedConnectionFactory = mock();
ConnectionManager connectionManager = mock();
LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean();
factory.setManagedConnectionFactory(managedConnectionFactory);
factory.setConnectionManager(connectionManager);

12
spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
View File

@@ -63,8 +63,8 @@ public class JndiJtaTransactionManagerTests {
private void doTestJtaTransactionManagerWithDefaultJndiLookups(String tmName, boolean tmFound, boolean defaultUt)
throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
if (defaultUt) {
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
}
@@ -128,10 +128,10 @@ public class JndiJtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithCustomJndiLookups() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
TransactionManager tm = mock(TransactionManager.class);
TransactionManager tm = mock();
JtaTransactionManager ptm = new JtaTransactionManager();
ptm.setUserTransactionName("jndi-ut");
@@ -167,10 +167,10 @@ public class JndiJtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithNotCacheUserTransaction() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
UserTransaction ut2 = mock(UserTransaction.class);
UserTransaction ut2 = mock();
given(ut2.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
JtaTransactionManager ptm = new JtaTransactionManager();

134
spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
View File

@@ -55,10 +55,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -92,10 +92,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithCommitAndSynchronizationOnActual() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -121,7 +121,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithCommitAndSynchronizationNever() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(
Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
@@ -145,9 +145,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithRollback() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -180,9 +180,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithRollbackAndSynchronizationOnActual() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -208,7 +208,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithRollbackAndSynchronizationNever() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -235,10 +235,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndRollbackOnly() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -260,10 +260,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndException() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -286,10 +286,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndCommitException() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
willThrow(new OptimisticLockingFailureException("")).given(synch).beforeCommit(false);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -312,10 +312,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndRollbackOnlyAndNoGlobalRollback() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
ptm.setGlobalRollbackOnParticipationFailure(false);
@@ -338,9 +338,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndExceptionAndNoGlobalRollback() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
ptm.setGlobalRollbackOnParticipationFailure(false);
@@ -363,14 +363,14 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndJtaSynchronization() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
MockJtaTransaction tx = new MockJtaTransaction();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
given(tm.getTransaction()).willReturn(tx);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut, tm);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -395,10 +395,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndSynchronizationOnActual() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -421,7 +421,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingTransactionAndSynchronizationNever() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -444,10 +444,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithExistingAndPropagationSupports() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -470,10 +470,10 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationSupports() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION);
final TransactionSynchronization synch = mock(TransactionSynchronization.class);
final TransactionSynchronization synch = mock();
JtaTransactionManager ptm = newJtaTransactionManager(ut);
TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -495,7 +495,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationSupportsAndSynchronizationOnActual() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -517,7 +517,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationSupportsAndSynchronizationNever() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -539,9 +539,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationNotSupported() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
Transaction tx = mock(Transaction.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
Transaction tx = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
given(tm.suspend()).willReturn(tx);
@@ -563,9 +563,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNew() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
Transaction tx = mock(Transaction.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
Transaction tx = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
@@ -611,7 +611,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewWithinSupports() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
@@ -651,9 +651,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewAndExisting() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
Transaction tx = mock(Transaction.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
Transaction tx = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
given(tm.suspend()).willReturn(tx);
@@ -676,8 +676,8 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewAndExistingWithSuspendException() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
willThrow(new SystemException()).given(tm).suspend();
@@ -697,9 +697,9 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewAndExistingWithBeginException() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
Transaction tx = mock(Transaction.class);
UserTransaction ut = mock();
TransactionManager tm = mock();
Transaction tx = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
given(tm.suspend()).willReturn(tx);
willThrow(new SystemException()).given(ut).begin();
@@ -721,8 +721,8 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewAndAdapter() throws Exception {
TransactionManager tm = mock(TransactionManager.class);
Transaction tx = mock(Transaction.class);
TransactionManager tm = mock();
Transaction tx = mock();
given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
given(tm.suspend()).willReturn(tx);
@@ -745,7 +745,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithPropagationRequiresNewAndSuspensionNotSupported() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -763,7 +763,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithIsolationLevel() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION);
assertThatExceptionOfType(InvalidIsolationLevelException.class).isThrownBy(() -> {
@@ -781,7 +781,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithSystemExceptionOnIsExisting() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willThrow(new SystemException("system exception"));
assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() -> {
@@ -798,7 +798,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithNestedBegin() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -817,7 +817,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithNotSupportedExceptionOnNestedBegin() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
willThrow(new NotSupportedException("not supported")).given(ut).begin();
@@ -836,7 +836,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithUnsupportedOperationExceptionOnNestedBegin() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
willThrow(new UnsupportedOperationException("not supported")).given(ut).begin();
@@ -855,7 +855,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithSystemExceptionOnBegin() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION);
willThrow(new SystemException("system exception")).given(ut).begin();
@@ -873,7 +873,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithRollbackExceptionOnCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
willThrow(new RollbackException("unexpected rollback")).given(ut).commit();
@@ -909,7 +909,7 @@ public class JtaTransactionManagerTests {
}
private void doTestJtaTransactionManagerWithNoExceptionOnGlobalRollbackOnly(boolean failEarly) throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_MARKED_ROLLBACK, Status.STATUS_MARKED_ROLLBACK,
Status.STATUS_MARKED_ROLLBACK);
@@ -962,7 +962,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithHeuristicMixedExceptionOnCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
willThrow(new HeuristicMixedException("heuristic exception")).given(ut).commit();
@@ -989,7 +989,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithHeuristicRollbackExceptionOnCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
willThrow(new HeuristicRollbackException("heuristic exception")).given(ut).commit();
@@ -1016,7 +1016,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithSystemExceptionOnCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
willThrow(new SystemException("system exception")).given(ut).commit();
@@ -1043,7 +1043,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithSystemExceptionOnRollback() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
willThrow(new SystemException("system exception")).given(ut).rollback();
@@ -1069,7 +1069,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithIllegalStateExceptionOnRollbackOnly() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
willThrow(new IllegalStateException("no existing transaction")).given(ut).setRollbackOnly();
@@ -1087,7 +1087,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithSystemExceptionOnRollbackOnly() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE);
willThrow(new SystemException("system exception")).given(ut).setRollbackOnly();
@@ -1111,7 +1111,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithDoubleCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
@@ -1131,7 +1131,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithDoubleRollback() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);
@@ -1151,7 +1151,7 @@ public class JtaTransactionManagerTests {
@Test
public void jtaTransactionManagerWithRollbackAndCommit() throws Exception {
UserTransaction ut = mock(UserTransaction.class);
UserTransaction ut = mock();
given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE);
JtaTransactionManager ptm = newJtaTransactionManager(ut);

7
spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java
View File

@@ -23,7 +23,6 @@ import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
import org.springframework.aot.test.generate.TestGenerationContext;
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
import org.springframework.beans.factory.aot.BeanRegistrationCode;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RegisteredBean;
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -93,7 +92,7 @@ public class TransactionBeanRegistrationAotProcessorTests {
private void process(Class<?> beanClass) {
BeanRegistrationAotContribution contribution = createContribution(beanClass);
if (contribution != null) {
contribution.applyTo(this.generationContext, mock(BeanRegistrationCode.class));
contribution.applyTo(this.generationContext, mock());
}
}
@@ -123,6 +122,7 @@ public class TransactionBeanRegistrationAotProcessorTests {
@Transactional
static class TransactionalOnTypeBean implements NonAnnotatedTransactionalInterface {
@Override
public void transactional() {
}
}
@@ -130,6 +130,7 @@ public class TransactionBeanRegistrationAotProcessorTests {
@jakarta.transaction.Transactional
static class JakartaTransactionalOnTypeBean implements NonAnnotatedTransactionalInterface {
@Override
public void transactional() {
}
}
@@ -147,6 +148,7 @@ public class TransactionBeanRegistrationAotProcessorTests {
static class TransactionalOnClassMethodBean implements NonAnnotatedTransactionalInterface {
@Override
@Transactional
public void transactional() {
}
@@ -160,6 +162,7 @@ public class TransactionBeanRegistrationAotProcessorTests {
static class TransactionalOnInterfaceMethodBean implements TransactionalOnMethodInterface {
@Override
public void transactional() {
}
}

24
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
View File

@@ -64,7 +64,7 @@ public abstract class AbstractReactiveTransactionAspectTests {
@Test
public void noTransaction() throws Exception {
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransactionManager rtm = mock();
DefaultTestBean tb = new DefaultTestBean();
TransactionAttributeSource tas = new MapTransactionAttributeSource();
@@ -92,8 +92,8 @@ public abstract class AbstractReactiveTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(getNameMethod, txatt);
ReactiveTransaction status = mock(ReactiveTransaction.class);
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransaction status = mock();
ReactiveTransactionManager rtm = mock();
// expect a transaction
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status));
given(rtm.commit(status)).willReturn(Mono.empty());
@@ -120,8 +120,8 @@ public abstract class AbstractReactiveTransactionAspectTests {
MapTransactionAttributeSource tas2 = new MapTransactionAttributeSource();
tas2.register(setNameMethod, txatt);
ReactiveTransaction status = mock(ReactiveTransaction.class);
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransaction status = mock();
ReactiveTransactionManager rtm = mock();
// expect a transaction
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status));
given(rtm.commit(status)).willReturn(Mono.empty());
@@ -150,8 +150,8 @@ public abstract class AbstractReactiveTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(getNameMethod, txatt);
ReactiveTransaction status = mock(ReactiveTransaction.class);
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransaction status = mock();
ReactiveTransactionManager rtm = mock();
// expect a transaction
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status));
given(rtm.commit(status)).willReturn(Mono.empty());
@@ -229,8 +229,8 @@ public abstract class AbstractReactiveTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(m, txatt);
ReactiveTransaction status = mock(ReactiveTransaction.class);
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransaction status = mock();
ReactiveTransactionManager rtm = mock();
// Gets additional call(s) from TransactionControl
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status));
@@ -285,7 +285,7 @@ public abstract class AbstractReactiveTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(m, txatt);
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransactionManager rtm = mock();
// Expect a transaction
CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null);
given(rtm.getReactiveTransaction(txatt)).willThrow(ex);
@@ -320,9 +320,9 @@ public abstract class AbstractReactiveTransactionAspectTests {
// Method m2 = getNameMethod;
// No attributes for m2
ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class);
ReactiveTransactionManager rtm = mock();
ReactiveTransaction status = mock(ReactiveTransaction.class);
ReactiveTransaction status = mock();
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status));
UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null);
given(rtm.commit(status)).willReturn(Mono.error(ex));

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

@@ -75,7 +75,7 @@ public abstract class AbstractTransactionAspectTests {
@Test
public void noTransaction() throws Exception {
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
PlatformTransactionManager ptm = mock();
TestBean tb = new TestBean();
TransactionAttributeSource tas = new MapTransactionAttributeSource();
@@ -103,8 +103,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(getNameMethod, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
// expect a transaction
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -175,8 +175,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas2 = new MapTransactionAttributeSource();
tas2.register(setNameMethod, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
// expect a transaction
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -202,8 +202,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(getNameMethod, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
// expect a transaction
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -225,8 +225,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(exceptionalMethod, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
// Expect a transaction
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -275,10 +275,10 @@ public abstract class AbstractTransactionAspectTests {
tas.register(outerMethod, outerTxatt);
tas.register(innerMethod, innerTxatt);
TransactionStatus outerStatus = mock(TransactionStatus.class);
TransactionStatus innerStatus = mock(TransactionStatus.class);
TransactionStatus outerStatus = mock();
TransactionStatus innerStatus = mock();
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
PlatformTransactionManager ptm = mock();
// Expect a transaction
given(ptm.getTransaction(outerTxatt)).willReturn(outerStatus);
given(ptm.getTransaction(innerTxatt)).willReturn(innerStatus);
@@ -383,8 +383,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(m, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
// Gets additional call(s) from TransactionControl
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -436,8 +436,8 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(m, txatt);
TransactionStatus status = mock(TransactionStatus.class);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
TransactionStatus status = mock();
PlatformTransactionManager ptm = mock();
given(ptm.getTransaction(txatt)).willReturn(status);
@@ -471,7 +471,7 @@ public abstract class AbstractTransactionAspectTests {
MapTransactionAttributeSource tas = new MapTransactionAttributeSource();
tas.register(m, txatt);
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
PlatformTransactionManager ptm = mock();
// Expect a transaction
CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null);
given(ptm.getTransaction(txatt)).willThrow(ex);
@@ -509,9 +509,9 @@ public abstract class AbstractTransactionAspectTests {
// Method m2 = getNameMethod;
// No attributes for m2
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
PlatformTransactionManager ptm = mock();
TransactionStatus status = mock(TransactionStatus.class);
TransactionStatus status = mock();
given(ptm.getTransaction(txatt)).willReturn(status);
UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null);
willThrow(ex).given(ptm).commit(status);

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

@@ -142,7 +142,7 @@ public class BeanFactoryTransactionTests {
private void doTestGetsAreNotTransactional(final ITestBean testBean) {
// Install facade
PlatformTransactionManager ptm = mock(PlatformTransactionManager.class);
PlatformTransactionManager ptm = mock();
PlatformTransactionManagerFacade.delegate = ptm;
assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue();
@@ -151,7 +151,7 @@ public class BeanFactoryTransactionTests {
verifyNoInteractions(ptm);
// Install facade expecting a call
final TransactionStatus ts = mock(TransactionStatus.class);
final TransactionStatus ts = mock();
ptm = new PlatformTransactionManager() {
private boolean invoked;
@Override

26
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
View File

@@ -129,7 +129,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithNoBeanFactory() {
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
PlatformTransactionManager transactionManager = mock();
TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, null);
assertThat(ti.determineTransactionManager(new DefaultTransactionAttribute())).isSameAs(transactionManager);
@@ -137,7 +137,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithNoBeanFactoryAndNoTransactionAttribute() {
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
PlatformTransactionManager transactionManager = mock();
TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, null);
assertThat(ti.determineTransactionManager(null)).isSameAs(transactionManager);
@@ -145,7 +145,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithNoTransactionAttribute() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory);
assertThat(ti.determineTransactionManager(null)).isNull();
@@ -153,7 +153,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithQualifierUnknown() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory);
DefaultTransactionAttribute attribute = new DefaultTransactionAttribute();
attribute.setQualifier("fooTransactionManager");
@@ -165,8 +165,8 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithQualifierAndDefault() {
BeanFactory beanFactory = mock(BeanFactory.class);
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
BeanFactory beanFactory = mock();
PlatformTransactionManager transactionManager = mock();
TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, beanFactory);
PlatformTransactionManager fooTransactionManager =
associateTransactionManager(beanFactory, "fooTransactionManager");
@@ -179,7 +179,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithQualifierAndDefaultName() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
associateTransactionManager(beanFactory, "defaultTransactionManager");
TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName(
"defaultTransactionManager", beanFactory);
@@ -194,7 +194,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithEmptyQualifierAndDefaultName() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
PlatformTransactionManager defaultTransactionManager
= associateTransactionManager(beanFactory, "defaultTransactionManager");
TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName(
@@ -208,7 +208,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithQualifierSeveralTimes() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory);
PlatformTransactionManager txManager = associateTransactionManager(beanFactory, "fooTransactionManager");
@@ -227,7 +227,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerWithBeanNameSeveralTimes() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName(
"fooTransactionManager", beanFactory);
@@ -245,10 +245,10 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
@Test
public void determineTransactionManagerDefaultSeveralTimes() {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory);
PlatformTransactionManager txManager = mock(PlatformTransactionManager.class);
PlatformTransactionManager txManager = mock();
given(beanFactory.getBean(TransactionManager.class)).willReturn(txManager);
DefaultTransactionAttribute attribute = new DefaultTransactionAttribute();
@@ -298,7 +298,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
}
private PlatformTransactionManager associateTransactionManager(BeanFactory beanFactory, String name) {
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
PlatformTransactionManager transactionManager = mock();
given(beanFactory.containsBean(name)).willReturn(true);
given(beanFactory.getBean(name, TransactionManager.class)).willReturn(transactionManager);
return transactionManager;

6
spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
View File

@@ -34,9 +34,9 @@ public class JtaTransactionManagerSerializationTests {
@Test
public void serializable() throws Exception {
UserTransaction ut1 = mock(UserTransaction.class);
UserTransaction ut2 = mock(UserTransaction.class);
TransactionManager tm = mock(TransactionManager.class);
UserTransaction ut1 = mock();
UserTransaction ut2 = mock();
TransactionManager tm = mock();
JtaTransactionManager jtam = new JtaTransactionManager();
jtam.setUserTransaction(ut1);