1 files changed, 9 insertions, 0 deletions
diff --git a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java b/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
index 33eb8f4..c4502e1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
@@ -6,6 +6,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
 import org.fedoraproject.candlepin.model.Consumer;
+import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.util.EntityManagerUtil;
@@ -59,6 +60,14 @@ public class DatabaseTestFixture {
             em.remove(c);
         }
 
+        // TODO: Is this right? Or should we pre-populate default defined types, and always
+        // reference these in the tests instead of creating them everywhere?
+        List<ConsumerType> consumerTypes = em.createQuery("from ConsumerType c").
+            getResultList();
+        for (ConsumerType c : consumerTypes) {
+            em.remove(c);
+        }
+
         em.getTransaction().commit();
         em.close();
     }