<!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>[548] Add a base class for XMLRPC test cases.</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/548">548</a></dd>
<dt>Author</dt> <dd>maxcutler</dd>
<dt>Date</dt> <dd>2012-02-22 21:44:03 +0000 (Wed, 22 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a base class for XMLRPC test cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetestxmlrpcapitest_wp_deleteTermphp">wp-testcase/test-xmlrpc-api/test_wp_deleteTerm.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_editPostphp">wp-testcase/test-xmlrpc-api/test_wp_editPost.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_editTermphp">wp-testcase/test-xmlrpc-api/test_wp_editTerm.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_getOptionsphp">wp-testcase/test-xmlrpc-api/test_wp_getOptions.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_getTaxonomiesphp">wp-testcase/test-xmlrpc-api/test_wp_getTaxonomies.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_getTaxonomyphp">wp-testcase/test-xmlrpc-api/test_wp_getTaxonomy.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_getTermphp">wp-testcase/test-xmlrpc-api/test_wp_getTerm.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_getTermsphp">wp-testcase/test-xmlrpc-api/test_wp_getTerms.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_newPostphp">wp-testcase/test-xmlrpc-api/test_wp_newPost.php</a></li>
<li><a href="#wptestcasetestxmlrpcapitest_wp_newTermphp">wp-testcase/test-xmlrpc-api/test_wp_newTerm.php</a></li>
<li><a href="#wptestlibbasephp">wp-testlib/base.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetestxmlrpcapitest_wp_deleteTermphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_deleteTerm.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_deleteTerm.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_deleteTerm.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,48 +1,20 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_deleteTerm extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_deleteTerm extends WPXMLRPCServerTestCase {
</ins><span class="cx"> var $term;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
</del><span class="cx">
</span><del>- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
</del><span class="cx"> $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
</span><del>-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><del>- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
</del><span class="cx">
</span><span class="cx"> wp_delete_term( $this->term['term_id'], 'category' );
</span><del>-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_editPostphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_editPost.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_editPost.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_editPost.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,44 +1,7 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_editPost extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_editPost extends WPXMLRPCServerTestCase {
</ins><span class="cx">
</span><del>- function setUp() {
-
- parent::setUp();
- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
- }
-
- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- foreach ($this->user_ids as $id)
- wp_delete_user($id);
-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_editTermphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_editTerm.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_editTerm.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_editTerm.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,56 +1,26 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_editTerm extends WPTestCase {
- var $user_ids = array();
-
</del><ins>+class TestXMLRPCServer_wp_editTerm extends WPXMLRPCServerTestCase {
</ins><span class="cx"> var $parent_term;
</span><span class="cx"> var $child_term;
</span><span class="cx"> var $post_tag;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
</del><span class="cx">
</span><del>- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
</del><span class="cx"> $this->parent_term = wp_insert_term( 'parent' . rand_str() , 'category' );
</span><span class="cx"> $this->child_term = wp_insert_term( 'child' . rand_str() , 'category' );
</span><span class="cx"> $this->post_tag = wp_insert_term( 'test' . rand_str() , 'post_tag' );
</span><del>-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><del>- // delete any users that were created during tests
- foreach ($this->user_ids as $id)
- wp_delete_user($id);
</del><span class="cx">
</span><span class="cx"> wp_delete_term( $this->parent_term['term_id'], 'category' );
</span><span class="cx"> wp_delete_term( $this->child_term['term_id'], 'category' );
</span><span class="cx"> wp_delete_term( $this->post_tag['term_id'], 'post_tag' );
</span><del>-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_getOptionsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_getOptions.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_getOptions.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_getOptions.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,56 +1,21 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_getOptions extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_getOptions extends WPXMLRPCServerTestCase {
</ins><span class="cx">
</span><del>- function setUp() {
-
- parent::setUp();
- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- foreach ($this->user_ids as $id)
- wp_delete_user($id);
-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><del>- $myxmlrpcserver = new wp_xmlrpc_server();
- $result = $myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
</del><ins>+ $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
</ins><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx"> $this->assertEquals( 403, $result->code );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_valid_username_password() {
</span><del>- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $myxmlrpcserver = new wp_xmlrpc_server();
- $result = $myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );
</del><ins>+ $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );
</ins><span class="cx"> $this->assertInternalType( 'array', $result );
</span><span class="cx"> $this->assertEquals( 'WordPress', $result['software_name']['value'] );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_option_values() {
</span><del>- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $myxmlrpcserver = new wp_xmlrpc_server();
- $result = $myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber', 'default_comment_status' ) );
</del><ins>+ $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber', 'default_comment_status' ) );
</ins><span class="cx"> $this->assertInternalType( 'array', $result );
</span><span class="cx"> $this->assertEquals( get_option( 'default_comment_status' ), $result['default_comment_status']['value'] );
</span><span class="cx"> }
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_getTaxonomiesphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_getTaxonomies.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_getTaxonomies.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_getTaxonomies.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,43 +1,7 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_getTaxonomies extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_getTaxonomies extends WPXMLRPCServerTestCase {
</ins><span class="cx">
</span><del>- function setUp() {
- parent::setUp();
- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
- }
-
- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getTaxonomies( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_getTaxonomyphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_getTaxonomy.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_getTaxonomy.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_getTaxonomy.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,43 +1,7 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_getTaxonomy extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_getTaxonomy extends WPXMLRPCServerTestCase {
</ins><span class="cx">
</span><del>- function setUp() {
- parent::setUp();
- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
- }
-
- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="lines">@@ -65,7 +29,6 @@
</span><span class="cx"> $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> function test_taxonomy_validated() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'editor', 'editor', 'category' ) );
</span><span class="cx"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_getTermphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_getTerm.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_getTerm.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_getTerm.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,48 +1,20 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_getTerm extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_getTerm extends WPXMLRPCServerTestCase {
</ins><span class="cx"> var $term;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
</del><span class="cx">
</span><del>- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
</del><span class="cx"> $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
</span><del>-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><del>- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
</del><span class="cx">
</span><span class="cx"> wp_delete_term( $this->term['term_id'], 'category' );
</span><del>-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_getTermsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_getTerms.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_getTerms.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_getTerms.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,48 +1,20 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_getTerms extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_getTerms extends WPXMLRPCServerTestCase {
</ins><span class="cx"> var $term;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
</del><span class="cx">
</span><del>- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
</del><span class="cx"> $this->term = wp_insert_term( 'term'. rand_str() , 'category' );
</span><del>-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><del>- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
</del><span class="cx">
</span><span class="cx"> wp_delete_term( $this->term['term_id'], 'category' );
</span><del>-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_newPostphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_newPost.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_newPost.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_newPost.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,44 +1,7 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_newPost extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_newPost extends WPXMLRPCServerTestCase {
</ins><span class="cx">
</span><del>- function setUp() {
-
- parent::setUp();
- // keep track of users we create
- $this->user_ids = array();
- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
- }
-
- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- foreach ($this->user_ids as $id)
- wp_delete_user($id);
-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
- }
-
- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestcasetestxmlrpcapitest_wp_newTermphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-xmlrpc-api/test_wp_newTerm.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-xmlrpc-api/test_wp_newTerm.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testcase/test-xmlrpc-api/test_wp_newTerm.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -1,52 +1,23 @@
</span><span class="cx"> <?php
</span><del>-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
</del><span class="cx">
</span><del>-class TestXMLRPCServer_wp_newTerm extends WPTestCase {
- var $user_ids = array();
</del><ins>+class TestXMLRPCServer_wp_newTerm extends WPXMLRPCServerTestCase {
</ins><span class="cx"> var $term_ids = array();
</span><span class="cx"> var $parent_term;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
</del><span class="cx"> $this->term_ids = array();
</span><del>- $this->_flush_roles();
-
- $this->orig_users = get_users_of_blog();
- add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
-
- $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
- $this->_make_user( 'contributor', 'contributor', 'contributor' );
- $this->_make_user( 'author', 'author', 'author' );
- $this->_make_user( 'editor', 'editor', 'editor' );
-
</del><span class="cx"> $this->parent_term = wp_insert_term( 'parent' . rand_str(), 'category' );
</span><del>-
- $this->myxmlrpcserver = new wp_xmlrpc_server();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><del>- // delete any users that were created during tests
- foreach ( $this->user_ids as $id )
- wp_delete_user($id);
</del><span class="cx">
</span><span class="cx"> wp_delete_term( $this->parent_term, 'category' );
</span><span class="cx"> foreach ( $this->term_ids as $term_id )
</span><span class="cx"> wp_delete_term( $term_id, 'category' );
</span><del>-
- remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- function _flush_roles() {
- // we want to make sure we're testing against the db, not just in-memory data
- // this will flush everything and reload it from the db
- unset( $GLOBALS['wp_user_roles'] );
- }
-
</del><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'username', 'password' ) );
</span><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="wptestlibbasephp"></a>
<div class="modfile"><h4>Modified: wp-testlib/base.php (547 => 548)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testlib/base.php 2012-02-17 23:35:26 UTC (rev 547)
+++ wp-testlib/base.php 2012-02-22 21:44:03 UTC (rev 548)
</span><span class="lines">@@ -581,4 +581,46 @@
</span><span class="cx"> */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Base class for XML-RPC tests.
+ *
+ * Initializes XML-RPC server instance and creates set of users.
+ */
+abstract class WPXMLRPCServerTestCase extends WPTestCase {
+ var $myxmlrpcserver;
+ var $user_ids = array();
+
+ function setUp() {
+
+ parent::setUp();
+ // keep track of users we create
+ $this->user_ids = array();
+ $this->_flush_roles();
+
+ add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+
+ $this->_make_user( 'subscriber', 'subscriber', 'subscriber' );
+ $this->_make_user( 'contributor', 'contributor', 'contributor' );
+ $this->_make_user( 'author', 'author', 'author' );
+ $this->_make_user( 'editor', 'editor', 'editor' );
+
+ $this->myxmlrpcserver = new wp_xmlrpc_server();
+ }
+
+ function tearDown() {
+ parent::tearDown();
+ // delete any users that were created during tests
+ foreach ($this->user_ids as $id)
+ wp_delete_user($id);
+
+ remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+ }
+
+ function _flush_roles() {
+ // we want to make sure we're testing against the db, not just in-memory data
+ // this will flush everything and reload it from the db
+ unset( $GLOBALS['wp_user_roles'] );
+ }
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>