16
16
17
17
package org .springframework .transaction .interceptor ;
18
18
19
- import org .junit .Rule ;
20
- import org .junit .rules .ExpectedException ;
21
-
22
19
import org .springframework .aop .framework .ProxyFactory ;
23
- import org .springframework .beans .factory .BeanFactory ;
24
20
import org .springframework .transaction .ReactiveTransactionManager ;
25
21
26
22
import static org .assertj .core .api .Assertions .*;
27
- import static org .mockito .Mockito .*;
28
23
29
24
/**
30
25
* Unit tests for {@link TransactionInterceptor} with reactive methods.
33
28
*/
34
29
public class ReactiveTransactionInterceptorTests extends AbstractReactiveTransactionAspectTests {
35
30
36
- @ Rule
37
- public final ExpectedException thrown = ExpectedException .none ();
38
-
39
-
40
31
@ Override
41
32
protected Object advised (Object target , ReactiveTransactionManager ptm , TransactionAttributeSource [] tas ) {
42
33
TransactionInterceptor ti = new TransactionInterceptor ();
@@ -66,47 +57,5 @@ protected Object advised(Object target, ReactiveTransactionManager ptm, Transact
66
57
pf .addAdvice (0 , ti );
67
58
return pf .getProxy ();
68
59
}
69
-
70
- private TransactionInterceptor createTransactionInterceptor (BeanFactory beanFactory ,
71
- String transactionManagerName , ReactiveTransactionManager transactionManager ) {
72
-
73
- TransactionInterceptor ti = new TransactionInterceptor ();
74
- if (beanFactory != null ) {
75
- ti .setBeanFactory (beanFactory );
76
- }
77
- if (transactionManagerName != null ) {
78
- ti .setTransactionManagerBeanName (transactionManagerName );
79
-
80
- }
81
- if (transactionManager != null ) {
82
- ti .setTransactionManager (transactionManager );
83
- }
84
- ti .setTransactionAttributeSource (new NameMatchTransactionAttributeSource ());
85
- ti .afterPropertiesSet ();
86
- return ti ;
87
- }
88
-
89
- private TransactionInterceptor transactionInterceptorWithTransactionManager (
90
- ReactiveTransactionManager transactionManager , BeanFactory beanFactory ) {
91
-
92
- return createTransactionInterceptor (beanFactory , null , transactionManager );
93
- }
94
-
95
- private TransactionInterceptor transactionInterceptorWithTransactionManagerName (
96
- String transactionManagerName , BeanFactory beanFactory ) {
97
-
98
- return createTransactionInterceptor (beanFactory , transactionManagerName , null );
99
- }
100
-
101
- private TransactionInterceptor simpleTransactionInterceptor (BeanFactory beanFactory ) {
102
- return createTransactionInterceptor (beanFactory , null , null );
103
- }
104
-
105
- private ReactiveTransactionManager associateTransactionManager (BeanFactory beanFactory , String name ) {
106
- ReactiveTransactionManager transactionManager = mock (ReactiveTransactionManager .class );
107
- when (beanFactory .containsBean (name )).thenReturn (true );
108
- when (beanFactory .getBean (name , ReactiveTransactionManager .class )).thenReturn (transactionManager );
109
- return transactionManager ;
110
- }
111
60
112
61
}
0 commit comments