1 files changed, 10 insertions, 7 deletions
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index ff7f1c26..27272055 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -17,16 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Comment_Event_Test extends Unit_Test_Case {
+class Comment_Event_Test extends Gallery_Unit_Test_Case {
   public function deleting_an_item_deletes_its_comments_too_test() {
-    $rand = rand();
-    $album = album::create(ORM::factory("item", 1), "test_$rand", "test_$rand");
-    $comment = comment::create(
-      $album, identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+    $album = test::random_album();
+
+    $comment = ORM::factory("comment");
+    $comment->item_id = $album->id;
+    $comment->author_id = identity::guest()->id;
+    $comment->guest_name = "test";
+    $comment->text = "text";
+    $comment->save();
 
     $album->delete();
 
-    $deleted_comment = ORM::factory("comment", $comment->id);
-    $this->assert_false($deleted_comment->loaded());
+    $this->assert_false(ORM::factory("comment")->where("id", "=", $comment->id)->find()->loaded());
   }
 }