From eb8f9212dcb9b21a12b2ede169bfebd52b46fe76 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 6 Nov 2009 09:34:30 -0400 Subject: Fix sample test for ConsumerType via EntityManager. --- proxy/code/src/META-INF/persistence.xml | 1 - .../fedoraproject/candlepin/model/Consumer.java | 2 ++ .../candlepin/model/ConsumerType.java | 4 +++ .../candlepin/model/test/ConsumerTypeTest.java | 36 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java (limited to 'proxy/code/src') diff --git a/proxy/code/src/META-INF/persistence.xml b/proxy/code/src/META-INF/persistence.xml index 881b514..2ecd9fd 100644 --- a/proxy/code/src/META-INF/persistence.xml +++ b/proxy/code/src/META-INF/persistence.xml @@ -5,7 +5,6 @@ org.hibernate.ejb.HibernatePersistence - true diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java index fe11886..9af8f4e 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java @@ -23,6 +23,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; +import javax.persistence.*; + /** * Represents Consumer entity */ diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java index d441b27..9ead523 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java @@ -14,6 +14,8 @@ */ package org.fedoraproject.candlepin.model; +import javax.persistence.Entity; +import javax.persistence.Id; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -23,6 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement @XmlAccessorType(XmlAccessType.PROPERTY) +@Entity public class ConsumerType extends BaseModel { private String label; @@ -46,6 +49,7 @@ public class ConsumerType extends BaseModel { /** * @return Returns the label. */ + @Id public String getLabel() { return label; } diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java new file mode 100644 index 0000000..92e810a --- /dev/null +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java @@ -0,0 +1,36 @@ +package org.fedoraproject.candlepin.model.test; + +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Persistence; + +import org.fedoraproject.candlepin.model.ConsumerType; +import org.junit.Test; +import static org.junit.Assert.*; + +public class ConsumerTypeTest { + + @Test + public void testSomething() { + EntityManagerFactory emf = + Persistence.createEntityManagerFactory("test"); +// HibernateUtil.getSession(); + ConsumerType ct = new ConsumerType("standard-system"); + EntityManager em = emf.createEntityManager(); + EntityTransaction tx = null; + tx = em.getTransaction(); + tx.begin(); + + em.persist(ct); + tx.commit(); + + List results = em.createQuery("select ct from ConsumerType as ct") + .getResultList(); + assertEquals(1, results.size()); + + + } +} -- cgit