From 6de5a1385efaeaebc0cd54cd74efb3dbac3504f5 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Wed, 14 Aug 2013 16:12:48 -0300
Subject: [PATCH] Organização dos testes

---
 impl/core/pom.xml                                                   | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 impl/core/src/test/java/management/AnnotationTestCase.java          |   2 +-
 impl/core/src/test/java/management/ManagementBootstrapTestCase.java |   2 +-
 impl/core/src/test/java/management/ManagementTestCase.java          |   2 +-
 impl/core/src/test/java/management/NotificationTestCase.java        |   2 +-
 impl/core/src/test/java/management/ValidationTestCase.java          |   2 +-
 impl/core/src/test/java/test/Tests.java                             |   7 +------
 impl/core/src/test/resources/beans.xml                              |  11 +++++++++++
 impl/core/src/test/resources/test/beans.xml                         |  11 -----------
 parent/bom/pom.xml                                                  |  62 ++++++++++++++++++++++++++++++++++++++++----------------------
 10 files changed, 137 insertions(+), 68 deletions(-)
 create mode 100644 impl/core/src/test/resources/beans.xml
 delete mode 100644 impl/core/src/test/resources/test/beans.xml

diff --git a/impl/core/pom.xml b/impl/core/pom.xml
index a58f2c5..96707b1 100755
--- a/impl/core/pom.xml
+++ b/impl/core/pom.xml
@@ -98,20 +98,59 @@
 				<artifactId>cobertura-maven-plugin</artifactId>
 			</plugin>
 
-			<!-- <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 
-				<version>${jacoco.version}</version> <executions> <execution> <goals> <goal>prepare-agent</goal> 
-				</goals> </execution> <execution> <id>report</id> <phase>prepare-package</phase> 
-				<goals> <goal>report</goal> </goals> </execution> </executions> </plugin> -->
+			<!-- 
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			-->
 		</plugins>
 
-		<!-- <pluginManagement> <plugins> <plugin> <groupId>org.eclipse.m2e</groupId> 
-			<artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> <configuration> 
-			<lifecycleMappingMetadata> <pluginExecutions> <pluginExecution> <pluginExecutionFilter> 
-			<groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 
-			<versionRange>[${jacoco.version},)</versionRange> <goals> <goal>prepare-agent</goal> 
-			</goals> </pluginExecutionFilter> <action> <ignore></ignore> </action> </pluginExecution> 
-			</pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> 
-			</plugins> </pluginManagement> -->
+		<!-- 
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.jacoco</groupId>
+										<artifactId>jacoco-maven-plugin</artifactId>
+										<versionRange>[${jacoco.version},)</versionRange>
+										<goals>
+											<goal>prepare-agent</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		-->
 	</build>
 
 	<dependencies>
