Surfing bird.

message.info

@@ -15,7 +15,8 @@ files[] = includes/message.message_type.inc
 files[] = includes/message.message_type_category.inc
 
 ; Tests
-files[] = message.test
+files[] = tests/message.test
+files[] = tests/MessageArgumentsTestCase.test
 
 ; Views includes
 files[] = includes/views/message.views.inc

message_example/message_example.info

@@ -33,4 +33,4 @@ features[variable][] = field_bundle_settings_message__example_create_comment
 features[variable][] = field_bundle_settings_message__example_create_node
 features[variable][] = field_bundle_settings_message__example_user_register
 features[views_view][] = message_example
-mtime = 1421048270
+mtime = 1421303198

tests/MessageArgumentsTestCase.test

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Testing the arguments handler for messages.
+ */
+class MessageArgumentsTestCase extends DrupalWebTestCase {
+
+  /**
+   * @var \stdClass
+   *
+   * The user object.
+   */
+  protected $user;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Message arguments',
+      'description' => 'Test the Message and arguments handling.',
+      'group' => 'Message',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('message', 'message_example');
+
+    $this->user = $this->drupalCreateUser();
+  }
+
+  /**
+   * Testing ctools message arguments plugin.
+   */
+  public function testCtoolsArguments() {
+    $uri = entity_uri('user', $this->user);
+
+    message_type_create('example_arguments', array())->save();
+
+    $message = message_create('example_arguments', array('uid' => $this->user->uid));
+    $message->save();
+
+    if (!$handler = message_get_message_arguments_handler($message)) {
+      throw new Exception('No arguments handler was found for the Message example message type.');
+    }
+
+    $arguments = $handler->getArguments();
+
+    $expected_arguments = array(
+      '@name' => $this->user->name,
+      '%time' => format_date($message->timestamp),
+      '!link' => l(t('link'), $uri['path'], array('absolute' => TRUE)),
+    );
+
+    // Verify we got the correct arguments.
+    $this->assertEqual($arguments, $expected_arguments, 'The arguments plugin returned the expected values.');
+  }
+
+}

message.test → tests/message.test

@@ -1,63 +1,5 @@
 <?php
 
-/**
- * Testing the arguments handler for messages.
- */
-class MessageArgumentsTestCase extends DrupalWebTestCase {
-
-  /**
-   * @var \stdClass
-   *
-   * The user object.
-   */
-  protected $user;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getInfo() {
-    return array(
-      'name' => 'Message arguments',
-      'description' => 'Test the Message and arguments handling.',
-      'group' => 'Message',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('message', 'message_example');
-
-    $this->user = $this->drupalCreateUser();
-  }
-
-  /**
-   * Testing ctools message arguments plugin.
-   */
-  public function testCtoolsArguments() {
-    $uri = entity_uri('user', $this->user);
-
-    message_type_create('example_arguments', array())->save();
-
-    $message = message_create('example_arguments', array('uid' => $this->user->uid));
-    $message->save();
-
-    if (!$handler = message_get_message_arguments_handler($message)) {
-      throw new Exception('No arguments handler was found for the Message example message type.');
-    }
-
-    $arguments = $handler->getArguments();
-
-    $expected_arguments = array(
-      '@name' => $this->user->name,
-      '%time' => format_date($message->timestamp),
-      '!link' => l(t('link'), $uri['path'], array('absolute' => TRUE)),
-    );
-
-    // Verify we got the correct arguments.
-    $this->assertEqual($arguments, $expected_arguments, 'The arguments plugin returned the expected values.');
-  }
-
-}
-
 /**
  * Test the Message CRUD handling.
  */