3 files changed, 38 insertions, 26 deletions

diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index ff7f1c26..5b7daef4 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -19,14 +19,17 @@
  */
 class Comment_Event_Test extends 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());
   }
 }
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 8e726869..d780aba6 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -48,15 +48,19 @@ class Comment_Helper_Test extends Unit_Test_Case {
   }
 
   public function create_comment_for_guest_test() {
-    $rand = rand();
-    $root = ORM::factory("item", 1);
-    $comment = comment::create(
-      $root, identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+    $comment = ORM::factory("comment");
+    $comment->item_id = item::root()->id;
+    $comment->text = "text";
+    $comment->author_id = identity::guest()->id;
+    $comment->guest_name = "name";
+    $comment->guest_email = "email@email.com";
+    $comment->guest_url = "http://url.com";
+    $comment->save();
 
-    $this->assert_equal("name_$rand", $comment->author_name());
-    $this->assert_equal("email_$rand", $comment->author_email());
-    $this->assert_equal("url_$rand", $comment->author_url());
-    $this->assert_equal("text_$rand", $comment->text);
+    $this->assert_equal("name", $comment->author_name());
+    $this->assert_equal("email@email.com", $comment->author_email());
+    $this->assert_equal("http://url.com", $comment->author_url());
+    $this->assert_equal("text", $comment->text);
     $this->assert_equal(1, $comment->item_id);
 
     $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
@@ -78,16 +82,18 @@ class Comment_Helper_Test extends Unit_Test_Case {
   }
 
   public function create_comment_for_user_test() {
-    $rand = rand();
-    $root = ORM::factory("item", 1);
     $admin = identity::admin_user();
-    $comment = comment::create(
-      $root, $admin, "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+
+    $comment = ORM::factory("comment");
+    $comment->item_id = item::root()->id;
+    $comment->text = "text";
+    $comment->author_id = $admin->id;
+    $comment->save();
 
     $this->assert_equal($admin->full_name, $comment->author_name());
     $this->assert_equal($admin->email, $comment->author_email());
     $this->assert_equal($admin->url, $comment->author_url());
-    $this->assert_equal("text_$rand", $comment->text);
+    $this->assert_equal("text", $comment->text);
     $this->assert_equal(1, $comment->item_id);
 
     $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index aa91d6f2..c98eb63c 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -20,21 +20,24 @@
 class Comment_Model_Test extends Unit_Test_Case {
 
   public function cant_view_comments_for_unviewable_items_test() {
-    $root = ORM::factory("item", 1);
-    $album = album::create($root, rand(), rand(), rand());
-    $comment = comment::create($album, identity::guest(), "text", "name", "email", "url");
+    $album = test::random_album();
+
+    $comment = ORM::factory("comment");
+    $comment->item_id = $album->id;
+    $comment->author_id = identity::admin_user()->id;
+    $comment->text = "text";
+    $comment->save();
+
     identity::set_active_user(identity::guest());
 
     // We can see the comment when permissions are granted on the album
     access::allow(identity::everybody(), "view", $album);
-    $this->assert_equal(
-      1,
+    $this->assert_true(
       ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
     access::deny(identity::everybody(), "view", $album);
-    $this->assert_equal(
-      0,
+    $this->assert_false(
       ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
   }
 }