![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 11044
- Timestamp:
- 08/30/2016 05:29:28 PM (10 years ago)
- Location:
- trunk/tests/phpunit/testcases/messages
- Files:
-
- 4 edited
-
cache.php (modified) (8 diffs)
-
class.bp-messages-thread.php (modified) (21 diffs)
-
star.php (modified) (8 diffs)
-
template.php (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/tests/phpunit/testcases/messages/cache.php
r9819 r11044 14 14 15 15 // create the thread 16 $ t1 = $this->factory->message->create( array(16 $message_1 = $this->factory->message->create_and_get( array( 17 17 'sender_id' => $u1, 18 18 'recipients' => array( $u2 ), … … 21 21 22 22 // create a reply 23 $ this->factory->message->create( array(24 'thread_id' => $ t1,23 $message_2 = $this->factory->message->create_and_get( array( 24 'thread_id' => $message_1->thread_id, 25 25 'sender_id' => $u2, 26 26 'recipients' => array( $u1 ), … … 28 28 ) ); 29 29 30 // grab the message ids as individual variables31 list( $m1, $m2 ) = $this->get_message_ids( $t1 );30 $m1 = $message_1->id; 31 $m2 = $message_2->id; 32 32 33 33 // add cache for each message … … 86 86 $u2 = $this->factory->user->create(); 87 87 88 // create the thread89 $ t1 = $this->factory->message->create( array(88 // create the message and thread 89 $m = $this->factory->message->create_and_get( array( 90 90 'sender_id' => $u1, 91 91 'recipients' => array( $u2 ), … … 94 94 95 95 // add message cache 96 list( $m1 ) = $this->get_message_ids( $t1 ); 97 bp_messages_update_meta( $m1, 'yolo', 'gah' ); 96 bp_messages_update_meta( $m->id, 'yolo', 'gah' ); 98 97 99 98 // prime meta cache in message loop 100 99 bp_thread_has_messages( array( 101 'thread_id' => $ t1,100 'thread_id' => $m->thread_id, 102 101 'update_meta_cache' => true 103 102 ) ); 104 103 105 $this->assertNotEmpty( wp_cache_get( $m 1, 'message_meta' ) );104 $this->assertNotEmpty( wp_cache_get( $m->id, 'message_meta' ) ); 106 105 } 107 106 … … 117 116 118 117 // create the thread 119 $ t1 = $this->factory->message->create( array(118 $message_1 = $this->factory->message->create_and_get( array( 120 119 'sender_id' => $u1, 121 120 'recipients' => array( $u2 ), … … 124 123 125 124 // create a reply 126 $ this->factory->message->create( array(127 'thread_id' => $ t1,125 $message_2 = $this->factory->message->create_and_get( array( 126 'thread_id' => $message_1->thread_id, 128 127 'sender_id' => $u2, 129 128 'recipients' => array( $u1 ), … … 131 130 ) ); 132 131 132 $m1 = $message_1->id; 133 $m2 = $message_2->id; 134 $t1 = $message_1->thread_id; 135 133 136 // add message meta 134 list( $m1, $m2 ) = $this->get_message_ids( $t1 );135 137 bp_messages_update_meta( $m1, 'yolo', 'gah' ); 136 138 bp_messages_update_meta( $m2, 'yolo', 'bah' ); -
trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php
r10038 r11044 3 3 /** 4 4 * @group BP_Messages_Thread 5 * @group messages 5 6 */ 6 7 class BP_Tests_BP_Messages_Thread extends BP_UnitTestCase { … … 13 14 $u2 = $this->factory->user->create(); 14 15 15 $ t1 = $this->factory->message->create( array(16 $message = $this->factory->message->create_and_get( array( 16 17 'sender_id' => $u1, 17 18 'recipients' => array( $u2 ), … … 20 21 21 22 // prime cache 22 new BP_Messages_Thread( $ t1);23 new BP_Messages_Thread( $message->thread_id ); 23 24 24 25 // Cache should exist 25 26 $this->assertThat( 26 wp_cache_get( $ t1, 'bp_messages_threads' ),27 wp_cache_get( $message->thread_id, 'bp_messages_threads' ), 27 28 $this->logicalNot( $this->equalTo( false ) ), 28 29 'Message thread cache should exist.' … … 38 39 39 40 // create thread 40 $t1 = $this->factory->message->create( array( 41 'sender_id' => $u1, 42 'recipients' => array( $u2 ), 43 'subject' => 'Foo', 44 ) ); 45 // save message ID 46 $thread = new BP_Messages_Thread( $t1 ); 47 $m1 = wp_list_pluck( $thread->messages, 'id' ); 48 $m1 = array_pop( $m1 ); 41 $message_1 = $this->factory->message->create_and_get( array( 42 'sender_id' => $u1, 43 'recipients' => array( $u2 ), 44 'subject' => 'Foo', 45 ) ); 46 $m1 = $message_1->id; 49 47 50 48 // create reply 51 $ t2 = $this->factory->message->create( array(52 'thread_id' => $ t1,49 $message_2 = $this->factory->message->create_and_get( array( 50 'thread_id' => $message_1->thread_id, 53 51 'sender_id' => $u1, 54 52 'recipients' => array( $u2 ), 55 53 'content' => 'Bar' 56 54 ) ); 57 // save message ID 58 $thread = new BP_Messages_Thread( $t1 ); 59 $m2 = wp_list_pluck( $thread->messages, 'id' ); 60 $m2 = array_pop( $m2 ); 55 $m2 = $message_2->id; 61 56 62 57 // now get thread by DESC 63 $thread = new BP_Messages_Thread( $ t1, 'DESC' );58 $thread = new BP_Messages_Thread( $message_1->thread_id, 'DESC' ); 64 59 65 60 // assert! … … 77 72 $u2 = $this->factory->user->create(); 78 73 79 $ t1 = $this->factory->message->create( array(80 'sender_id' => $u1, 81 'recipients' => array( $u2 ), 82 'subject' => 'Foo', 83 ) ); 84 85 $ t2 = $this->factory->message->create( array(74 $message_1 = $this->factory->message->create_and_get( array( 75 'sender_id' => $u1, 76 'recipients' => array( $u2 ), 77 'subject' => 'Foo', 78 ) ); 79 80 $message_2 = $this->factory->message->create_and_get( array( 86 81 'sender_id' => $u1, 87 82 'recipients' => array( $u2 ), … … 94 89 ) ); 95 90 96 $expected = array( $ t2);91 $expected = array( $message_2->thread_id ); 97 92 $found = wp_parse_id_list( wp_list_pluck( $threads['threads'], 'thread_id' ) ); 98 93 … … 107 102 $u2 = $this->factory->user->create(); 108 103 109 $ t1 = $this->factory->message->create( array(110 'sender_id' => $u1, 111 'recipients' => array( $u2 ), 112 'subject' => 'Foo', 113 ) ); 114 115 $ t2 = $this->factory->message->create( array(104 $message_1 = $this->factory->message->create_and_get( array( 105 'sender_id' => $u1, 106 'recipients' => array( $u2 ), 107 'subject' => 'Foo', 108 ) ); 109 110 $message_2 = $this->factory->message->create_and_get( array( 116 111 'sender_id' => $u1, 117 112 'recipients' => array( $u2 ), … … 125 120 ) ); 126 121 127 $expected = array( $ t2);122 $expected = array( $message_2->thread_id ); 128 123 $found = wp_parse_id_list( wp_list_pluck( $threads['threads'], 'thread_id' ) ); 129 124 … … 139 134 $u2 = $this->factory->user->create(); 140 135 141 $ t1 = $this->factory->message->create( array(142 'sender_id' => $u1, 143 'recipients' => array( $u2 ), 144 'subject' => 'Foo', 145 ) ); 146 147 $ t2 = $this->factory->message->create( array(136 $message_1 = $this->factory->message->create_and_get( array( 137 'sender_id' => $u1, 138 'recipients' => array( $u2 ), 139 'subject' => 'Foo', 140 ) ); 141 142 $message_2 = $this->factory->message->create_and_get( array( 148 143 'sender_id' => $u1, 149 144 'recipients' => array( $u2 ), … … 153 148 $threads = BP_Messages_Thread::get_current_threads_for_user( $u1, 'sentbox', 'all', null, null, 'ar' ); 154 149 155 $expected = array( $ t2);150 $expected = array( $message_2->thread_id ); 156 151 $found = wp_parse_id_list( wp_list_pluck( $threads['threads'], 'thread_id' ) ); 157 152 … … 169 164 $u2 = $this->factory->user->create(); 170 165 171 $ t1 = $this->factory->message->create( array(172 'sender_id' => $u1, 173 'recipients' => array( $u2 ), 174 'subject' => 'Foo', 175 ) ); 176 177 $thread = new BP_Messages_Thread( $ t1);166 $message = $this->factory->message->create_and_get( array( 167 'sender_id' => $u1, 168 'recipients' => array( $u2 ), 169 'subject' => 'Foo', 170 ) ); 171 172 $thread = new BP_Messages_Thread( $message->thread_id ); 178 173 $recipients = $thread->get_recipients(); 179 174 … … 195 190 $u2 = $this->factory->user->create(); 196 191 197 $ t1 = $this->factory->message->create( array(198 'sender_id' => $u1, 199 'recipients' => array( $u2 ), 200 'subject' => 'Foo', 201 ) ); 202 203 $thread = new BP_Messages_Thread( $ t1);192 $message = $this->factory->message->create_and_get( array( 193 'sender_id' => $u1, 194 'recipients' => array( $u2 ), 195 'subject' => 'Foo', 196 ) ); 197 198 $thread = new BP_Messages_Thread( $message->thread_id ); 204 199 $recipients = $thread->get_recipients(); 205 200 … … 211 206 messages_new_message( array( 212 207 'sender_id' => $u2, 213 'thread_id' => $ t1,208 'thread_id' => $message->thread_id, 214 209 'recipients' => array( $u1 ), 215 210 'subject' => 'Bar', … … 233 228 $u2 = $this->factory->user->create(); 234 229 235 $t1 = $this->factory->message->create( array( 236 'sender_id' => $u1, 237 'recipients' => array( $u2 ), 238 'subject' => 'Foo', 239 ) ); 230 $message = $this->factory->message->create_and_get( array( 231 'sender_id' => $u1, 232 'recipients' => array( $u2 ), 233 'subject' => 'Foo', 234 ) ); 235 236 $t1 = $message->thread_id; 240 237 241 238 $thread = new BP_Messages_Thread( $t1 ); … … 263 260 $u2 = $this->factory->user->create(); 264 261 265 $t1 = $this->factory->message->create( array( 266 'sender_id' => $u1, 267 'recipients' => array( $u2 ), 268 'subject' => 'Foo', 269 ) ); 262 $message = $this->factory->message->create_and_get( array( 263 'sender_id' => $u1, 264 'recipients' => array( $u2 ), 265 'subject' => 'Foo', 266 ) ); 267 268 $t1 = $message->thread_id; 270 269 271 270 $thread = new BP_Messages_Thread( $t1 ); … … 293 292 $u2 = $this->factory->user->create(); 294 293 295 $t1 = $this->factory->message->create( array( 296 'sender_id' => $u1, 297 'recipients' => array( $u2 ), 298 'subject' => 'Foo', 299 ) ); 294 $message = $this->factory->message->create_and_get( array( 295 'sender_id' => $u1, 296 'recipients' => array( $u2 ), 297 'subject' => 'Foo', 298 ) ); 299 300 $t1 = $message->thread_id; 300 301 301 302 $thread = new BP_Messages_Thread( $t1 ); … … 328 329 $u2 = $this->factory->user->create(); 329 330 330 $t1 = $this->factory->message->create( array( 331 'sender_id' => $u1, 332 'recipients' => array( $u2 ), 333 'subject' => 'Foo', 334 ) ); 331 $message = $this->factory->message->create_and_get( array( 332 'sender_id' => $u1, 333 'recipients' => array( $u2 ), 334 'subject' => 'Foo', 335 ) ); 336 337 $t1 = $message->thread_id; 335 338 336 339 $thread = new BP_Messages_Thread( $t1 ); … … 360 363 $u2 = $this->factory->user->create(); 361 364 362 $t1 = $this->factory->message->create( array( 363 'sender_id' => $u1, 364 'recipients' => array( $u2 ), 365 'subject' => 'Foo', 366 ) ); 365 $message = $this->factory->message->create_and_get( array( 366 'sender_id' => $u1, 367 'recipients' => array( $u2 ), 368 'subject' => 'Foo', 369 ) ); 370 371 $t1 = $message->thread_id; 367 372 368 373 // save recipient ID … … 388 393 $u2 = $this->factory->user->create(); 389 394 390 $t1 = $this->factory->message->create( array( 391 'sender_id' => $u1, 392 'recipients' => array( $u2 ), 393 'subject' => 'Foo', 394 ) ); 395 $message = $this->factory->message->create_and_get( array( 396 'sender_id' => $u1, 397 'recipients' => array( $u2 ), 398 'subject' => 'Foo', 399 ) ); 400 401 $t1 = $message->thread_id; 395 402 396 403 $this->assertEquals( $t1, BP_Messages_Thread::is_valid( $t1 ) ); … … 413 420 $date = bp_core_current_time(); 414 421 415 $ t1 = $this->factory->message->create( array(422 $message = $this->factory->message->create_and_get( array( 416 423 'sender_id' => $u1, 417 424 'recipients' => array( $u2 ), … … 420 427 'content' => 'Bar and baz.', 421 428 ) ); 429 430 $t1 = $message->thread_id; 422 431 423 432 $thread = new BP_Messages_Thread( $t1 ); -
trunk/tests/phpunit/testcases/messages/star.php
r9951 r11044 15 15 16 16 // create the thread 17 $ t1 = $this->factory->message->create( array(17 $message_1 = $this->factory->message->create_and_get( array( 18 18 'sender_id' => $u1, 19 19 'recipients' => array( $u2 ), … … 22 22 23 23 // create a reply 24 $ this->factory->message->create( array(25 'thread_id' => $ t1,24 $message_2 = $this->factory->message->create_and_get( array( 25 'thread_id' => $message_1->thread_id, 26 26 'sender_id' => $u2, 27 27 'recipients' => array( $u1 ), … … 29 29 ) ); 30 30 31 // grab the message ids as individual variables32 list( $m1, $m2 ) = $this->get_message_ids( $t1 );31 $m1 = $message_1->id; 32 $m2 = $message_2->id; 33 33 34 34 // star the second message … … 63 63 64 64 // create the thread 65 $ t1 = $this->factory->message->create( array(65 $message_1 = $this->factory->message->create_and_get( array( 66 66 'sender_id' => $u1, 67 67 'recipients' => array( $u2 ), … … 70 70 71 71 // create a reply 72 $ this->factory->message->create( array(73 'thread_id' => $ t1,72 $message_2 = $this->factory->message->create_and_get( array( 73 'thread_id' => $message_1->thread_id, 74 74 'sender_id' => $u2, 75 75 'recipients' => array( $u1 ), … … 77 77 ) ); 78 78 79 // grab the message ids as individual variables 80 list( $m1, $m2 ) = $this->get_message_ids( $t1 ); 79 $m1 = $message_1->id; 80 $m2 = $message_2->id; 81 $t1 = $message_1->thread_id; 81 82 82 83 // star all messages … … 116 117 117 118 // create three threads 118 $ t1 = $this->factory->message->create( array(119 $message_1 = $this->factory->message->create_and_get( array( 119 120 'sender_id' => $u1, 120 121 'recipients' => array( $u2 ), 121 122 'subject' => 'A', 122 123 ) ); 123 $ t2 = $this->factory->message->create( array(124 $message_2 = $this->factory->message->create_and_get( array( 124 125 'sender_id' => $u1, 125 126 'recipients' => array( $u2 ), 126 127 'subject' => 'B', 127 128 ) ); 128 $ t3 = $this->factory->message->create( array(129 $message_3 = $this->factory->message->create_and_get( array( 129 130 'sender_id' => $u1, 130 131 'recipients' => array( $u2 ), … … 133 134 134 135 // grab the message ids as individual variables 135 list( $m1 ) = $this->get_message_ids( $t1 ); 136 list( $m2 ) = $this->get_message_ids( $t2 ); 137 list( $m3 ) = $this->get_message_ids( $t3 ); 136 $m1 = $message_1->id; 137 $m2 = $message_2->id; 138 $m3 = $message_3->id; 139 140 $t2 = $message_2->thread_id; 138 141 139 142 // star all threads -
trunk/tests/phpunit/testcases/messages/template.php
r9948 r11044 14 14 15 15 // create initial thread 16 $ t1 = $this->factory->message->create( array(16 $message_1 = $this->factory->message->create_and_get( array( 17 17 'sender_id' => $u1, 18 18 'recipients' => array( $u2 ), … … 20 20 21 21 // create some replies to thread 22 $ this->factory->message->create( array(23 'thread_id' => $ t1,22 $message_2 = $this->factory->message->create_and_get( array( 23 'thread_id' => $message_1->thread_id, 24 24 'sender_id' => $u2, 25 25 'recipients' => array( $u1 ), 26 26 ) ); 27 $ this->factory->message->create( array(28 'thread_id' => $ t1,27 $message_3 = $this->factory->message->create_and_get( array( 28 'thread_id' => $message_1->thread_id, 29 29 'sender_id' => $u2, 30 30 'recipients' => array( $u1 ), … … 34 34 35 35 $this->assertEquals( 1, $messages_template->thread_count ); 36 $this->assertSame( array( $ t1), wp_list_pluck( $messages_template->threads, 'thread_id' ) );36 $this->assertSame( array( $message_1->thread_id ), wp_list_pluck( $messages_template->threads, 'thread_id' ) ); 37 37 } 38 38 … … 47 47 48 48 // create initial thread 49 $ t1 = $this->factory->message->create( array(49 $message_1 = $this->factory->message->create_and_get( array( 50 50 'sender_id' => $u1, 51 51 'recipients' => array( $u2 ), … … 53 53 54 54 // create some replies to thread 55 $ this->factory->message->create( array(56 'thread_id' => $ t1,55 $message_2 = $this->factory->message->create_and_get( array( 56 'thread_id' => $message_1->thread_id, 57 57 'sender_id' => $u2, 58 58 'recipients' => array( $u1 ), 59 59 ) ); 60 $ this->factory->message->create( array(61 'thread_id' => $ t1,60 $message_3 = $this->factory->message->create_and_get( array( 61 'thread_id' => $message_1->thread_id, 62 62 'sender_id' => $u2, 63 63 'recipients' => array( $u1 ), … … 67 67 68 68 $this->assertEquals( 1, $messages_template->thread_count ); 69 $this->assertSame( array( $ t1), wp_list_pluck( $messages_template->threads, 'thread_id' ) );69 $this->assertSame( array( $message_1->thread_id ), wp_list_pluck( $messages_template->threads, 'thread_id' ) ); 70 70 } 71 71 … … 79 79 80 80 // create some threads 81 $ t1 = $this->factory->message->create( array(81 $message_1 = $this->factory->message->create_and_get( array( 82 82 'sender_id' => $u1, 83 83 'recipients' => array( $u2 ), 84 84 'subject' => 'This is a knive', 85 85 ) ); 86 $ t2 = $this->factory->message->create( array(86 $message_2 = $this->factory->message->create_and_get( array( 87 87 'sender_id' => $u1, 88 88 'recipients' => array( $u2 ), … … 96 96 ) ); 97 97 98 $t1 = $message_1->thread_id; 99 $t2 = $message_2->thread_id; 100 98 101 // create some replies for thread 1 99 $ this->factory->message->create( array(102 $message_3 = $this->factory->message->create_and_get( array( 100 103 'thread_id' => $t1, 101 104 'sender_id' => $u2, … … 103 106 'content' => "That's a spoon", 104 107 ) ); 105 $ this->factory->message->create( array(108 $message_4 = $this->factory->message->create_and_get( array( 106 109 'thread_id' => $t1, 107 110 'sender_id' => $u1, … … 109 112 'content' => "I see you've played knivey-spooney before.", 110 113 ) ); 111 $ this->factory->message->create( array(114 $message_5 = $this->factory->message->create_and_get( array( 112 115 'thread_id' => $t1, 113 116 'sender_id' => $u2, … … 117 120 118 121 // create some replies for thread 2 119 $ this->factory->message->create( array(122 $message_6 = $this->factory->message->create_and_get( array( 120 123 'thread_id' => $t2, 121 124 'sender_id' => $u2, … … 124 127 ) ); 125 128 126 // grab the message ids as individual variables for thread1127 $ thread = new BP_Messages_Thread( $t1 );128 $m ids = wp_list_pluck( $thread->messages, 'id' );129 list( $m1, $m2, $m3, $m4 ) = $mids;130 131 // grab the message ids as individual variables for thread 2 132 $thread = new BP_Messages_Thread( $t2 );133 $m ids = wp_list_pluck( $thread->messages, 'id' );134 list( $m5, $m6 ) = $mids;129 // belong to $t1 130 $m1 = $message_1->id; 131 $m3 = $message_3->id; 132 $m4 = $message_4->id; 133 $m5 = $message_5->id; 134 135 // belong to $t2 136 $m2 = $message_2->id; 137 $m6 = $message_6->id; 135 138 136 139 // add meta for some of the messages … … 145 148 bp_messages_update_meta( $m3, "starred_by_user_{$u2}", true ); 146 149 147 bp_messages_update_meta( $m 5, "starred_by_user_{$u2}", true );150 bp_messages_update_meta( $m6, "starred_by_user_{$u2}", true ); 148 151 149 152 // now, do the message thread loop query … … 171 174 172 175 // create some threads 173 $ t1 = $this->factory->message->create( array(176 $message_1 = $this->factory->message->create_and_get( array( 174 177 'sender_id' => $u1, 175 178 'recipients' => array( $u2 ), 176 179 'subject' => 'This is a knive', 177 180 ) ); 178 $ t2 = $this->factory->message->create( array(181 $message_2 = $this->factory->message->create_and_get( array( 179 182 'sender_id' => $u1, 180 183 'recipients' => array( $u2 ), … … 188 191 ) ); 189 192 193 $t1 = $message_1->thread_id; 194 $t2 = $message_2->thread_id; 195 190 196 // create some replies for thread 1 191 $ this->factory->message->create( array(197 $message_3 = $this->factory->message->create_and_get( array( 192 198 'thread_id' => $t1, 193 199 'sender_id' => $u2, … … 195 201 'content' => "That's a spoon", 196 202 ) ); 197 $ this->factory->message->create( array(203 $message_4 = $this->factory->message->create_and_get( array( 198 204 'thread_id' => $t1, 199 205 'sender_id' => $u1, … … 201 207 'content' => "I see you've played knivey-spooney before.", 202 208 ) ); 203 $ this->factory->message->create( array(209 $message_5 = $this->factory->message->create_and_get( array( 204 210 'thread_id' => $t1, 205 211 'sender_id' => $u2, … … 209 215 210 216 // create some replies for thread 2 211 $ this->factory->message->create( array(217 $message_6 = $this->factory->message->create_and_get( array( 212 218 'thread_id' => $t2, 213 219 'sender_id' => $u2, … … 216 222 ) ); 217 223 218 // grab the message ids as individual variables for thread1219 $ thread = new BP_Messages_Thread( $t1 );220 $m ids = wp_list_pluck( $thread->messages, 'id' );221 list( $m1, $m2, $m3, $m4 ) = $mids;222 223 // grab the message ids as individual variables for thread 2 224 $thread = new BP_Messages_Thread( $t2 );225 $m ids = wp_list_pluck( $thread->messages, 'id' );226 list( $m5, $m6 ) = $mids;224 // belong to $t1 225 $m1 = $message_1->id; 226 $m3 = $message_3->id; 227 $m4 = $message_4->id; 228 $m5 = $message_5->id; 229 230 // belong to $t2 231 $m2 = $message_2->id; 232 $m6 = $message_6->id; 227 233 228 234 // add meta for some of the messages … … 237 243 bp_messages_update_meta( $m3, "starred_by_user_{$u2}", true ); 238 244 239 bp_messages_update_meta( $m 5, "starred_by_user_{$u2}", true );245 bp_messages_update_meta( $m6, "starred_by_user_{$u2}", true ); 240 246 241 247 // now, do the message thread loop query
Note:
See TracChangeset
for help on using the changeset viewer.
