From abae922b3ff36126ab047a45473110af4b5ab2fb Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Wed, 2 Oct 2013 15:43:46 -0300 Subject: [PATCH] Correção e simplificação do build dos testes --- impl/core/pom.xml | 94 ++-------------------------------------------------------------------------------------------- impl/extension/jdbc/pom.xml | 10 ++++++++++ impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile | 0 impl/extension/jmx/pom.xml | 21 ++------------------- impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile | 0 impl/extension/jpa/pom.xml | 12 ++++++++++++ impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile | 0 impl/extension/jsf/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++------- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java | 4 ++-- impl/extension/jsf/src/test/java/test/Tests.java | 1 + impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile | 0 impl/extension/jsf/src/test/resources/xxx/web.xml | 52 ---------------------------------------------------- impl/extension/jta/pom.xml | 11 +++++++++++ impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile | 0 impl/extension/se/pom.xml | 16 +++++++++++++++- impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile | 0 impl/extension/servlet/pom.xml | 11 +++++++++++ impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile | 0 parent/bom/pom.xml | 27 +++++++++++++++++++++++++++ parent/extension/pom.xml | 177 +++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------- parent/framework/pom.xml | 30 ++++++++++++++++++++++++++++++ 21 files changed, 193 insertions(+), 325 deletions(-) delete mode 100644 impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile delete mode 100644 impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile delete mode 100644 impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile delete mode 100644 impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile delete mode 100644 impl/extension/jsf/src/test/resources/xxx/web.xml delete mode 100644 impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile delete mode 100644 impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile delete mode 100644 impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile diff --git a/impl/core/pom.xml b/impl/core/pom.xml index f4dd86d..66e4a5f 100755 --- a/impl/core/pom.xml +++ b/impl/core/pom.xml @@ -104,60 +104,7 @@ org.codehaus.mojo cobertura-maven-plugin - - - - @@ -196,7 +143,7 @@ org.jboss.arquillian.container arquillian-weld-se-embedded-1.1 - ${arquillian.weld.version} + test @@ -214,40 +161,6 @@ slf4j-log4j12 test - - @@ -276,10 +189,7 @@ - 1.1.1.Final - 1.0.0.CR7 - - 2.4.0-BETA2-SNAPSHOT + 1.1.1.Final diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml index c664313..bdc7539 100755 --- a/impl/extension/jdbc/pom.xml +++ b/impl/extension/jdbc/pom.xml @@ -74,6 +74,16 @@ + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + + hsqldb hsqldb test diff --git a/impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile b/impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile +++ /dev/null diff --git a/impl/extension/jmx/pom.xml b/impl/extension/jmx/pom.xml index 48a281c..ade24f9 100644 --- a/impl/extension/jmx/pom.xml +++ b/impl/extension/jmx/pom.xml @@ -57,18 +57,8 @@ - junit - junit - test - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven + org.jboss.arquillian.container + arquillian-weld-se-embedded-1.1 test @@ -76,13 +66,6 @@ weld-se-core test - org.hibernate hibernate-validator diff --git a/impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile b/impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile +++ /dev/null diff --git a/impl/extension/jpa/pom.xml b/impl/extension/jpa/pom.xml index 16f9659..3d68e0c 100755 --- a/impl/extension/jpa/pom.xml +++ b/impl/extension/jpa/pom.xml @@ -71,6 +71,18 @@ org.eclipse.persistence javax.persistence + + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + diff --git a/impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile b/impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile +++ /dev/null diff --git a/impl/extension/jsf/pom.xml b/impl/extension/jsf/pom.xml index 522e13c..8d98319 100755 --- a/impl/extension/jsf/pom.xml +++ b/impl/extension/jsf/pom.xml @@ -80,22 +80,27 @@ el-impl provided - + + com.sun.faces jsf-impl test - commons-httpclient - commons-httpclient - 3.1 + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 test - com.ocpsoft - prettyfaces-jsf2 - 3.3.0 + org.glassfish.main.extras + glassfish-embedded-all + test + + + commons-httpclient + commons-httpclient + 3.1 test @@ -124,4 +129,37 @@ + + + + arquillian-test + + + com.sun.faces + jsf-api + provided + + + br.gov.frameworkdemoiselle + demoiselle-servlet + + + javax.servlet + javax.servlet-api + + + + + + com.ocpsoft + prettyfaces-jsf2 + 3.3.0 + runtime + + + + + diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java index 2eb6e3b..84928f8 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java @@ -48,11 +48,10 @@ import javax.faces.application.ViewHandler; import javax.faces.context.FacesContext; /** - * * Utility class to redirect determined page to another one. * * @author SERPRO - * */ + */ public class Redirector { private Redirector() { @@ -74,6 +73,7 @@ public class Redirector { } } catch (NullPointerException cause) { + cause.printStackTrace(); throw new PageNotFoundException(viewId); } catch (IOException cause) { diff --git a/impl/extension/jsf/src/test/java/test/Tests.java b/impl/extension/jsf/src/test/java/test/Tests.java index 269d97d..970bb51 100644 --- a/impl/extension/jsf/src/test/java/test/Tests.java +++ b/impl/extension/jsf/src/test/java/test/Tests.java @@ -80,6 +80,7 @@ import br.gov.frameworkdemoiselle.util.PageNotFoundException; import br.gov.frameworkdemoiselle.util.Parameter; import br.gov.frameworkdemoiselle.util.Redirector; +@SuppressWarnings("deprecation") @Ignore public final class Tests { diff --git a/impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile b/impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile +++ /dev/null diff --git a/impl/extension/jsf/src/test/resources/xxx/web.xml b/impl/extension/jsf/src/test/resources/xxx/web.xml deleted file mode 100644 index 70d32be..0000000 --- a/impl/extension/jsf/src/test/resources/xxx/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - br.gov.frameworkdemoiselle.util.ServletListener - - - Demoiselle Servlet Filter - br.gov.frameworkdemoiselle.util.ServletFilter - - - Demoiselle Servlet Filter - /* - - - \ No newline at end of file diff --git a/impl/extension/jta/pom.xml b/impl/extension/jta/pom.xml index 520d7d0..5a316af 100755 --- a/impl/extension/jta/pom.xml +++ b/impl/extension/jta/pom.xml @@ -72,6 +72,17 @@ jta + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + org.hibernate hibernate-entitymanager diff --git a/impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile b/impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile +++ /dev/null diff --git a/impl/extension/se/pom.xml b/impl/extension/se/pom.xml index 8988222..796b45b 100755 --- a/impl/extension/se/pom.xml +++ b/impl/extension/se/pom.xml @@ -53,7 +53,21 @@ Extensão para aplicações SE http://www.frameworkdemoiselle.gov.br - + + + + + org.jboss.arquillian.container + arquillian-weld-se-embedded-1.1 + test + + + org.jboss.weld.se + weld-se-core + test + + + GNU Lesser General Public License, Version 3 diff --git a/impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile b/impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile +++ /dev/null diff --git a/impl/extension/servlet/pom.xml b/impl/extension/servlet/pom.xml index 4c116e1..533ff86 100755 --- a/impl/extension/servlet/pom.xml +++ b/impl/extension/servlet/pom.xml @@ -85,6 +85,17 @@ --> + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + org.apache.httpcomponents httpclient diff --git a/impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile b/impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile +++ /dev/null diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index 4f29cac..e735691 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -347,6 +347,25 @@ easymock ${easymock.version} + + + + + org.jboss.arquillian.container + arquillian-weld-se-embedded-1.1 + ${arquillian.container.weld.version} + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + ${arquillian.container.glassfish.version} + + + org.glassfish.main.extras + glassfish-embedded-all + ${glassfish.embedded.version} + @@ -395,6 +414,14 @@ 4.1.7.Final 4.2.0.Final + + 1.0.0.CR7 + 1.0.0.CR4 + 1.0.0.CR7 + 3.1.2.2 + 4.8.1 3.0 diff --git a/parent/extension/pom.xml b/parent/extension/pom.xml index 640c5bc..9e37036 100755 --- a/parent/extension/pom.xml +++ b/parent/extension/pom.xml @@ -75,6 +75,8 @@ import pom + org.jboss.arquillian arquillian-bom @@ -83,6 +85,21 @@ pom + + @@ -159,6 +176,7 @@ + arquillian-test @@ -187,18 +205,13 @@ + @@ -231,155 +238,21 @@ - - arquillian-jbossas7-managed - - - src/test/resources/.arquillian-jbossas7-managed.profile - - - - - - src/test/resources - true - - - - - maven-dependency-plugin - - - unpack - process-test-classes - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jboss.as.version} - zip - false - target - - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - - - - org.jboss.as - jboss-as-arquillian-container-managed - ${jboss.as.version} - test - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - test - - - org.jboss.arquillian.extension - arquillian-jacoco - ${arquillian.jacoco.version} - test - - - org.jacoco - org.jacoco.core - ${jacoco.version} - test - - - - - arquillian-drone - - - src/test/resources/.arquillian-drone.profile - - - - - - org.jboss.arquillian.extension - arquillian-drone-bom - ${arquillian.bom.version} - pom - import - - - - - - org.jboss.arquillian.extension - arquillian-drone-impl - test - - - org.jboss.arquillian.extension - arquillian-drone-selenium - test - - - org.jboss.arquillian.extension - arquillian-drone-selenium-server - test - - - org.seleniumhq.selenium - selenium-java - test - - - org.seleniumhq.selenium - selenium-server - test - - - org.mortbay.jetty - servlet-api-2.5 - - - - - + --> 1.1.1.Final - 1.0.0.Alpha5 + diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml index f61453e..e258dd7 100755 --- a/parent/framework/pom.xml +++ b/parent/framework/pom.xml @@ -55,6 +55,26 @@ Se você é usuário do framework, certamente este POM não servirá para você. http://www.frameworkdemoiselle.gov.br + + @@ -92,4 +112,14 @@ + + -- libgit2 0.21.2