From d8b0021bd17c153cbbb9f4bc601804e8f8f3c92d Mon Sep 17 00:00:00 2001 From: Dancovich Date: Mon, 12 Nov 2012 17:10:05 -0200 Subject: [PATCH] Externalizada classe de testes Contact, que antes estava como interna. A especificação JPA não permite classes internas anotadas com @Entity. --- impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/domain/Contact.java | 28 ++++++++++++++++++++++++++++ impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java | 26 +------------------------- 2 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/domain/Contact.java diff --git a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/domain/Contact.java b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/domain/Contact.java new file mode 100644 index 0000000..8d35639 --- /dev/null +++ b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/domain/Contact.java @@ -0,0 +1,28 @@ +package br.gov.frameworkdemoiselle.domain; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public class Contact implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue + @Column + private Long id; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + +} diff --git a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java index c9ea907..4524c17 100644 --- a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java +++ b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java @@ -45,19 +45,14 @@ import static org.powermock.api.easymock.PowerMock.replayAll; import static org.powermock.api.easymock.PowerMock.verifyAll; import static org.powermock.reflect.Whitebox.setInternalState; -import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.enterprise.inject.Instance; -import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; import javax.persistence.Persistence; import javax.persistence.Query; import javax.persistence.TransactionRequiredException; @@ -80,6 +75,7 @@ import org.powermock.reflect.Whitebox; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.configuration.Configuration; +import br.gov.frameworkdemoiselle.domain.Contact; import br.gov.frameworkdemoiselle.internal.implementation.PaginationImpl; import br.gov.frameworkdemoiselle.pagination.Pagination; import br.gov.frameworkdemoiselle.pagination.PaginationContext; @@ -110,26 +106,6 @@ public class JPACrudTest { setInternalState(this.contactDAO, EntityManager.class, this.entityManager); } - @Entity - class Contact implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column - private Long id; - - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - } - @Test public void testDelete() { expect(this.entityManager.getReference(Contact.class, null)).andReturn(null); -- libgit2 0.21.2