<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11042] trunk/tests/phpunit: Tests: Fix message factory create/get methods.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11042">11042</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11042","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-30 15:44:33 +0000 (Tue, 30 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Fix message factory create/get methods.
Previously, message creation was failing because no 'sender_id' or
'recipients' were set. We now create senders and recipients when none
are passed to the `create()` method.
This changeset also fixes the return value of `create_object()`, so that
`create_and_get()` works for messages.
Props jdgrimes.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7234">#7234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesfactoryphp">trunk/tests/phpunit/includes/factory.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/testcases/testsuite/</li>
<li><a href="#trunktestsphpunittestcasestestsuitefactoryphp">trunk/tests/phpunit/testcases/testsuite/factory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory.php 2016-08-30 15:17:16 UTC (rev 11041)
+++ trunk/tests/phpunit/includes/factory.php 2016-08-30 15:44:33 UTC (rev 11042)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_id' => get_current_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'thread_id' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'recipients' => array(),
</del><span class="cx" style="display: block; padding: 0 10px"> 'subject' => new WP_UnitTest_Generator_Sequence( 'Message subject %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => new WP_UnitTest_Generator_Sequence( 'Message content %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_sent' => bp_core_current_time(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,16 +164,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function create_object( $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message_id = messages_new_message( $args );
- return $message_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args['sender_id'] ) ) {
+ $args['sender_id'] = $this->factory->user->create();
+ }
+
+ if ( empty( $args['recipients'] ) ) {
+ $recipient = $this->factory->user->create_and_get();
+ $args['recipients'] = array( $recipient->user_nicename );
+ }
+
+ $thread_id = messages_new_message( $args );
+ $thread = new BP_Messages_Thread( $thread_id );
+ return end( $thread->messages )->id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function update_object( $group_id, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function update_object( $message_id, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // todo
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $group_id ) {
- // todo
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function get_object_by_id( $message_id ) {
+ return new BP_Messages_Message( $message_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasestestsuitefactoryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/testsuite/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/testsuite/factory.php (rev 0)
+++ trunk/tests/phpunit/testcases/testsuite/factory.php 2016-08-30 15:44:33 UTC (rev 11042)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,25 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group testsuite
+ */
+class BPTests_Testsuite_Factory extends BP_UnitTestCase {
+ /**
+ * @ticket BP7234
+ */
+ public function test_message_create_and_get_should_return_message_object() {
+ $m = $this->factory->message->create_and_get();
+
+ $this->assertTrue( $m instanceof BP_Messages_Message );
+ }
+
+ /**
+ * @ticket BP7234
+ */
+ public function test_message_should_create_default_sender_and_recipient() {
+ $m = $this->factory->message->create_and_get();
+
+ $this->assertNotEmpty( $m->sender_id );
+ $this->assertNotEmpty( $m->get_recipients() );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>