Merge pull request playframework#238 from lights51/bug1

[playframework#721] Fixtures.deleteAllModels() tried to delete classes that are not an Entity
tkral · Jun 1, 2011 · 5276122 · 5276122
2 parents f856ac0 + 46b9520
commit 5276122
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/framework/src/play/test/Fixtures.java b/framework/src/play/test/Fixtures.java
@@ -70,12 +70,14 @@ public static void delete(Class<? extends Model>... types) {
         }
 
         for (Class<? extends Model> type : types) {
-            try {
-                Model.Manager.factoryFor(type).deleteAll();
-            } catch(Exception e) {
-                Logger.error(e, "While deleting " + type + " instances");
+            // A Model might not be an Entity if it is a sub-class.
+            if (type.isAnnotationPresent(javax.persistence.Entity.class)) {
+                try {
+                    Model.Manager.factoryFor(type).deleteAll();
+                } catch(Exception e) {
+                    Logger.error(e, "While deleting " + type + " instances");
+                }
             }
-
         }
 
         for (DBConfig dbConfig : DB.getDBConfigs()) {