Commit 78c36c7855361367f62e8ca838140774f04a4f40
1 parent
31a0eb70
Exists in
master
Refatoração dos testes unitários: TransactionInterceptorTest e
TransactionExceptionTest
Showing
2 changed files
with
68 additions
and
23 deletions
Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java
@@ -35,22 +35,36 @@ | @@ -35,22 +35,36 @@ | ||
35 | * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. | 35 | * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. |
36 | */ | 36 | */ |
37 | package br.gov.frameworkdemoiselle.internal.interceptor; | 37 | package br.gov.frameworkdemoiselle.internal.interceptor; |
38 | + | ||
38 | import static org.easymock.EasyMock.expect; | 39 | import static org.easymock.EasyMock.expect; |
39 | -import static org.easymock.EasyMock.replay; | ||
40 | import static org.easymock.EasyMock.verify; | 40 | import static org.easymock.EasyMock.verify; |
41 | import static org.junit.Assert.assertEquals; | 41 | import static org.junit.Assert.assertEquals; |
42 | import static org.junit.Assert.assertTrue; | 42 | import static org.junit.Assert.assertTrue; |
43 | import static org.junit.Assert.fail; | 43 | import static org.junit.Assert.fail; |
44 | +import static org.powermock.api.easymock.PowerMock.mockStatic; | ||
45 | +import static org.powermock.api.easymock.PowerMock.replay; | ||
46 | +import static org.powermock.api.easymock.PowerMock.replayAll; | ||
47 | + | ||
48 | +import java.util.Locale; | ||
44 | 49 | ||
50 | +import javax.enterprise.inject.Instance; | ||
45 | import javax.interceptor.InvocationContext; | 51 | import javax.interceptor.InvocationContext; |
46 | 52 | ||
47 | import org.easymock.EasyMock; | 53 | import org.easymock.EasyMock; |
48 | -import org.junit.Ignore; | 54 | +import org.junit.Before; |
49 | import org.junit.Test; | 55 | import org.junit.Test; |
56 | +import org.junit.runner.RunWith; | ||
57 | +import org.powermock.core.classloader.annotations.PrepareForTest; | ||
58 | +import org.powermock.modules.junit4.PowerMockRunner; | ||
50 | 59 | ||
51 | import br.gov.frameworkdemoiselle.DemoiselleException; | 60 | import br.gov.frameworkdemoiselle.DemoiselleException; |
61 | +import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo; | ||
52 | import br.gov.frameworkdemoiselle.transaction.Transaction; | 62 | import br.gov.frameworkdemoiselle.transaction.Transaction; |
53 | -@Ignore | 63 | +import br.gov.frameworkdemoiselle.transaction.TransactionContext; |
64 | +import br.gov.frameworkdemoiselle.util.Beans; | ||
65 | + | ||
66 | +@RunWith(PowerMockRunner.class) | ||
67 | +@PrepareForTest(Beans.class) | ||
54 | public class TransactionalInterceptorTest { | 68 | public class TransactionalInterceptorTest { |
55 | 69 | ||
56 | private TransactionalInterceptor interceptor; | 70 | private TransactionalInterceptor interceptor; |
@@ -59,6 +73,8 @@ public class TransactionalInterceptorTest { | @@ -59,6 +73,8 @@ public class TransactionalInterceptorTest { | ||
59 | 73 | ||
60 | private Transaction transaction; | 74 | private Transaction transaction; |
61 | 75 | ||
76 | + private TransactionContext transactionContext; | ||
77 | + | ||
62 | class ClassWithMethod { | 78 | class ClassWithMethod { |
63 | 79 | ||
64 | public void method() { | 80 | public void method() { |
@@ -66,26 +82,35 @@ public class TransactionalInterceptorTest { | @@ -66,26 +82,35 @@ public class TransactionalInterceptorTest { | ||
66 | } | 82 | } |
67 | } | 83 | } |
68 | 84 | ||
69 | - // @Before | ||
70 | - // @SuppressWarnings("unchecked") | ||
71 | - // public void setUp() throws Exception { | ||
72 | - // Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class); | ||
73 | - // Instance<TransactionInfo> transactionContextInstance = EasyMock.createMock(Instance.class); | ||
74 | - // | ||
75 | - // Logger logger = EasyMock.createMock(Logger.class); | ||
76 | - // ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault()); | ||
77 | - // transaction = EasyMock.createMock(Transaction.class); | ||
78 | - // TransactionInfo context = new TransactionInfo(); | ||
79 | - // | ||
80 | - // this.interceptor = new TransactionalInterceptor(transactionInstance, transactionContextInstance, logger, bundle); | ||
81 | - // this.ic = EasyMock.createMock(InvocationContext.class); | ||
82 | - // | ||
83 | - // expect(transactionInstance.get()).andReturn(transaction).anyTimes(); | ||
84 | - // expect(transactionContextInstance.get()).andReturn(context).anyTimes(); | ||
85 | - // expect(this.ic.proceed()).andReturn(null); | ||
86 | - // expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); | ||
87 | - // replay(this.ic, transactionInstance, transactionContextInstance); | ||
88 | - // } | 85 | + @Before |
86 | + @SuppressWarnings("unchecked") | ||
87 | + public void setUp() throws Exception { | ||
88 | + Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class); | ||
89 | + Instance<TransactionInfo> transactionInfoInstance = EasyMock.createMock(Instance.class); | ||
90 | + Instance<TransactionContext> transactionContextInstance = EasyMock.createMock(Instance.class); | ||
91 | + | ||
92 | + TransactionInfo transactionInfo = new TransactionInfo(); | ||
93 | + transaction = EasyMock.createMock(Transaction.class); | ||
94 | + this.transactionContext = EasyMock.createMock(TransactionContext.class); | ||
95 | + this.ic = EasyMock.createMock(InvocationContext.class); | ||
96 | + | ||
97 | + mockStatic(Beans.class); | ||
98 | + expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); | ||
99 | + expect(Beans.getReference(TransactionContext.class)).andReturn(transactionContext); | ||
100 | + expect(Beans.getReference(TransactionInfo.class)).andReturn(transactionInfo); | ||
101 | + | ||
102 | + expect(transactionInstance.get()).andReturn(transaction).anyTimes(); | ||
103 | + expect(transactionContextInstance.get()).andReturn(transactionContext).anyTimes(); | ||
104 | + expect(transactionInfoInstance.get()).andReturn(transactionInfo).anyTimes(); | ||
105 | + expect(transactionContext.getCurrentTransaction()).andReturn(transaction).anyTimes(); | ||
106 | + expect(this.ic.proceed()).andReturn(null); | ||
107 | + expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); | ||
108 | + replayAll(Beans.class, this.ic, transactionContextInstance, transactionInfoInstance, transactionInstance, | ||
109 | + transactionContext); | ||
110 | + | ||
111 | + this.interceptor = new TransactionalInterceptor(); | ||
112 | + | ||
113 | + } | ||
89 | 114 | ||
90 | @Test | 115 | @Test |
91 | public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback() | 116 | public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback() |
impl/core/src/test/java/br/gov/frameworkdemoiselle/transaction/TransactionExceptionTest.java
0 → 100644
@@ -0,0 +1,20 @@ | @@ -0,0 +1,20 @@ | ||
1 | +package br.gov.frameworkdemoiselle.transaction; | ||
2 | + | ||
3 | +import java.sql.SQLException; | ||
4 | + | ||
5 | +import junit.framework.Assert; | ||
6 | + | ||
7 | +import org.junit.Test; | ||
8 | + | ||
9 | + | ||
10 | +public class TransactionExceptionTest { | ||
11 | + | ||
12 | + SQLException cause = new SQLException(); | ||
13 | + | ||
14 | + @Test | ||
15 | + public void testTransactionException() { | ||
16 | + TransactionException test = new TransactionException(cause); | ||
17 | + Assert.assertEquals("java.sql.SQLException", test.getCause().toString()); | ||
18 | + } | ||
19 | + | ||
20 | +} |