Download as
Browse Code »

Commit d3909ddd5c620013f4b8458329f5a60dbd172fd9

Authored by Cleverson Sacramento
2 parents 53d345a8 4c1334aa
Exists in master

Resolução de conflitos

Showing 3 changed files with 4 additions and 14 deletions   Show diff stats
impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java
  Diff comments   View file @d3909dd
@@ -46,8 +46,6 @@ import static org.powermock.api.easymock.PowerMock.replayAll; @@ -46,8 +46,6 @@ import static org.powermock.api.easymock.PowerMock.replayAll;
46 import static org.powermock.api.easymock.PowerMock.verify; 46 import static org.powermock.api.easymock.PowerMock.verify;
47 import static org.powermock.reflect.Whitebox.setInternalState; 47 import static org.powermock.reflect.Whitebox.setInternalState;
48 48
49 -import java.util.Locale;  
50 -  
51 import javax.transaction.HeuristicMixedException; 49 import javax.transaction.HeuristicMixedException;
52 import javax.transaction.HeuristicRollbackException; 50 import javax.transaction.HeuristicRollbackException;
53 import javax.transaction.NotSupportedException; 51 import javax.transaction.NotSupportedException;
@@ -62,11 +60,8 @@ import org.junit.Test; @@ -62,11 +60,8 @@ import org.junit.Test;
62 import org.junit.runner.RunWith; 60 import org.junit.runner.RunWith;
63 import org.powermock.core.classloader.annotations.PrepareForTest; 61 import org.powermock.core.classloader.annotations.PrepareForTest;
64 import org.powermock.modules.junit4.PowerMockRunner; 62 import org.powermock.modules.junit4.PowerMockRunner;
65 -import org.slf4j.Logger;  
66 -import org.slf4j.LoggerFactory;  
67 63
68 import br.gov.frameworkdemoiselle.util.Beans; 64 import br.gov.frameworkdemoiselle.util.Beans;
69 -import br.gov.frameworkdemoiselle.util.ResourceBundle;  
70 65
71 @RunWith(PowerMockRunner.class) 66 @RunWith(PowerMockRunner.class)
72 @PrepareForTest({ Beans.class }) 67 @PrepareForTest({ Beans.class })
@@ -76,21 +71,12 @@ public class JTATransactionTest { @@ -76,21 +71,12 @@ public class JTATransactionTest {
76 71
77 private JTATransaction jtaTransaction; 72 private JTATransaction jtaTransaction;
78 73
79 - private Logger logger;  
80 -  
81 - private ResourceBundle bundle;  
82 -  
83 @Before 74 @Before
84 public void setUp() { 75 public void setUp() {
85 -  
86 userTransaction = createMock(UserTransaction.class); 76 userTransaction = createMock(UserTransaction.class);
87 jtaTransaction = new JTATransaction(); 77 jtaTransaction = new JTATransaction();
88 - logger = LoggerFactory.getLogger(JTATransaction.class);  
89 - bundle = new ResourceBundle("demoiselle-jta-bundle",Locale.getDefault());  
90 78
91 setInternalState(jtaTransaction, UserTransaction.class, userTransaction); 79 setInternalState(jtaTransaction, UserTransaction.class, userTransaction);
92 - setInternalState(jtaTransaction, Logger.class, logger);  
93 - setInternalState(jtaTransaction, ResourceBundle.class, bundle);  
94 } 80 }
95 81
96 @Test 82 @Test
parent/bom/pom.xml
  Diff comments   View file @d3909dd
@@ -104,11 +104,13 @@ @@ -104,11 +104,13 @@
104 <artifactId>demoiselle-se</artifactId> 104 <artifactId>demoiselle-se</artifactId>
105 <version>2.4.0-BETA1-SNAPSHOT</version> 105 <version>2.4.0-BETA1-SNAPSHOT</version>
106 </dependency> 106 </dependency>
  107 +<!--
107 <dependency> 108 <dependency>
108 <groupId>br.gov.frameworkdemoiselle</groupId> 109 <groupId>br.gov.frameworkdemoiselle</groupId>
109 <artifactId>demoiselle-jaas</artifactId> 110 <artifactId>demoiselle-jaas</artifactId>
110 <version>2.4.0-BETA1-SNAPSHOT</version> 111 <version>2.4.0-BETA1-SNAPSHOT</version>
111 </dependency> 112 </dependency>
  113 +-->
112 114
113 <!-- jsr-299 api --> 115 <!-- jsr-299 api -->
114 <dependency> 116 <dependency>
@@ -71,7 +71,9 @@ @@ -71,7 +71,9 @@
71 <module>impl/extension/jta</module> 71 <module>impl/extension/jta</module>
72 <module>impl/extension/se</module> 72 <module>impl/extension/se</module>
73 <module>impl/extension/servlet</module> 73 <module>impl/extension/servlet</module>
  74 +<!--
74 <module>impl/extension/jaas</module> 75 <module>impl/extension/jaas</module>
  76 +-->
75 <module>archetype/minimal</module> 77 <module>archetype/minimal</module>
76 <module>archetype/jsf-jpa</module> 78 <module>archetype/jsf-jpa</module>
77 <module>documentation/quickstart</module> 79 <module>documentation/quickstart</module>