From 6b7fced590e0fb2f728233857f648d6f8e79bc7d Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Wed, 21 Aug 2013 15:56:19 -0300 Subject: [PATCH] Ambiente de teste integrado com o Glassfish integrado --- impl/extension/jdbc/pom.xml | 102 +++++++++++++++++------------------------------------------------------------------------------------- impl/extension/jdbc/src/test/java/test/Tests.java | 5 ++--- impl/extension/jdbc/src/test/java/xxx/XTest.java | 38 ++++++++++++++++++++++++++++++++++++++ impl/extension/jdbc/src/test/resources/META-INF/beans.xml | 40 ---------------------------------------- impl/extension/jdbc/src/test/resources/arquillian.xml | 49 +------------------------------------------------ impl/extension/jdbc/src/test/resources/demoiselle.properties | 0 impl/extension/jdbc/src/test/resources/glassfish-resources.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/jdbc/src/test/resources/test/beans.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/jdbc/src/test/resources/xxx/demoiselle.properties | 39 +++++++++++++++++++++++++++++++++++++++ parent/bom/pom.xml | 17 +++++++++++++---- parent/extension/pom.xml | 10 ++++++++++ 11 files changed, 214 insertions(+), 180 deletions(-) create mode 100644 impl/extension/jdbc/src/test/java/xxx/XTest.java delete mode 100644 impl/extension/jdbc/src/test/resources/META-INF/beans.xml delete mode 100644 impl/extension/jdbc/src/test/resources/demoiselle.properties create mode 100644 impl/extension/jdbc/src/test/resources/glassfish-resources.xml create mode 100644 impl/extension/jdbc/src/test/resources/test/beans.xml create mode 100644 impl/extension/jdbc/src/test/resources/xxx/demoiselle.properties diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml index 877284d..ecf2ab3 100755 --- a/impl/extension/jdbc/pom.xml +++ b/impl/extension/jdbc/pom.xml @@ -34,8 +34,7 @@ ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. --> - + 4.0.0 @@ -89,78 +88,23 @@ shrinkwrap-resolver-impl-maven test + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + + + hsqldb + hsqldb + test + - - - - src/test/resources - true - - - - - maven-dependency-plugin - - - unpack - process-test-classes - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jbossas.version} - zip - false - target - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.1,) - - unpack - - - - - - - - - - - - - - sonatype-nexus-snapshots @@ -185,11 +129,10 @@ - + arquillian-test - br.gov.frameworkdemoiselle @@ -207,24 +150,13 @@ org.slf4j slf4j-api - org.javassist javassist - - org.eclipse.persistence - javax.persistence - provided - - - - 7.1.1.Final - diff --git a/impl/extension/jdbc/src/test/java/test/Tests.java b/impl/extension/jdbc/src/test/java/test/Tests.java index 3d53c7e..3c8e26f 100644 --- a/impl/extension/jdbc/src/test/java/test/Tests.java +++ b/impl/extension/jdbc/src/test/java/test/Tests.java @@ -65,7 +65,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(); @@ -80,8 +80,7 @@ public final class Tests { .addClass(JDBCTransaction.class) .addAsResource(createFileAsset("src/main/resources/demoiselle-jdbc-bundle.properties"), "demoiselle-jdbc-bundle.properties") -// .addAsResource(createFileAsset("src/test/resources/logging.properties"), "logging.properties") - .addAsWebInfResource(createFileAsset("src/test/resources/META-INF/beans.xml"), "beans.xml") + .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml") .addAsLibraries(libs); } diff --git a/impl/extension/jdbc/src/test/java/xxx/XTest.java b/impl/extension/jdbc/src/test/java/xxx/XTest.java new file mode 100644 index 0000000..db563a0 --- /dev/null +++ b/impl/extension/jdbc/src/test/java/xxx/XTest.java @@ -0,0 +1,38 @@ +package xxx; + +import static junit.framework.Assert.assertNotNull; + +import java.sql.Connection; + +import javax.inject.Inject; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +import test.Tests; + +@RunWith(Arquillian.class) +public class XTest { + + private static final String PATH = "src/test/resources/xxx"; + + @Inject + private Connection conn; + + @Deployment + public static WebArchive createDeployment() { + WebArchive deployment = Tests.createDeployment(XTest.class); + deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), + "demoiselle.properties"); + + return deployment; + } + + @Test + public void x() { + assertNotNull(conn); + } +} diff --git a/impl/extension/jdbc/src/test/resources/META-INF/beans.xml b/impl/extension/jdbc/src/test/resources/META-INF/beans.xml deleted file mode 100644 index 527e828..0000000 --- a/impl/extension/jdbc/src/test/resources/META-INF/beans.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/arquillian.xml b/impl/extension/jdbc/src/test/resources/arquillian.xml index 19908d2..c34bde0 100644 --- a/impl/extension/jdbc/src/test/resources/arquillian.xml +++ b/impl/extension/jdbc/src/test/resources/arquillian.xml @@ -43,58 +43,11 @@ target/deployments - - - - - target/jboss-as-7.1.1.Final - /usr/lib/jvm/java-6-sun/ - - - - - - - - --> - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/demoiselle.properties b/impl/extension/jdbc/src/test/resources/demoiselle.properties deleted file mode 100644 index e69de29..0000000 --- a/impl/extension/jdbc/src/test/resources/demoiselle.properties +++ /dev/null diff --git a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml new file mode 100644 index 0000000..ca2bc9d --- /dev/null +++ b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml @@ -0,0 +1,48 @@ + + + + + + + + + + \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/test/beans.xml b/impl/extension/jdbc/src/test/resources/test/beans.xml new file mode 100644 index 0000000..337e515 --- /dev/null +++ b/impl/extension/jdbc/src/test/resources/test/beans.xml @@ -0,0 +1,46 @@ + + + + + br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor + br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor + br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor + br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor + + + diff --git a/impl/extension/jdbc/src/test/resources/xxx/demoiselle.properties b/impl/extension/jdbc/src/test/resources/xxx/demoiselle.properties new file mode 100644 index 0000000..3420e53 --- /dev/null +++ b/impl/extension/jdbc/src/test/resources/xxx/demoiselle.properties @@ -0,0 +1,39 @@ +# Demoiselle Framework +# Copyright (C) 2010 SERPRO +# ---------------------------------------------------------------------------- +# This file is part of Demoiselle Framework. +# +# Demoiselle Framework is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License version 3 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License version 3 +# along with this program; if not, see +# or write to the Free Software Foundation, Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301, USA. +# ---------------------------------------------------------------------------- +# Este arquivo é parte do Framework Demoiselle. +# +# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou +# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação +# do Software Livre (FSF). +# +# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA +# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou +# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português +# para maiores detalhes. +# +# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título +# "LICENCA.txt", junto com esse programa. Se não, acesse +# ou escreva para a Fundação do Software Livre (FSF) Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + +frameworkdemoiselle.persistence.driver.class=org.hsqldb.jdbcDriver +frameworkdemoiselle.persistence.url=jdbc:hsqldb:mem:xxx +frameworkdemoiselle.persistence.username=sa +frameworkdemoiselle.persistence.password= diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index b32db46..f3990da 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -311,7 +311,7 @@ org.glassfish.main.extras - glassfish-embedded-web + glassfish-embedded-all ${glassfish.embedded.version} @@ -379,6 +379,13 @@ easymock ${easymock.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + @@ -422,7 +429,7 @@ 4.8.1 3.0 - + 1.1.1.Final