From 6819fe580e7cbfcc39bf627bc4c778d40b8bfacf Mon Sep 17 00:00:00 2001 From: lusabo Date: Fri, 23 Aug 2013 11:30:25 -0300 Subject: [PATCH] Ajustes nos testes de Jdbc --- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java | 3 +++ impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java | 3 +++ impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java | 40 ++++++++++++++++++++++++++++++++++++++++ impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java | 6 ++---- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java | 41 +++++++++++++++++++++++++++++++++++++++++ impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java | 1 + impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties | 1 + impl/extension/jdbc/src/test/resources/producer/without-jndi/demoiselle.properties | 0 8 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java create mode 100644 impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java create mode 100644 impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties create mode 100644 impl/extension/jdbc/src/test/resources/producer/without-jndi/demoiselle.properties diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java index 5cce2f6..d482414 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java @@ -30,6 +30,9 @@ public class ConnectionProducerNoConnectionDriverTest { return deployment; } + /** + * TODO Refinar a exceção esperada + */ @Test(expected = Exception.class) public void failOnCreateConnection() { conn1.get(); diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java index 54e1f73..9eaa986 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java @@ -30,6 +30,9 @@ public class ConnectionProducerNoConnectionUrlTest { return deployment; } + /** + * TODO Refinar a exceção esperada + */ @Test(expected = Exception.class) public void failOnCreateConnection() { conn1.get(); diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java new file mode 100644 index 0000000..3daf3ea --- /dev/null +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java @@ -0,0 +1,40 @@ +package connection.producer; + +import static org.junit.Assert.assertEquals; + +import java.sql.Connection; +import java.sql.SQLException; + +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; +import br.gov.frameworkdemoiselle.annotation.Name; + +@RunWith(Arquillian.class) +public class ConnectionProducerWithJndiTest { + + private static String PATH = "src/test/resources/producer/with-jndi"; + + @Inject + @Name("conn1") + private Connection conn1; + + @Deployment + public static WebArchive createDeployment() { + WebArchive deployment = Tests.createDeployment(ConnectionProducerWithJndiTest.class); + deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); + return deployment; + } + + @Test + public void createConnection() throws SQLException { + assertEquals(conn1.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); + } + +} \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java index 12f7c7a..c490a05 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java @@ -3,8 +3,6 @@ package connection.producer; import static org.junit.Assert.assertNotNull; import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; import javax.inject.Inject; @@ -24,7 +22,7 @@ public class ConnectionProducerWithNameTest { @Inject @Name("conn1") - private Connection connection; + private Connection conn1; @Deployment public static WebArchive createDeployment() { @@ -35,7 +33,7 @@ public class ConnectionProducerWithNameTest { @Test public void createConnection() { - assertNotNull(connection); + assertNotNull(conn1); } } diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java new file mode 100644 index 0000000..53161f9 --- /dev/null +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java @@ -0,0 +1,41 @@ +package connection.producer; + +import static org.junit.Assert.assertEquals; + +import java.sql.Connection; +import java.sql.SQLException; + +import javax.enterprise.inject.Instance; +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; +import br.gov.frameworkdemoiselle.annotation.Name; + +@RunWith(Arquillian.class) +public class ConnectionProducerWithoutJndiTest { + + private static String PATH = "src/test/resources/producer/without-jndi"; + + @Inject + @Name("conn1") + private Instance conn1; + + @Deployment + public static WebArchive createDeployment() { + WebArchive deployment = Tests.createDeployment(ConnectionProducerWithoutJndiTest.class); + deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); + return deployment; + } + + @Test(expected=Exception.class) + public void createConnection() throws SQLException { + conn1.get(); + } + +} \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java index a4c1b95..9913654 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java @@ -9,6 +9,7 @@ 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.Ignore; import org.junit.Test; import org.junit.runner.RunWith; 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 new file mode 100644 index 0000000..b8e38bc --- /dev/null +++ b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties @@ -0,0 +1 @@ +frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/arquillian \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/producer/without-jndi/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/without-jndi/demoiselle.properties new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/impl/extension/jdbc/src/test/resources/producer/without-jndi/demoiselle.properties -- libgit2 0.21.2