Ajustando os testes para rodar no JBoss AS 7.1 managed

Cleverson Sacramento
1 parent 66b6180f
Showing 7 changed files with 65 additions and 26 deletions Show diff stats
impl/extension/jpa/pom.xml
impl/extension/jpa/src/test/java/template/JPACrudTest.java
impl/extension/jpa/src/test/java/test/Tests.java
impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java
impl/extension/jpa/src/test/resources/arquillian.xml
impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml
parent/bom/pom.xml
@@ -73,7 +73,7 @@
 				<filtering>true</filtering>
 			</testResource>
 		</testResources>
-	
+
 		<plugins>
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -158,12 +158,8 @@
 				<version>2.12</version>
 				<configuration>
 					<systemPropertyVariables>
-						<java.util.logging.config.file>
-							${project.build.testOutputDirectory}/logging.properties
-						</java.util.logging.config.file>
-						<derby.stream.error.file>
-							${project.build.directory}/derby.log
-						</derby.stream.error.file>
+						<java.util.logging.config.file>${project.build.testOutputDirectory}/logging.properties</java.util.logging.config.file>
+						<derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
@@ -203,6 +199,8 @@
 		</dependency>
 		-->
+		<!--
+		-->
 		<dependency>
 			<groupId>org.jboss.as</groupId>
 			<artifactId>jboss-as-arquillian-container-managed</artifactId>
@@ -230,13 +228,18 @@
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.main.extras</groupId>
-			<artifactId>glassfish-embedded-web</artifactId>
+			<artifactId>glassfish-embedded-all</artifactId>
+			<version>3.1.2.2</version>
+			<version>4.0</version>
+			<version>3.2-b06</version>
+			<version>3.1.2</version>
 			<scope>test</scope>
 		</dependency>
+		-->
+		<!--
 		<dependency>
 			<groupId>org.glassfish.main.extras</groupId>
-			<artifactId>glassfish-embedded-all</artifactId>
-			<version>3.1.2</version>
+			<artifactId>glassfish-embedded-web</artifactId>
 			<scope>test</scope>
 		</dependency>
 		-->
@@ -282,6 +285,25 @@
             <scope>test</scope>
         </dependency>
 		-->
+
+		<!--
+		<dependency>
+			<groupId>org.jboss.arquillian.protocol</groupId>
+			<artifactId>arquillian-protocol-servlet</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.extension</groupId>
+			<artifactId>arquillian-jacoco</artifactId>
+			<version>1.0.0.Alpha5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jacoco</groupId>
+			<artifactId>org.jacoco.core</artifactId>
+			<version>0.6.3.201306030806</version>
+		</dependency>
+		-->
 		<!--
 		<dependency>
@@ -382,12 +404,12 @@
 							<artifactId>validation-api</artifactId>
 							<groupId>javax.validation</groupId>
 						</exclusion>
+						<!--
+						-->
 						<exclusion>
 							<groupId>org.slf4j</groupId>
 							<artifactId>slf4j-api</artifactId>
 						</exclusion>
-						<!--
-						-->
 						<exclusion>
 							<groupId>org.javassist</groupId>
 							<artifactId>javassist</artifactId>
@@ -399,6 +421,21 @@
 					<artifactId>javax.persistence</artifactId>
 					<scope>provided</scope>
 				</dependency>
+
+				<!--
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jul-to-slf4j</artifactId>
+					<version>1.7.5</version>
+					<scope>runtime</scope>
+				</dependency>
+				<dependency>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+					<version>1.0.13</version>
+					<scope>runtime</scope>
+				</dependency>
+				-->
 			</dependencies>
 		</profile>
 	</profiles>