@@ -163,27 +202,44 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<!--
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</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>${jacoco.version}</version> 
-			<scope>test</scope> </dependency> -->
-
-		<!-- <dependency> <groupId>org.jboss.shrinkwrap.descriptors</groupId> <artifactId>shrinkwrap-descriptors-spi</artifactId> 
-			<version>2.0.0-alpha-4</version> <scope>test</scope> </dependency> -->
-
-		<!-- <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> 
-			<scope>test</scope> </dependency> -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
+			<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>${jacoco.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.jboss.shrinkwrap.descriptors</groupId>
+			<artifactId>shrinkwrap-descriptors-spi</artifactId>
+			<version>2.0.0-alpha-4</version>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
 	</dependencies>
 
 	<repositories>
diff --git a/impl/core/src/test/java/management/AnnotationTestCase.java b/impl/core/src/test/java/management/AnnotationTestCase.java
index 7851115..049bd55 100644
--- a/impl/core/src/test/java/management/AnnotationTestCase.java
+++ b/impl/core/src/test/java/management/AnnotationTestCase.java
@@ -72,7 +72,7 @@ public class AnnotationTestCase {
 				.create(JavaArchive.class)
 				.addClass(LocaleProducer.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
diff --git a/impl/core/src/test/java/management/ManagementBootstrapTestCase.java b/impl/core/src/test/java/management/ManagementBootstrapTestCase.java
index dac76cc..07599aa 100644
--- a/impl/core/src/test/java/management/ManagementBootstrapTestCase.java
+++ b/impl/core/src/test/java/management/ManagementBootstrapTestCase.java
@@ -76,7 +76,7 @@ public class ManagementBootstrapTestCase {
 				.addPackages(true, "br")
 				.addAsResource(
 						new FileAsset(new File(
-								"src/test/resources/test/beans.xml")),
+								"src/test/resources/beans.xml")),
 						"beans.xml")
 				.addAsManifestResource(
 						new File(
diff --git a/impl/core/src/test/java/management/ManagementTestCase.java b/impl/core/src/test/java/management/ManagementTestCase.java
index 43efd0e..cb5570c 100644
--- a/impl/core/src/test/java/management/ManagementTestCase.java
+++ b/impl/core/src/test/java/management/ManagementTestCase.java
@@ -72,7 +72,7 @@ public class ManagementTestCase {
 				.create(JavaArchive.class)
 				.addClass(LocaleProducer.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
diff --git a/impl/core/src/test/java/management/NotificationTestCase.java b/impl/core/src/test/java/management/NotificationTestCase.java
index 288389a..005e5d0 100644
--- a/impl/core/src/test/java/management/NotificationTestCase.java
+++ b/impl/core/src/test/java/management/NotificationTestCase.java
@@ -85,7 +85,7 @@ public class NotificationTestCase {
 				.create(JavaArchive.class)
 				.addClass(LocaleProducer.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
diff --git a/impl/core/src/test/java/management/ValidationTestCase.java b/impl/core/src/test/java/management/ValidationTestCase.java
index 147b207..2e431c7 100644
--- a/impl/core/src/test/java/management/ValidationTestCase.java
+++ b/impl/core/src/test/java/management/ValidationTestCase.java
@@ -30,7 +30,7 @@ public class ValidationTestCase {
 				.create(JavaArchive.class)
 				.addClass(LocaleProducer.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
diff --git a/impl/core/src/test/java/test/Tests.java b/impl/core/src/test/java/test/Tests.java
index bd04476..ba96b14 100644
--- a/impl/core/src/test/java/test/Tests.java
+++ b/impl/core/src/test/java/test/Tests.java
@@ -41,7 +41,6 @@ import java.io.File;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
 
 public final class Tests {
 
@@ -57,7 +56,7 @@ public final class Tests {
 				.create(JavaArchive.class)
 				.addClass(LocaleProducer.class)
 				.addPackages(true, "br")
-				.addAsResource(Tests.createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
+				.addAsResource(Tests.createFileAsset("src/test/resources/beans.xml"), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension");
@@ -66,8 +65,4 @@ public final class Tests {
 	public static FileAsset createFileAsset(final String pathname) {
 		return new FileAsset(new File(pathname));
 	}
-	
-	@Test
-	public void test(){
-	}
 }
diff --git a/impl/core/src/test/resources/beans.xml b/impl/core/src/test/resources/beans.xml
new file mode 100644
index 0000000..d85497f
--- /dev/null
+++ b/impl/core/src/test/resources/beans.xml
@@ -0,0 +1,11 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+	<interceptors>
+		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
+	</interceptors>
+
+</beans>
diff --git a/impl/core/src/test/resources/test/beans.xml b/impl/core/src/test/resources/test/beans.xml
deleted file mode 100644
index d85497f..0000000
--- a/impl/core/src/test/resources/test/beans.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-	<interceptors>
-		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
-	</interceptors>
-
-</beans>
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index d94f208..c0ac268 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -307,6 +307,13 @@
 				<artifactId>commons-dbcp</artifactId>
 				<version>${commons.dbcp.version}</version>
 			</dependency>
+			
+			<!-- embedded containners -->
+			<dependency>
+				<groupId>org.glassfish.main.extras</groupId>
+				<artifactId>glassfish-embedded-web</artifactId>
+				<version>${glassfish.embedded.version}</version>
+			</dependency>			
 
 			<!-- embedded database -->
 			<dependency>
@@ -328,24 +335,11 @@
 				<version>${junit.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.powermock</groupId>
-				<artifactId>powermock-module-junit4</artifactId>
-				<version>${powermock.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.powermock</groupId>
-				<artifactId>powermock-api-easymock</artifactId>
-				<version>${powermock.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.easymock</groupId>
-				<artifactId>easymock</artifactId>
-				<version>${easymock.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.arquillian.junit</groupId>
-				<artifactId>arquillian-junit-container</artifactId>
+				<groupId>org.jboss.arquillian</groupId>
+				<artifactId>arquillian-bom</artifactId>
 				<version>${arquillian.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.arquillian.container</groupId>
@@ -354,14 +348,35 @@
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.arquillian.container</groupId>
-				<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-				<version>${arquillian.weld.ee.embedded.version}</version>
+				<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>
 				<version>${weld.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.powermock</groupId>
+				<artifactId>powermock-module-junit4</artifactId>
+				<version>${powermock.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.powermock</groupId>
+				<artifactId>powermock-api-easymock</artifactId>
+				<version>${powermock.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.easymock</groupId>
+				<artifactId>easymock</artifactId>
+				<version>${easymock.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -406,9 +421,12 @@
 		<junit.version>4.8.1</junit.version>
 		<easymock.version>3.0</easymock.version>
 
-		<arquillian.version>1.0.3.Final</arquillian.version>
-		<arquillian.weld.se.embedded.version>1.0.0.CR6</arquillian.weld.se.embedded.version>
-		<arquillian.weld.ee.embedded.version>1.0.0.CR6</arquillian.weld.ee.embedded.version>
+		<arquillian.version>1.1.1.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>
+		
+		<glassfish.embedded.version>3.1.2</glassfish.embedded.version>
 
 		<powermock.version>1.4.6</powermock.version>
 		<primefaces.version>3.4</primefaces.version>
--
libgit2 0.21.2