<!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>[833] trunk: Port AJAX tests to new test runner.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/833">833</a></dd>
<dt>Author</dt> <dd>kurtpayne</dd>
<dt>Date</dt> <dd>2012-07-01 18:30:34 +0000 (Sun, 01 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Port AJAX tests to new test runner. Fixes <a href="http://unit-tests.trac.wordpress.org/ticket/51">#51</a> and <a href="http://unit-tests.trac.wordpress.org/ticket/46">#46</a>. props duck_.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbootstrapphp">trunk/bootstrap.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_compression_testphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_delete_commentsphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_dim_commentsphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_edit_commentphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_get_commentsphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_replyto_commentphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_save_draftphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php</a></li>
<li><a href="#trunkwptestcasetestajaxactionstest_admin_ajax_tag_searchphp">trunk/wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php</a></li>
<li><a href="#trunkwptestlibexceptionsphp">trunk/wp-testlib/exceptions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwptestlibtestcaseajaxphp">trunk/wp-testlib/testcase-ajax.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwptestcasetest_admin_includes_ajax_actionsphp">trunk/wp-testcase/test_admin_includes_ajax_actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/bootstrap.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bootstrap.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/bootstrap.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -53,5 +53,6 @@
</span><span class="cx">
</span><span class="cx"> require dirname( __FILE__ ) . '/wp-testlib/testcase.php';
</span><span class="cx"> require dirname( __FILE__ ) . '/wp-testlib/testcase-xmlrpc.php';
</span><ins>+require dirname( __FILE__ ) . '/wp-testlib/testcase-ajax.php';
</ins><span class="cx"> require dirname( __FILE__ ) . '/wp-testlib/exceptions.php';
</span><span class="cx"> require dirname( __FILE__ ) . '/wp-testlib/utils.php';
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_compression_testphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,14 +13,12 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCompressionTest extends WPAjaxTestCase {
</del><ins>+class TestAjaxCompressionTest extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Test as a logged out user
</span><span class="cx"> */
</span><span class="cx"> public function test_logged_out() {
</span><del>-
- // Become an administrator
</del><span class="cx"> $this->logout();
</span><span class="cx">
</span><span class="cx"> // Set up a default request
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_delete_commentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCommentsDelete extends WPAjaxTestCase {
</del><ins>+class TestAjaxCommentsDelete extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of comments
</span><span class="lines">@@ -30,18 +25,10 @@
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- parent::setUp();
- $this->_comments = get_comments(array(
- 'status' => 'all',
- 'search' => '',
- 'user_id' => '',
- 'offset' => 1,
- 'number' => 20,
- 'post_id' => 0,
- 'type' => '',
- 'orderby' => '',
- 'order' => ''
- ));
</del><ins>+ parent::setUp();
+ $post_id = $this->factory->post->create();
+ $this->_comments = $this->factory->comment->create_post_comments( $post_id, 15 );
+ $this->_comments = array_map( 'get_comment', $this->_comments );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_dim_commentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCommentsDim extends WPAjaxTestCase {
</del><ins>+class TestAjaxCommentsDim extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of comments
</span><span class="lines">@@ -30,18 +25,10 @@
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- parent::setUp();
- $this->_comments = get_comments(array(
- 'status' => 'all',
- 'search' => '',
- 'user_id' => '',
- 'offset' => 1,
- 'number' => 20,
- 'post_id' => 0,
- 'type' => '',
- 'orderby' => '',
- 'order' => ''
- ));
</del><ins>+ parent::setUp();
+ $post_id = $this->factory->post->create();
+ $this->_comments = $this->factory->comment->create_post_comments( $post_id, 15 );
+ $this->_comments = array_map( 'get_comment', $this->_comments );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_edit_commentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCommentsEdit extends WPAjaxTestCase {
</del><ins>+class TestAjaxCommentsEdit extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * A post with at least one comment
</span><span class="lines">@@ -30,27 +25,10 @@
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- global $wpdb;
</del><span class="cx"> parent::setUp();
</span><del>- $posts = $wpdb->get_results( $wpdb->prepare("
- SELECT
- COUNT(c.comment_ID) AS comments,
- p.ID AS post_ID
- FROM
- $wpdb->posts p
- LEFT JOIN $wpdb->comments c ON c.comment_post_ID = p.ID
- WHERE
- p.post_status = 'publish'
- AND p.post_type = 'post'
- GROUP BY
- p.ID
- ") );
- foreach ( (array) $posts as $tmp ) {
- if ( null === $this->_comment_post && $tmp->comments > 0 ) {
- $this->_comment_post = get_post( $tmp->post_ID );
- break;
- }
- }
</del><ins>+ $post_id = $this->factory->post->create();
+ $this->factory->comment->create_post_comments( $post_id, 5 );
+ $this->_comment_post = get_post( $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_get_commentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCommentsGet extends WPAjaxTestCase {
</del><ins>+class TestAjaxCommentsGet extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * A post with at least one comment
</span><span class="lines">@@ -36,32 +31,13 @@
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- global $wpdb;
</del><span class="cx"> parent::setUp();
</span><del>- $posts = $wpdb->get_results( $wpdb->prepare("
- SELECT
- COUNT(c.comment_ID) AS comments,
- p.ID AS post_ID
- FROM
- $wpdb->posts p
- LEFT JOIN $wpdb->comments c ON c.comment_post_ID = p.ID
- WHERE
- p.post_status = 'publish'
- AND p.post_type = 'post'
- GROUP BY
- p.ID
- ") );
- foreach ( (array) $posts as $tmp ) {
- if ( null === $this->_comment_post && $tmp->comments > 0 ) {
- $this->_comment_post = get_post( $tmp->post_ID );
- }
- if ( null === $this->_no_comment_post && $tmp->comments == 0 ) {
- $this->_no_comment_post = get_post( $tmp->post_ID );
- }
- if ( null !== $this->_comment_post && null !== $this->_no_comment_post ) {
- break;
- }
- }
</del><ins>+ $post_id = $this->factory->post->create();
+ $this->factory->comment->create_post_comments( $post_id, 5 );
+ $this->_comment_post = get_post( $post_id );
+
+ $post_id = $this->factory->post->create();
+ $this->_no_comment_post = get_post( $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_replyto_commentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxCommentsReply extends WPAjaxTestCase {
</del><ins>+class TestAjaxCommentsReply extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * A post with at least one comment
</span><span class="lines">@@ -36,33 +31,13 @@
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- global $wpdb;
</del><span class="cx"> parent::setUp();
</span><del>- $posts = $wpdb->get_results( $wpdb->prepare("
- SELECT
- COUNT(c.comment_ID) AS comments,
- p.ID AS post_ID,
- p.post_status
- FROM
- $wpdb->posts p
- LEFT JOIN $wpdb->comments c ON c.comment_post_ID = p.ID
- WHERE
- p.post_status IN('draft', 'publish')
- AND p.post_type = 'post'
- GROUP BY
- p.ID
- ") );
- foreach ( (array) $posts as $tmp ) {
- if ( null === $this->_comment_post && $tmp->comments > 0 && 'publish' == $tmp->post_status ) {
- $this->_comment_post = get_post( $tmp->post_ID );
- }
- if ( null === $this->_draft_post && 'draft' == $tmp->post_status ) {
- $this->_draft_post = get_post( $tmp->post_ID );
- }
- if ( null !== $this->_draft_post && null !== $this->_comment_post ) {
- break;
- }
- }
</del><ins>+ $post_id = $this->factory->post->create();
+ $this->factory->comment->create_post_comments( $post_id, 5 );
+ $this->_comment_post = get_post( $post_id );
+
+ $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
+ $this->_draft_post = get_post( $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_save_draftphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,7 +13,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxSaveDraft extends WPAjaxTestCase {
</del><ins>+class TestAjaxSaveDraft extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Post
</span><span class="lines">@@ -32,10 +27,8 @@
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- $tmp = get_posts( array(
- 'post_status' => 'draft'
- ) );
- $this->_post = $tmp[0];
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
+ $this->_post = get_post( $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwptestcasetestajaxactionstest_admin_ajax_tag_searchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,11 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get WPAjaxTestCase class
- */
-require_once( DIR_TESTCASE . '/test_admin_includes_ajax_actions.php' );
-
-/**
</del><span class="cx"> * Admin ajax functions to be tested
</span><span class="cx"> */
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span><span class="lines">@@ -18,9 +13,28 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @group Ajax
</span><span class="cx"> */
</span><del>-class TestAjaxTagSearch extends WPAjaxTestCase {
</del><ins>+class TestAjaxTagSearch extends WP_Ajax_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * List of terms to insert on setup
+ * @var array
+ */
+ private $_terms = array(
+ 'chattels', 'depo', 'energumen', 'figuriste', 'habergeon', 'impropriation'
+ );
+
+ /**
+ * Setup
+ * @todo use a term factory
+ */
+ public function setUp() {
+ parent::setUp();
+
+ foreach ( $this->_terms as $term )
+ wp_insert_term( $term, 'post_tag' );
+ }
+
+ /**
</ins><span class="cx"> * Test as an admin
</span><span class="cx"> */
</span><span class="cx"> public function test_post_tag() {
</span></span></pre></div>
<a id="trunkwptestcasetest_admin_includes_ajax_actionsphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-testcase/test_admin_includes_ajax_actions.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test_admin_includes_ajax_actions.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testcase/test_admin_includes_ajax_actions.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -1,209 +0,0 @@
</span><del>-<?php
-/**
- * Ajax test cases
- *
- * @package WordPress
- * @subpackage Unit Tests
- * @since 3.4.0
- */
-
-/**
- * Sample blog data
- */
-include_once(DIR_TESTDATA . '/sample_blogs.php');
-
-/**
- * Exception for cases of wp_die()
- * This means there was an error (no output, and a call to wp_die)
- *
- * @package WordPress
- * @subpackage Unit Tests
- * @since 3.4.0
- */
-class WPAjaxDieStopException extends Exception {}
-
-/**
- * Exception for cases of wp_die()
- * This means execution of the ajax function should be halted, but the unit
- * test can continue. The function finished normally and there was not an
- * error (output happened, but wp_die was called to end execution) This is
- * used with WP_Ajax_Response::send
- *
- * @package WordPress
- * @subpackage Unit Tests
- * @since 3.4.0
- */
-class WPAjaxDieContinueException extends Exception {}
-
-/**
- * Ajax test case class
- *
- * @package WordPress
- * @subpackage Unit Tests
- * @since 3.4.0
- */
-class WPAjaxTestCase extends _WPDataset2 {
-
- /**
- * Last AJAX response. This is set via echo -or- wp_die.
- * @var type
- */
- protected $_last_response = '';
-
- /**
- * List of ajax actions called via POST
- * @var type
- */
- protected $_core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache' );
-
- /**
- * Saved error reporting level
- * @var int
- */
- protected $_error_level = 0;
-
- /**
- * List of ajax actions called via GET
- * @var type
- */
- protected $_core_actions_post = array(
- 'oembed_cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
- 'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
- 'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
- 'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
- 'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
- 'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
- 'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
- 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
- 'wp-remove-post-lock', 'dismiss-wp-pointer', 'nopriv_autosave'
- );
-
- /**
- * Constructor.
- * Register all of the ajax actions
- */
- public function __construct() {
- parent::__construct();
- foreach ( array_merge( $this->_core_actions_get, $this->_core_actions_post ) as $action )
- if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) )
- add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );
- }
-
- /**
- * Set up the test fixture.
- * Override wp_die(), pretend to be ajax, and suppres E_WARNINGs
- */
- public function setUp() {
- parent::setUp();
- add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
- if ( !defined( 'DOING_AJAX' ) )
- define( 'DOING_AJAX', true );
-
- // Clear logout cookies
- add_action( 'clear_auth_cookie', array( $this, 'logout' ) );
-
- // Suppress warnings from "Cannot modify header information - headers already sent by"
- $this->_error_level = error_reporting();
- error_reporting( $this->_error_level & ~E_WARNING );
- }
-
- /**
- * Tear down the test fixture.
- * Reset $_POST, remove the wp_die() override, restore error reporting
- */
- public function tearDown() {
- parent::tearDown();
- $_POST = array();
- $_GET = array();
- unset( $GLOBALS['post'] );
- unset( $GLOBALS['comment'] );
- remove_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
- remove_action( 'clear_auth_cookie', array( $this, 'logout' ) );
- error_reporting( $this->_error_level );
- }
-
- /**
- * Clear login cookies, unset the current user
- */
- public function logout() {
- unset( $GLOBALS['current_user'] );
- $cookies = array(AUTH_COOKIE, SECURE_AUTH_COOKIE, LOGGED_IN_COOKIE, USER_COOKIE, PASS_COOKIE);
- foreach ( $cookies as $c )
- unset( $_COOKIE[$c] );
- }
-
- /**
- * Return our callback handler
- * @return callback
- */
- public function getDieHandler() {
- return array( $this, 'dieHandler' );
- }
-
- /**
- * Handler for wp_die()
- * Save the output for analysis, stop execution by throwing an exception.
- * Error conditions (no output, just die) will throw <code>WPAjaxDieStopException( $message )</code>
- * You can test for this with:
- * <code>
- * $this->setExpectedException( 'WPAjaxDieStopException', 'something contained in $message' );
- * </code>
- * Normal program termination (wp_die called at then end of output) will throw <code>WPAjaxDieContinueException( $message )</code>
- * You can test for this with:
- * <code>
- * $this->setExpectedException( 'WPAjaxDieContinueException', 'something contained in $message' );
- * </code>
- * @param string $message
- */
- public function dieHandler( $message ) {
- $this->_last_response .= ob_get_clean();
- ob_end_clean();
- if ( '' === $this->_last_response ) {
- if ( is_scalar( $message) ) {
- throw new WPAjaxDieStopException( (string) $message );
- } else {
- throw new WPAjaxDieStopException( '0' );
- }
- } else {
- throw new WPAjaxDieContinueException( $message );
- }
- }
-
- /**
- * Switch between user roles
- * E.g. administrator, editor, author, contributor, subscriber
- * @param string $role
- */
- protected function _setRole( $role ) {
- $post = $_POST;
- $user_id = $this->_make_user( $role );
- wp_set_current_user( $user_id );
- $_POST = array_merge($_POST, $post);
- }
-
- /**
- * Mimic the ajax handling of admin-ajax.php
- * Capture the output via output buffering, and if there is any, store
- * it in $this->_last_message.
- * @param string $action
- */
- protected function _handleAjax($action) {
-
- // Start output buffering
- ob_start();
-
- // Build the request
- $_POST['action'] = $action;
- $_GET['action'] = $action;
- $_REQUEST = array_merge( $_POST, $_GET );
-
- // Call the hooks
- do_action( 'admin_init' );
- do_action( 'wp_ajax_' . $_REQUEST['action'], null );
-
- // Save the output
- $buffer = ob_get_clean();
- if ( !empty( $buffer ) )
- $this->_last_response = $buffer;
- }
-}
</del></span></pre></div>
<a id="trunkwptestlibexceptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testlib/exceptions.php (832 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testlib/exceptions.php 2012-07-01 14:48:28 UTC (rev 832)
+++ trunk/wp-testlib/exceptions.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -2,4 +2,27 @@
</span><span class="cx">
</span><span class="cx"> class WP_Tests_Exception extends PHPUnit_Framework_Exception {
</span><span class="cx">
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
+
+/**
+ * Exception for cases of wp_die()
+ * This means there was an error (no output, and a call to wp_die)
+ *
+ * @package WordPress
+ * @subpackage Unit Tests
+ * @since 3.4.0
+ */
+class WPAjaxDieStopException extends Exception {}
+
+/**
+ * Exception for cases of wp_die()
+ * This means execution of the ajax function should be halted, but the unit
+ * test can continue. The function finished normally and there was not an
+ * error (output happened, but wp_die was called to end execution) This is
+ * used with WP_Ajax_Response::send
+ *
+ * @package WordPress
+ * @subpackage Unit Tests
+ * @since 3.4.0
+ */
+class WPAjaxDieContinueException extends Exception {}
</ins></span></pre></div>
<a id="trunkwptestlibtestcaseajaxphpfromrev823trunkwptestcasetest_admin_includes_ajax_actionsphp"></a>
<div class="copfile"><h4>Copied: trunk/wp-testlib/testcase-ajax.php (from rev 823, trunk/wp-testcase/test_admin_includes_ajax_actions.php) (0 => 833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testlib/testcase-ajax.php (rev 0)
+++ trunk/wp-testlib/testcase-ajax.php 2012-07-01 18:30:34 UTC (rev 833)
</span><span class="lines">@@ -0,0 +1,186 @@
</span><ins>+<?php
+/**
+ * Ajax test cases
+ *
+ * @package WordPress
+ * @subpackage Unit Tests
+ * @since 3.4.0
+ */
+
+/**
+ * Ajax test case class
+ *
+ * @package WordPress
+ * @subpackage Unit Tests
+ * @since 3.4.0
+ */
+abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase {
+
+ /**
+ * Last AJAX response. This is set via echo -or- wp_die.
+ * @var type
+ */
+ protected $_last_response = '';
+
+ /**
+ * List of ajax actions called via POST
+ * @var type
+ */
+ protected $_core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache' );
+
+ /**
+ * Saved error reporting level
+ * @var int
+ */
+ protected $_error_level = 0;
+
+ /**
+ * List of ajax actions called via GET
+ * @var type
+ */
+ protected $_core_actions_post = array(
+ 'oembed_cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
+ 'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
+ 'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
+ 'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
+ 'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
+ 'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
+ 'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
+ 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
+ 'wp-remove-post-lock', 'dismiss-wp-pointer', 'nopriv_autosave'
+ );
+
+ /**
+ * Constructor.
+ * Register all of the ajax actions
+ */
+ public function __construct() {
+ parent::__construct();
+ foreach ( array_merge( $this->_core_actions_get, $this->_core_actions_post ) as $action )
+ if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) )
+ add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );
+ }
+
+ /**
+ * Set up the test fixture.
+ * Override wp_die(), pretend to be ajax, and suppres E_WARNINGs
+ */
+ public function setUp() {
+ parent::setUp();
+ add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
+ if ( !defined( 'DOING_AJAX' ) )
+ define( 'DOING_AJAX', true );
+
+ // Clear logout cookies
+ add_action( 'clear_auth_cookie', array( $this, 'logout' ) );
+
+ // Suppress warnings from "Cannot modify header information - headers already sent by"
+ $this->_error_level = error_reporting();
+ error_reporting( $this->_error_level & ~E_WARNING );
+
+ // Make some posts
+ $this->factory->post->create_many( 5 );
+ $this->factory->comment->create( 5 );
+ }
+
+ /**
+ * Tear down the test fixture.
+ * Reset $_POST, remove the wp_die() override, restore error reporting
+ */
+ public function tearDown() {
+ parent::tearDown();
+ $_POST = array();
+ $_GET = array();
+ unset( $GLOBALS['post'] );
+ unset( $GLOBALS['comment'] );
+ remove_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
+ remove_action( 'clear_auth_cookie', array( $this, 'logout' ) );
+ error_reporting( $this->_error_level );
+ }
+
+ /**
+ * Clear login cookies, unset the current user
+ */
+ public function logout() {
+ unset( $GLOBALS['current_user'] );
+ $cookies = array(AUTH_COOKIE, SECURE_AUTH_COOKIE, LOGGED_IN_COOKIE, USER_COOKIE, PASS_COOKIE);
+ foreach ( $cookies as $c )
+ unset( $_COOKIE[$c] );
+ }
+
+ /**
+ * Return our callback handler
+ * @return callback
+ */
+ public function getDieHandler() {
+ return array( $this, 'dieHandler' );
+ }
+
+ /**
+ * Handler for wp_die()
+ * Save the output for analysis, stop execution by throwing an exception.
+ * Error conditions (no output, just die) will throw <code>WPAjaxDieStopException( $message )</code>
+ * You can test for this with:
+ * <code>
+ * $this->setExpectedException( 'WPAjaxDieStopException', 'something contained in $message' );
+ * </code>
+ * Normal program termination (wp_die called at then end of output) will throw <code>WPAjaxDieContinueException( $message )</code>
+ * You can test for this with:
+ * <code>
+ * $this->setExpectedException( 'WPAjaxDieContinueException', 'something contained in $message' );
+ * </code>
+ * @param string $message
+ */
+ public function dieHandler( $message ) {
+ $this->_last_response .= ob_get_clean();
+ ob_end_clean();
+ if ( '' === $this->_last_response ) {
+ if ( is_scalar( $message) ) {
+ throw new WPAjaxDieStopException( (string) $message );
+ } else {
+ throw new WPAjaxDieStopException( '0' );
+ }
+ } else {
+ throw new WPAjaxDieContinueException( $message );
+ }
+ }
+
+ /**
+ * Switch between user roles
+ * E.g. administrator, editor, author, contributor, subscriber
+ * @param string $role
+ */
+ protected function _setRole( $role ) {
+ $post = $_POST;
+ $user_id = $this->factory->user->create( array( 'role' => $role ) );
+ wp_set_current_user( $user_id );
+ $_POST = array_merge($_POST, $post);
+ }
+
+ /**
+ * Mimic the ajax handling of admin-ajax.php
+ * Capture the output via output buffering, and if there is any, store
+ * it in $this->_last_message.
+ * @param string $action
+ */
+ protected function _handleAjax($action) {
+
+ // Start output buffering
+ ini_set( 'implicit_flush', false );
+ ob_start();
+
+ // Build the request
+ $_POST['action'] = $action;
+ $_GET['action'] = $action;
+ $_REQUEST = array_merge( $_POST, $_GET );
+
+ // Call the hooks
+ do_action( 'admin_init' );
+ do_action( 'wp_ajax_' . $_REQUEST['action'], null );
+
+ // Save the output
+ $buffer = ob_get_clean();
+ if ( !empty( $buffer ) )
+ $this->_last_response = $buffer;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>