Download as
Browse Code »

Commit 79322f7a8b222c179e99a0eb9a2fa6f9a26231dc

Authored by Cleverson Sacramento
1 parent 26c10066
Exists in master

Todos os testes rodando com o Glassfish Embedded e Arquillian

Showing 9 changed files with 32 additions and 57 deletions   Show diff stats
impl/extension/jdbc/pom.xml
  Diff comments   View file @79322f7
... ... @@ -71,6 +71,13 @@
71 71 <groupId>commons-dbcp</groupId>
72 72 <artifactId>commons-dbcp</artifactId>
73 73 </dependency>
  74 +
  75 + <!-- for tests -->
  76 + <dependency>
  77 + <groupId>hsqldb</groupId>
  78 + <artifactId>hsqldb</artifactId>
  79 + <scope>test</scope>
  80 + </dependency>
74 81 </dependencies>
75 82  
76 83 <repositories>
... ... @@ -110,4 +117,8 @@
110 117 </dependencies>
111 118 </profile>
112 119 </profiles>
  120 +
  121 + <properties>
  122 + <arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
  123 + </properties>
113 124 </project>
... ...
impl/extension/jdbc/src/test/java/test/Tests.java
  Diff comments   View file @79322f7
... ... @@ -45,16 +45,8 @@ import javax.enterprise.inject.Produces;
45 45 import org.jboss.shrinkwrap.api.ShrinkWrap;
46 46 import org.jboss.shrinkwrap.api.asset.FileAsset;
47 47 import org.jboss.shrinkwrap.api.spec.WebArchive;
48   -import org.jboss.shrinkwrap.resolver.api.maven.Maven;
49 48 import org.junit.Ignore;
50 49  
51   -import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
52   -import br.gov.frameworkdemoiselle.internal.producer.ConnectionProducer;
53   -import br.gov.frameworkdemoiselle.internal.producer.DataSourceProducer;
54   -import br.gov.frameworkdemoiselle.internal.proxy.BasicDataSourceProxy;
55   -import br.gov.frameworkdemoiselle.internal.proxy.ConnectionProxy;
56   -import br.gov.frameworkdemoiselle.transaction.JDBCTransaction;
57   -
58 50 @Ignore
59 51 public final class Tests {
60 52  
... ... @@ -66,22 +58,13 @@ public final class Tests {
66 58 }
67 59  
68 60 private static WebArchive createDeployment() {
69   - File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
70   - .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
71   -
72 61 return ShrinkWrap
73 62 .create(WebArchive.class)
74 63 .addClass(Tests.class)
75   - .addClass(JDBCConfig.class)
76   - .addClass(ConnectionProducer.class)
77   - .addClass(DataSourceProducer.class)
78   - .addClass(BasicDataSourceProxy.class)
79   - .addClass(ConnectionProxy.class)
80   - .addClass(JDBCTransaction.class)
  64 + .addPackages(true, "br")
81 65 .addAsResource(createFileAsset("src/main/resources/demoiselle-jdbc-bundle.properties"),
82 66 "demoiselle-jdbc-bundle.properties")
83   - .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
84   - .addAsLibraries(libs);
  67 + .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
85 68 }
86 69  
87 70 public static FileAsset createFileAsset(final String pathname) {
... ...
impl/extension/jpa/pom.xml
  Diff comments   View file @79322f7
... ... @@ -110,4 +110,8 @@
110 110 </dependencies>
111 111 </profile>
112 112 </profiles>
  113 +
  114 + <properties>
  115 + <arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
  116 + </properties>
113 117 </project>
... ...
impl/extension/jpa/src/test/java/test/Tests.java
  Diff comments   View file @79322f7
... ... @@ -45,18 +45,8 @@ import javax.enterprise.inject.Produces;
45 45 import org.jboss.shrinkwrap.api.ShrinkWrap;
46 46 import org.jboss.shrinkwrap.api.asset.FileAsset;
47 47 import org.jboss.shrinkwrap.api.spec.WebArchive;
48   -import org.jboss.shrinkwrap.resolver.api.maven.Maven;
49 48 import org.junit.Ignore;
50 49  
51   -import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
52   -import br.gov.frameworkdemoiselle.internal.producer.EntityManagerFactoryProducer;
53   -import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
54   -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
55   -import br.gov.frameworkdemoiselle.internal.proxy.QueryProxy;
56   -import br.gov.frameworkdemoiselle.internal.proxy.TypedQueryProxy;
57   -import br.gov.frameworkdemoiselle.template.JPACrud;
58   -import br.gov.frameworkdemoiselle.transaction.JPATransaction;
59   -
60 50 @Ignore
61 51 public final class Tests {
62 52  
... ... @@ -68,24 +58,13 @@ public final class Tests {
68 58 }
69 59  
70 60 private static WebArchive createDeployment() {
71   - File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
72   - .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
73   -
74 61 return ShrinkWrap
75 62 .create(WebArchive.class)
76 63 .addClass(Tests.class)
77   - .addClass(EntityManagerConfig.class)
78   - .addClass(EntityManagerFactoryProducer.class)
79   - .addClass(EntityManagerProducer.class)
80   - .addClass(EntityManagerProxy.class)
81   - .addClass(QueryProxy.class)
82   - .addClass(TypedQueryProxy.class)
83   - .addClass(JPACrud.class)
84   - .addClass(JPATransaction.class)
  64 + .addPackages(true, "br")
85 65 .addAsResource(createFileAsset("src/main/resources/demoiselle-jpa-bundle.properties"),
86 66 "demoiselle-jpa-bundle.properties")
87   - .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
88   - .addAsLibraries(libs);
  67 + .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
89 68 }
90 69  
91 70 public static FileAsset createFileAsset(final String pathname) {
... ...
impl/extension/jta/pom.xml
  Diff comments   View file @79322f7
... ... @@ -71,7 +71,7 @@
71 71 <groupId>javax.transaction</groupId>
72 72 <artifactId>jta</artifactId>
73 73 </dependency>
74   -
  74 +
75 75 <dependency>
76 76 <groupId>org.hibernate</groupId>
77 77 <artifactId>hibernate-entitymanager</artifactId>
... ... @@ -103,4 +103,8 @@
103 103 </releases>
104 104 </repository>
105 105 </repositories>
  106 +
  107 + <properties>
  108 + <arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
  109 + </properties>
106 110 </project>
... ...
impl/extension/jta/src/test/java/jtatransaction/interceptor/InterceptorJTATransactionTest.java
  Diff comments   View file @79322f7
... ... @@ -6,7 +6,7 @@ import static junit.framework.Assert.assertNull;
6 6  
7 7 import javax.persistence.EntityManager;
8 8 import javax.persistence.PersistenceContext;
9   -import javax.transaction.TransactionRequiredException;
  9 +import javax.persistence.TransactionRequiredException;
10 10  
11 11 import org.jboss.arquillian.container.test.api.Deployment;
12 12 import org.jboss.arquillian.junit.Arquillian;
... ...
impl/extension/jta/src/test/java/test/Tests.java
  Diff comments   View file @79322f7
... ... @@ -46,11 +46,8 @@ import javax.enterprise.inject.Produces;
46 46 import org.jboss.shrinkwrap.api.ShrinkWrap;
47 47 import org.jboss.shrinkwrap.api.asset.FileAsset;
48 48 import org.jboss.shrinkwrap.api.spec.WebArchive;
49   -import org.jboss.shrinkwrap.resolver.api.maven.Maven;
50 49 import org.junit.Ignore;
51 50  
52   -import br.gov.frameworkdemoiselle.transaction.JTATransaction;
53   -
54 51 @Ignore
55 52 public final class Tests {
56 53  
... ... @@ -62,17 +59,14 @@ public final class Tests {
62 59 }
63 60  
64 61 public static WebArchive createDeployment() {
65   - File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml" , "arquillian-test")
66   - .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
67   -
68 62 return ShrinkWrap
69 63 .create(WebArchive.class)
70 64 .addClass(Tests.class)
71   - .addClass(JTATransaction.class)
72   - .addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties") , "demoiselle-jta-bundle.properties" )
73   - .addAsResource(createFileAsset("src/test/resources/log/log4j.properties") , "log4j.properties" )
74   - .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
75   - .addAsLibraries(libs);
  65 + .addPackages(true, "br")
  66 + .addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties"),
  67 + "demoiselle-jta-bundle.properties")
  68 + .addAsResource(createFileAsset("src/test/resources/log/log4j.properties"), "log4j.properties")
  69 + .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
76 70 }
77 71  
78 72 public static FileAsset createFileAsset(final String pathname) {
... ...
impl/extension/servlet/src/test/java/xxxx/XTest.java
  Diff comments   View file @79322f7
... ... @@ -32,7 +32,7 @@ public class XTest {
32 32 @Test
33 33 public void xxxx() {
34 34 HttpClient client = new HttpClient();
35   - GetMethod method = new GetMethod(deploymentUrl + "login");
  35 + GetMethod method = new GetMethod(deploymentUrl + "/login");
36 36  
37 37 try {
38 38 int status = client.executeMethod(method);
... ...
pom.xml
  Diff comments   View file @79322f7
... ... @@ -68,7 +68,7 @@
68 68 <module>impl/extension/jdbc</module>
69 69 <module>impl/extension/jpa</module>
70 70 <module>impl/extension/jsf</module>
71   -<!-- <module>impl/extension/jta</module> -->
  71 + <module>impl/extension/jta</module>
72 72 <module>impl/extension/se</module>
73 73 <module>impl/extension/servlet</module>
74 74 <module>impl/extension/jmx</module>
... ...