Changeset 11044 for trunk/tests/phpunit/testcases/messages/star.php

Timestamp:

08/30/2016 05:29:28 PM (10 years ago)

Author:

boonebgorges

Message:

Update Messages tests to work after the changes in [11042].

See #7234.

File:

• trunk/tests/phpunit/testcases/messages/star.php (modified) (8 diffs)

trunk/tests/phpunit/testcases/messages/star.php

@@ -15 +15 @@
 
                 // create the thread
-                $t1 = $this->factory->message->create( array(
+                $message_1 = $this->factory->message->create_and_get( array(
                         'sender_id'  => $u1,
                         'recipients' => array( $u2 ),
@@ -22 +22 @@
 
                 // create a reply
-                $this->factory->message->create( array(
-                        'thread_id'  => $t1,
+                $message_2 = $this->factory->message->create_and_get( array(
+                        'thread_id'  => $message_1->thread_id,
                         'sender_id'  => $u2,
                         'recipients' => array( $u1 ),
@@ -29 +29 @@
                 ) );
 
-                // grab the message ids as individual variables
-                list( $m1, $m2 ) = $this->get_message_ids( $t1 );
+                $m1 = $message_1->id;
+                $m2 = $message_2->id;
 
                 // star the second message
@@ -63 +63 @@
 
                 // create the thread
-                $t1 = $this->factory->message->create( array(
+                $message_1 = $this->factory->message->create_and_get( array(
                         'sender_id'  => $u1,
                         'recipients' => array( $u2 ),
@@ -70 +70 @@
 
                 // create a reply
-                $this->factory->message->create( array(
-                        'thread_id'  => $t1,
+                $message_2 = $this->factory->message->create_and_get( array(
+                        'thread_id'  => $message_1->thread_id,
                         'sender_id'  => $u2,
                         'recipients' => array( $u1 ),
@@ -77 +77 @@
                 ) );
 
-                // grab the message ids as individual variables
-                list( $m1, $m2 ) = $this->get_message_ids( $t1 );
+                $m1 = $message_1->id;
+                $m2 = $message_2->id;
+                $t1 = $message_1->thread_id;
 
                 // star all messages
@@ -116 +117 @@
 
                 // create three threads
-                $t1 = $this->factory->message->create( array(
+                $message_1 = $this->factory->message->create_and_get( array(
                         'sender_id'  => $u1,
                         'recipients' => array( $u2 ),
                         'subject'    => 'A',
                 ) );
-                $t2 = $this->factory->message->create( array(
+                $message_2 = $this->factory->message->create_and_get( array(
                         'sender_id'  => $u1,
                         'recipients' => array( $u2 ),
                         'subject'    => 'B',
                 ) );
-                $t3 = $this->factory->message->create( array(
+                $message_3 = $this->factory->message->create_and_get( array(
                         'sender_id'  => $u1,
                         'recipients' => array( $u2 ),
@@ -133 +134 @@
 
                 // grab the message ids as individual variables
-                list( $m1 ) = $this->get_message_ids( $t1 );
-                list( $m2 ) = $this->get_message_ids( $t2 );
-                list( $m3 ) = $this->get_message_ids( $t3 );
+                $m1 = $message_1->id;
+                $m2 = $message_2->id;
+                $m3 = $message_3->id;
+
+                $t2 = $message_2->thread_id;
 
                 // star all threads