Download as
Browse Code »

Commit 8a8436feb63276e59c8bccce593359de2da57c83

Authored by Cleverson Sacramento
1 parent 66b6180f
Exists in master

Ajustando os testes para rodar no JBoss AS 7.1 managed

Showing 7 changed files with 65 additions and 26 deletions   Show diff stats
impl/extension/jpa/pom.xml
  Diff comments   View file @8a8436f
... ... @@ -73,7 +73,7 @@
73 73 <filtering>true</filtering>
74 74 </testResource>
75 75 </testResources>
76   -
  76 +
77 77 <plugins>
78 78 <plugin>
79 79 <artifactId>maven-dependency-plugin</artifactId>
... ... @@ -158,12 +158,8 @@
158 158 <version>2.12</version>
159 159 <configuration>
160 160 <systemPropertyVariables>
161   - <java.util.logging.config.file>
162   - ${project.build.testOutputDirectory}/logging.properties
163   - </java.util.logging.config.file>
164   - <derby.stream.error.file>
165   - ${project.build.directory}/derby.log
166   - </derby.stream.error.file>
  161 + <java.util.logging.config.file>${project.build.testOutputDirectory}/logging.properties</java.util.logging.config.file>
  162 + <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
167 163 </systemPropertyVariables>
168 164 </configuration>
169 165 </plugin>
... ... @@ -203,6 +199,8 @@
203 199 </dependency>
204 200 -->
205 201  
  202 + <!--
  203 + -->
206 204 <dependency>
207 205 <groupId>org.jboss.as</groupId>
208 206 <artifactId>jboss-as-arquillian-container-managed</artifactId>
... ... @@ -230,13 +228,18 @@
230 228 </dependency>
231 229 <dependency>
232 230 <groupId>org.glassfish.main.extras</groupId>
233   - <artifactId>glassfish-embedded-web</artifactId>
  231 + <artifactId>glassfish-embedded-all</artifactId>
  232 + <version>3.1.2.2</version>
  233 + <version>4.0</version>
  234 + <version>3.2-b06</version>
  235 + <version>3.1.2</version>
234 236 <scope>test</scope>
235 237 </dependency>
  238 + -->
  239 + <!--
236 240 <dependency>
237 241 <groupId>org.glassfish.main.extras</groupId>
238   - <artifactId>glassfish-embedded-all</artifactId>
239   - <version>3.1.2</version>
  242 + <artifactId>glassfish-embedded-web</artifactId>
240 243 <scope>test</scope>
241 244 </dependency>
242 245 -->
... ... @@ -282,6 +285,25 @@
282 285 <scope>test</scope>
283 286 </dependency>
284 287 -->
  288 +
  289 + <!--
  290 + <dependency>
  291 + <groupId>org.jboss.arquillian.protocol</groupId>
  292 + <artifactId>arquillian-protocol-servlet</artifactId>
  293 + <scope>test</scope>
  294 + </dependency>
  295 + <dependency>
  296 + <groupId>org.jboss.arquillian.extension</groupId>
  297 + <artifactId>arquillian-jacoco</artifactId>
  298 + <version>1.0.0.Alpha5</version>
  299 + <scope>test</scope>
  300 + </dependency>
  301 + <dependency>
  302 + <groupId>org.jacoco</groupId>
  303 + <artifactId>org.jacoco.core</artifactId>
  304 + <version>0.6.3.201306030806</version>
  305 + </dependency>
  306 + -->
285 307  
286 308 <!--
287 309 <dependency>
... ... @@ -382,12 +404,12 @@
382 404 <artifactId>validation-api</artifactId>
383 405 <groupId>javax.validation</groupId>
384 406 </exclusion>
  407 + <!--
  408 + -->
385 409 <exclusion>
386 410 <groupId>org.slf4j</groupId>
387 411 <artifactId>slf4j-api</artifactId>
388 412 </exclusion>
389   - <!--
390   - -->
391 413 <exclusion>
392 414 <groupId>org.javassist</groupId>
393 415 <artifactId>javassist</artifactId>
... ... @@ -399,6 +421,21 @@
399 421 <artifactId>javax.persistence</artifactId>
400 422 <scope>provided</scope>
401 423 </dependency>
  424 +
  425 + <!--
  426 + <dependency>
  427 + <groupId>org.slf4j</groupId>
  428 + <artifactId>jul-to-slf4j</artifactId>
  429 + <version>1.7.5</version>
  430 + <scope>runtime</scope>
  431 + </dependency>
  432 + <dependency>
  433 + <groupId>ch.qos.logback</groupId>
  434 + <artifactId>logback-classic</artifactId>
  435 + <version>1.0.13</version>
  436 + <scope>runtime</scope>
  437 + </dependency>
  438 + -->
402 439 </dependencies>
403 440 </profile>
404 441 </profiles>
... ...
impl/extension/jpa/src/test/java/template/JPACrudTest.java
  Diff comments   View file @8a8436f
