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

Timestamp:

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

Author:

boonebgorges

Message:

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

See #7234.

File:

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

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

@@ -14 +14 @@
 
         // create the thread
-        $t1 = $this->factory->message->create( array(
+        $message_1 = $this->factory->message->create_and_get( array(
             'sender_id'  => $u1,
             'recipients' => array( $u2 ),
@@ -21 +21 @@
 
         // 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 ),
@@ -28 +28 @@
         ) );
 
-        // grab the message ids as individual variables
-        list( $m1, $m2 ) = $this->get_message_ids( $t1 );
+        $m1 = $message_1->id;
+        $m2 = $message_2->id;
 
         // add cache for each message
@@ -86 +86 @@
         $u2 = $this->factory->user->create();
 
-        // create the thread
-        $t1 = $this->factory->message->create( array(
+        // create the message and thread
+        $m = $this->factory->message->create_and_get( array(
             'sender_id'  => $u1,
             'recipients' => array( $u2 ),
@@ -94 +94 @@
 
         // add message cache
-        list( $m1 ) = $this->get_message_ids( $t1 );
-        bp_messages_update_meta( $m1, 'yolo', 'gah' );
+        bp_messages_update_meta( $m->id, 'yolo', 'gah' );
 
         // prime meta cache in message loop
         bp_thread_has_messages( array(
-            'thread_id' => $t1,
+            'thread_id' => $m->thread_id,
             'update_meta_cache' => true
         ) );
 
-        $this->assertNotEmpty( wp_cache_get( $m1, 'message_meta' ) );
+        $this->assertNotEmpty( wp_cache_get( $m->id, 'message_meta' ) );
     }
 
@@ -117 +116 @@
 
         // create the thread
-        $t1 = $this->factory->message->create( array(
+        $message_1 = $this->factory->message->create_and_get( array(
             'sender_id'  => $u1,
             'recipients' => array( $u2 ),
@@ -124 +123 @@
 
         // 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 ),
@@ -131 +130 @@
         ) );
 
+        $m1 = $message_1->id;
+        $m2 = $message_2->id;
+        $t1 = $message_1->thread_id;
+
         // add message meta
-        list( $m1, $m2 ) = $this->get_message_ids( $t1 );
         bp_messages_update_meta( $m1, 'yolo', 'gah' );
         bp_messages_update_meta( $m2, 'yolo', 'bah' );