From 5ceeaf7123b8a35d245a73d94e676f6bf68a5b6b Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 29 Aug 2013 12:00:55 -0300 Subject: [PATCH] Remoção do glassfish-resources.xml. Agora as conexões JNDI utilizam o nome padrão do Glassfish --- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java | 10 ++++++++-- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java | 10 ++++++++-- impl/extension/jdbc/src/test/resources/arquillian.xml | 2 +- impl/extension/jdbc/src/test/resources/glassfish-resources.xml | 48 ------------------------------------------------ impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties | 2 +- impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties | 2 +- 6 files changed, 19 insertions(+), 55 deletions(-) delete mode 100644 impl/extension/jdbc/src/test/resources/glassfish-resources.xml diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java index e39095f..a7403c4 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java @@ -37,9 +37,12 @@ package connection.producer; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.SQLException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.inject.Inject; @@ -85,7 +88,10 @@ public class ConnectionProducerMultipleConnectionsTest { assertEquals(conn1.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql1"); assertEquals(conn2.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql2"); assertEquals(conn3.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql3"); - assertEquals(conn4.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); - } + String regexp = "^jdbc:derby:(.*)/databases/embedded_default$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(conn4.getMetaData().getURL()); + assertTrue(matcher.matches()); + } } diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java index e79ad8f..8bb72cd 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java @@ -36,10 +36,12 @@ */ package connection.producer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.SQLException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.inject.Inject; @@ -70,6 +72,10 @@ public class ConnectionProducerWithJndiTest { @Test public void createConnection() throws SQLException { - assertEquals(conn1.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); + String regexp = "^jdbc:derby:(.*)/databases/embedded_default$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(conn1.getMetaData().getURL()); + + assertTrue(matcher.matches()); } } diff --git a/impl/extension/jdbc/src/test/resources/arquillian.xml b/impl/extension/jdbc/src/test/resources/arquillian.xml index 775e12e..7fe3b14 100644 --- a/impl/extension/jdbc/src/test/resources/arquillian.xml +++ b/impl/extension/jdbc/src/test/resources/arquillian.xml @@ -50,11 +50,11 @@ target/jboss-as-${jboss.as.version} - --> src/test/resources/glassfish-resources.xml + --> \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml deleted file mode 100644 index ca2bc9d..0000000 --- a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties index ee62e2d..a14fed8 100644 --- a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties @@ -48,6 +48,6 @@ frameworkdemoiselle.persistence.conn3.url=jdbc:hsqldb:mem:hsql3 frameworkdemoiselle.persistence.conn3.username=sa frameworkdemoiselle.persistence.conn3.password= -frameworkdemoiselle.persistence.conn4.jndi.name=jdbc/arquillian +frameworkdemoiselle.persistence.conn4.jndi.name=jdbc/__default frameworkdemoiselle.persistence.default.datasource.name=conn3 diff --git a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties index b023a52..07257b6 100644 --- a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties @@ -33,4 +33,4 @@ # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/arquillian +frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/__default -- libgit2 0.21.2