... ... @@ -22,7 +22,7 @@ public class JPACrudTest {
22 22 @Inject
23 23 private MyCrud crud;
24 24  
25   - @Deployment
  25 + @Deployment(name = "1")
26 26 public static WebArchive createDeployment() {
27 27 WebArchive deployment = Tests.createDeployment(JPACrudTest.class);
28 28 deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
... ...
impl/extension/jpa/src/test/java/test/Tests.java
  Diff comments   View file @8a8436f
... ... @@ -67,7 +67,7 @@ public final class Tests {
67 67 return createDeployment().addPackages(true, baseClass.getPackage());
68 68 }
69 69  
70   - public static WebArchive createDeployment() {
  70 + private static WebArchive createDeployment() {
71 71 File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
72 72 .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
73 73  
... ... @@ -85,7 +85,6 @@ public final class Tests {
85 85 .addAsResource(createFileAsset("src/main/resources/demoiselle-jpa-bundle.properties"),
86 86 "demoiselle-jpa-bundle.properties")
87 87 .addAsResource(createFileAsset("src/test/resources/logging.properties"), "logging.properties")
88   - .addAsLibraries(libs)
89 88 .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
90 89 .addAsLibraries(libs);
91 90 }
... ...
impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java
  Diff comments   View file @8a8436f
... ... @@ -37,7 +37,7 @@ public class JPATransactionTest {
37 37 @Name("pu2")
38 38 private EntityManager em2;
39 39  
40   - @Deployment(testable = true)
  40 + @Deployment(name = "2")
41 41 public static WebArchive createDeployment() {
42 42 WebArchive deployment = Tests.createDeployment(JPATransactionTest.class);
43 43 deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
... ...
impl/extension/jpa/src/test/resources/arquillian.xml
  Diff comments   View file @8a8436f
... ... @@ -45,13 +45,8 @@
45 45  
46 46 <container qualifier="jbossas-managed" default="true">
47 47 <protocol type="Servlet 3.0" />
48   -
49 48 <configuration>
50   - <property name="javaHome">/usr/lib/jvm/java-6-serpro/</property>
51 49 <property name="jbossHome">target/jboss-as-${jbossas.version}</property>
52   - <!--
53   - <property name="serverConfig">../../../../src/test/resources/standalone.xml</property>
54   - -->
55 50 </configuration>
56 51 </container>
57 52 <!--
... ... @@ -73,8 +68,9 @@
73 68  
74 69 <!--
75 70 <container qualifier="glassfish-embedded" default="true">
  71 + <protocol type="Servlet 3.0" />
76 72 <configuration>
77   - <property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
  73 + <property name="sunResourcesXml">src/test/resources/glassfish-resources.xml</property>
78 74 </configuration>
79 75 </container>
80 76 -->
... ...
impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml
  Diff comments   View file @8a8436f
... ... @@ -41,7 +41,8 @@
41 41 <persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
42 42 <non-jta-data-source>jdbc/arquillian1</non-jta-data-source>
43 43  
44   - <class>transaction.manual.MyEntity</class>
  44 + <class>transaction.manual.MyEntity1</class>
  45 + <class>transaction.manual.MyEntity2</class>
45 46  
46 47 <properties>
47 48 <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
... ... @@ -53,7 +54,8 @@
53 54 <persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
54 55 <non-jta-data-source>jdbc/arquillian2</non-jta-data-source>
55 56  
56   - <class>transaction.manual.MyEntity</class>
  57 + <class>transaction.manual.MyEntity1</class>
  58 + <class>transaction.manual.MyEntity2</class>
57 59  
58 60 <properties>
59 61 <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
... ...
parent/bom/pom.xml
  Diff comments   View file @8a8436f
... ... @@ -351,12 +351,14 @@
351 351 <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
352 352 <version>${arquillian.glassfish.embedded.version}</version>
353 353 </dependency>
  354 + <!--
354 355 <dependency>
355 356 <groupId>org.jboss.arquillian.extension</groupId>
356 357 <artifactId>arquillian-persistence-impl</artifactId>
357 358 <version>${arquillian.persistence.version}</version>
358 359 <scope>test</scope>
359 360 </dependency>
  361 + -->
360 362 <dependency>
361 363 <groupId>org.jboss.weld.se</groupId>
362 364 <artifactId>weld-se-core</artifactId>
... ... @@ -420,11 +422,14 @@
420 422  
421 423 <junit.version>4.8.1</junit.version>
422 424 <easymock.version>3.0</easymock.version>
423   -
  425 +
424 426 <arquillian.version>1.1.1.Final</arquillian.version>
  427 + <!--
  428 + <arquillian.version>1.0.4.Final</arquillian.version>
  429 + -->
425 430 <arquillian.weld.se.embedded.version>1.0.0.CR7</arquillian.weld.se.embedded.version>
426 431 <arquillian.persistence.version>1.0.0.Alpha6</arquillian.persistence.version>
427   - <arquillian.glassfish.embedded.version>1.0.0.CR3</arquillian.glassfish.embedded.version>
  432 + <arquillian.glassfish.embedded.version>1.0.0.CR4</arquillian.glassfish.embedded.version>
428 433  
429 434 <glassfish.embedded.version>3.1.2</glassfish.embedded.version>
430 435  
... ...