@@ -22,7 +22,7 @@ public class JPACrudTest {
 	@Inject
 	private MyCrud crud;
-	@Deployment
+	@Deployment(name = "1")
 	public static WebArchive createDeployment() {
 		WebArchive deployment = Tests.createDeployment(JPACrudTest.class);
 		deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
@@ -67,7 +67,7 @@ public final class Tests {
 		return createDeployment().addPackages(true, baseClass.getPackage());
 	}
-	public static WebArchive createDeployment() {
+	private static WebArchive createDeployment() {
 		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
 				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
@@ -85,7 +85,6 @@ public final class Tests {
 				.addAsResource(createFileAsset("src/main/resources/demoiselle-jpa-bundle.properties"),
 						"demoiselle-jpa-bundle.properties")
 				.addAsResource(createFileAsset("src/test/resources/logging.properties"), "logging.properties")
-				.addAsLibraries(libs)
 				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
 				.addAsLibraries(libs);
 	}
@@ -37,7 +37,7 @@ public class JPATransactionTest {
 	@Name("pu2")
 	private EntityManager em2;
-	@Deployment(testable = true)
+	@Deployment(name = "2")
 	public static WebArchive createDeployment() {
 		WebArchive deployment = Tests.createDeployment(JPATransactionTest.class);
 		deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
@@ -45,13 +45,8 @@
 	<container qualifier="jbossas-managed" default="true">
 		<protocol type="Servlet 3.0" />
-
 		<configuration>
-			<property name="javaHome">/usr/lib/jvm/java-6-serpro/</property>
 			<property name="jbossHome">target/jboss-as-${jbossas.version}</property>
-			<!--
-			<property name="serverConfig">../../../../src/test/resources/standalone.xml</property>
-			-->
 		</configuration>
 	</container>
 	<!--
@@ -73,8 +68,9 @@
 	<!--
 	<container qualifier="glassfish-embedded" default="true">
+		<protocol type="Servlet 3.0" />
 		<configuration>
-			<property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
+			<property name="sunResourcesXml">src/test/resources/glassfish-resources.xml</property>
 		</configuration>
 	</container>
 	-->
@@ -41,7 +41,8 @@
 	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
 		<non-jta-data-source>jdbc/arquillian1</non-jta-data-source>
-		<class>transaction.manual.MyEntity</class>
+		<class>transaction.manual.MyEntity1</class>
+		<class>transaction.manual.MyEntity2</class>
 		<properties>
 			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
@@ -53,7 +54,8 @@
 	<persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
 		<non-jta-data-source>jdbc/arquillian2</non-jta-data-source>
-		<class>transaction.manual.MyEntity</class>
+		<class>transaction.manual.MyEntity1</class>
+		<class>transaction.manual.MyEntity2</class>
 		<properties>
 			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
@@ -351,12 +351,14 @@
 				<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
 				<version>${arquillian.glassfish.embedded.version}</version>
 			</dependency>
+			<!--
 			<dependency>
 				<groupId>org.jboss.arquillian.extension</groupId>
 				<artifactId>arquillian-persistence-impl</artifactId>
 				<version>${arquillian.persistence.version}</version>
 				<scope>test</scope>
 			</dependency>
+			-->
 			<dependency>
 				<groupId>org.jboss.weld.se</groupId>
 				<artifactId>weld-se-core</artifactId>
@@ -420,11 +422,14 @@
 		<junit.version>4.8.1</junit.version>
 		<easymock.version>3.0</easymock.version>
-
+	
 		<arquillian.version>1.1.1.Final</arquillian.version>
+		<!--
+		<arquillian.version>1.0.4.Final</arquillian.version>
+		-->
 		<arquillian.weld.se.embedded.version>1.0.0.CR7</arquillian.weld.se.embedded.version>
 		<arquillian.persistence.version>1.0.0.Alpha6</arquillian.persistence.version>
-		<arquillian.glassfish.embedded.version>1.0.0.CR3</arquillian.glassfish.embedded.version>
+		<arquillian.glassfish.embedded.version>1.0.0.CR4</arquillian.glassfish.embedded.version>
 		<glassfish.embedded.version>3.1.2</glassfish.embedded.version>
	@@ -22,7 +22,7 @@ public class JPACrudTest {		@@ -22,7 +22,7 @@ public class JPACrudTest {
22	@Inject	22	@Inject
23	private MyCrud crud;	23	private MyCrud crud;
24		24
25	- @Deployment	25	+ @Deployment(name = "1")
26	public static WebArchive createDeployment() {	26	public static WebArchive createDeployment() {
27	WebArchive deployment = Tests.createDeployment(JPACrudTest.class);	27	WebArchive deployment = Tests.createDeployment(JPACrudTest.class);
28	deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");	28	deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
	@@ -37,7 +37,7 @@ public class JPATransactionTest {		@@ -37,7 +37,7 @@ public class JPATransactionTest {
37	@Name("pu2")	37	@Name("pu2")
38	private EntityManager em2;	38	private EntityManager em2;
39		39
40	- @Deployment(testable = true)	40	+ @Deployment(name = "2")
41	public static WebArchive createDeployment() {	41	public static WebArchive createDeployment() {
42	WebArchive deployment = Tests.createDeployment(JPATransactionTest.class);	42	WebArchive deployment = Tests.createDeployment(JPATransactionTest.class);
43	deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");	43	deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");