Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.82
diff -u -r1.82 comment.test
--- modules/comment/comment.test	1 Jun 2010 17:58:29 -0000	1.82
+++ modules/comment/comment.test	2 Jun 2010 04:52:05 -0000
@@ -1144,6 +1144,33 @@
 }
 
 /**
+ * Ensure that hook_comment_load() is actually called.
+ */
+class CommentCallHookLoad extends CommentHelperCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Call hook_comment_load()',
+      'description' => 'Make sure that hook_comment_load() is actually called.',
+      'group' => 'Comment',
+    );
+  }
+
+  function setUp() {
+    // Enable dummy module that implements hook_node_view.
+    parent::setUp();
+    module_enable(array('comment_hook_test'));
+  }
+
+  function testHookCalled() {
+    $this->drupalLogin($this->admin_user);
+    parent::postComment($this->node, 'this is a comment');
+    $this->drupalGet('node/' . $this->node->nid);
+    $this->assertText('hook_comment_load() was called');
+    $this->drupalLogout();
+  }
+}
+
+/**
  * Test comment token replacement in strings.
  */
 class CommentTokenReplaceTestCase extends CommentHelperCase {
Index: modules/comment/tests/comment_hook_test.info
===================================================================
RCS file: modules/comment/tests/comment_hook_test.info
diff -N modules/comment/tests/comment_hook_test.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/comment/tests/comment_hook_test.info	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,8 @@
+; $Id: node_test.info,v 1.1 2009/04/02 20:47:54 dries Exp $
+name = "Comment hook test"
+description = "Test whether a hook is called on a comment."
+package = Testing
+version = VERSION
+core = 7.x
+files[] = comment_hook_test.module
+hidden = TRUE
Index: modules/comment/tests/comment_hook_test.module
===================================================================
RCS file: modules/comment/tests/comment_hook_test.module
diff -N modules/comment/tests/comment_hook_test.module
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/comment/tests/comment_hook_test.module	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,16 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Dummy module to test that hook_comment_load() is called as expected.
+ */
+
+/**
+ * Implements hook_comment_load().
+ */
+function comment_hook_test_comment_load($comments) {
+  foreach($comments as $comment) {
+    $comment->subject = 'hook_comment_load() was called';
+  }
+}