diff --git a/impl/extension/jpa/src/test/java/productor/MyEntity.java b/impl/extension/jpa/src/test/java/productor/MyEntity.java deleted file mode 100644 index 84f1b2e..0000000 --- a/impl/extension/jpa/src/test/java/productor/MyEntity.java +++ /dev/null @@ -1,29 +0,0 @@ -package productor; - -import javax.persistence.Entity; -import javax.persistence.Id; - -@Entity -public class MyEntity { - - @Id - private String id; - - private String description; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/impl/extension/jpa/src/test/java/productor/ProductorTest.java b/impl/extension/jpa/src/test/java/productor/ProductorTest.java deleted file mode 100644 index cece4e2..0000000 --- a/impl/extension/jpa/src/test/java/productor/ProductorTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package productor; - -import javax.persistence.EntityManager; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; - -import test.Tests; -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.NameQualifier; - - -@RunWith(Arquillian.class) -public class ProductorTest { - - private static final String PATH = "src/test/resources/productor"; - - @Deployment - public static WebArchive createDeployment() { - WebArchive deployment = Tests.createDeployment(ProductorTest.class); - deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml"); - deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); - - return deployment; - } - - @Test - public void produceEntityManager(){ - - EntityManager manager = Beans.getReference(EntityManager.class); - Assert.assertNotNull(manager); - Assert.assertEquals(EntityManagerProxy.class,manager.getClass()); - - } - - @Test - public void produceMultipleEntityManagers(){ - - EntityManager m1 = Beans.getReference(EntityManager.class,new NameQualifier("pu")); - - Assert.assertNotNull(m1); - Assert.assertEquals(EntityManagerProxy.class,m1.getClass()); - - EntityManager m2 = Beans.getReference(EntityManager.class,new NameQualifier("pu2")); - - Assert.assertNotNull(m2); - Assert.assertEquals(EntityManagerProxy.class,m2.getClass()); - - } - - @Test - public void produceOneEntityManagerPerRequest(){ - EntityManager m1 = Beans.getReference(EntityManager.class,new NameQualifier("pu")); - - Assert.assertNotNull(m1); - Assert.assertEquals(EntityManagerProxy.class,m1.getClass()); - - EntityManager m2 = Beans.getReference(EntityManager.class,new NameQualifier("pu")); - - Assert.assertNotNull(m2); - Assert.assertEquals(EntityManagerProxy.class,m2.getClass()); - - MyEntity entity = new MyEntity(); - entity.setId(createId("testID")); - - m1.persist(entity); - - Assert.assertTrue( m2.contains(entity) ); - } - - private String createId(String id) { - return this.getClass().getName() + "_" + id; - } - -} diff --git a/impl/extension/jpa/src/test/resources/producer/demoiselle.properties b/impl/extension/jpa/src/test/resources/producer/demoiselle.properties new file mode 100644 index 0000000..6516d47 --- /dev/null +++ b/impl/extension/jpa/src/test/resources/producer/demoiselle.properties @@ -0,0 +1 @@ +frameworkdemoiselle.persistence.default.unit.name=pu \ No newline at end of file diff --git a/impl/extension/jpa/src/test/resources/productor/demoiselle.properties b/impl/extension/jpa/src/test/resources/productor/demoiselle.properties deleted file mode 100644 index 6516d47..0000000 --- a/impl/extension/jpa/src/test/resources/productor/demoiselle.properties +++ /dev/null @@ -1 +0,0 @@ -frameworkdemoiselle.persistence.default.unit.name=pu \ No newline at end of file diff --git a/impl/extension/jpa/src/test/resources/productor/persistence.xml b/impl/extension/jpa/src/test/resources/productor/persistence.xml deleted file mode 100644 index 124971e..0000000 --- a/impl/extension/jpa/src/test/resources/productor/persistence.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - jdbc/__default - - productor.MyEntity - - - - - - - - - - jdbc/__default - - productor.MyEntity - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jta/src/test/resources/beans.xml b/impl/extension/jta/src/test/resources/beans.xml deleted file mode 100644 index 9349c2f..0000000 --- a/impl/extension/jta/src/test/resources/beans.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 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/jta/src/test/resources/test/beans.xml b/impl/extension/jta/src/test/resources/test/beans.xml new file mode 100644 index 0000000..9349c2f --- /dev/null +++ b/impl/extension/jta/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 + + + -- libgit2 0.21.2