Skip to content

Commit

Permalink
Coding Standards: Give the $id variable in slashed data tests a mor…
Browse files Browse the repository at this point in the history 
…e descriptive name.

See #50767, #51344.

git-svn-id: https://develop.svn.wordpress.org/trunk@49004 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
@SergeyBiryukov
SergeyBiryukov committed Sep 19, 2020
1 parent ffc1293 commit 4018e92
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 147 deletions.
8 changes: 4 additions & 4 deletions tests/phpunit/tests/attachment/slashes.php
View file
Expand Up @@ -32,7 +32,7 @@ function setUp() {
* Tests the model function that expects slashed data.
*/
function test_wp_insert_attachment() {
$id = wp_insert_attachment(
$post_id = wp_insert_attachment(
array(
'post_status' => 'publish',
'post_title' => $this->slash_1,
Expand All @@ -41,13 +41,13 @@ function test_wp_insert_attachment() {
'post_type' => 'post',
)
);
$post = get_post( $id );
$post = get_post( $post_id );

$this->assertSame( wp_unslash( $this->slash_1 ), $post->post_title );
$this->assertSame( wp_unslash( $this->slash_3 ), $post->post_content_filtered );
$this->assertSame( wp_unslash( $this->slash_5 ), $post->post_excerpt );

$id = wp_insert_attachment(
$post_id = wp_insert_attachment(
array(
'post_status' => 'publish',
'post_title' => $this->slash_2,
Expand All @@ -56,7 +56,7 @@ function test_wp_insert_attachment() {
'post_type' => 'post',
)
);
$post = get_post( $id );
$post = get_post( $post_id );

$this->assertSame( wp_unslash( $this->slash_2 ), $post->post_title );
$this->assertSame( wp_unslash( $this->slash_4 ), $post->post_content_filtered );
Expand Down
12 changes: 6 additions & 6 deletions tests/phpunit/tests/comment/slashes.php
View file
Expand Up @@ -37,32 +37,32 @@ function test_wp_new_comment() {

// Not testing comment_author_email or comment_author_url
// as slashes are not permitted in that data.
$data = array(
$data = array(
'comment_post_ID' => $post_id,
'comment_author' => $this->slash_1,
'comment_author_url' => '',
'comment_author_email' => '',
'comment_type' => '',
'comment_content' => $this->slash_7,
);
$id = wp_new_comment( $data );
$comment_id = wp_new_comment( $data );

$comment = get_comment( $id );
$comment = get_comment( $comment_id );

$this->assertSame( wp_unslash( $this->slash_1 ), $comment->comment_author );
$this->assertSame( wp_unslash( $this->slash_7 ), $comment->comment_content );

$data = array(
$data = array(
'comment_post_ID' => $post_id,
'comment_author' => $this->slash_2,
'comment_author_url' => '',
'comment_author_email' => '',
'comment_type' => '',
'comment_content' => $this->slash_4,
);
$id = wp_new_comment( $data );
$comment_id = wp_new_comment( $data );

$comment = get_comment( $id );
$comment = get_comment( $comment_id );

$this->assertSame( wp_unslash( $this->slash_2 ), $comment->comment_author );
$this->assertSame( wp_unslash( $this->slash_4 ), $comment->comment_content );
Expand Down
187 changes: 95 additions & 92 deletions tests/phpunit/tests/meta/slashes.php
View file
Expand Up @@ -34,20 +34,21 @@ function setUp() {
* Tests the controller function that expects slashed data.
*/
function test_edit_post() {
$id = self::factory()->post->create();
$post_id = self::factory()->post->create();

if ( function_exists( 'wp_add_post_meta' ) ) {
$meta_1 = wp_add_post_meta( $id, 'slash_test_1', 'foo' );
$meta_2 = wp_add_post_meta( $id, 'slash_test_2', 'foo' );
$meta_3 = wp_add_post_meta( $id, 'slash_test_3', 'foo' );
$meta_1 = wp_add_post_meta( $post_id, 'slash_test_1', 'foo' );
$meta_2 = wp_add_post_meta( $post_id, 'slash_test_2', 'foo' );
$meta_3 = wp_add_post_meta( $post_id, 'slash_test_3', 'foo' );
} else {
// Expects slashed data.
$meta_1 = add_post_meta( $id, 'slash_test_1', addslashes( 'foo' ) );
$meta_2 = add_post_meta( $id, 'slash_test_2', addslashes( 'foo' ) );
$meta_3 = add_post_meta( $id, 'slash_test_3', addslashes( 'foo' ) );
$meta_1 = add_post_meta( $post_id, 'slash_test_1', addslashes( 'foo' ) );
$meta_2 = add_post_meta( $post_id, 'slash_test_2', addslashes( 'foo' ) );
$meta_3 = add_post_meta( $post_id, 'slash_test_3', addslashes( 'foo' ) );
}

$_POST = array();
$_POST['post_ID'] = $id;
$_POST['post_ID'] = $post_id;
$_POST['metakeyselect'] = '#NONE#';
$_POST['metakeyinput'] = 'slash_test_0';
$_POST['metavalue'] = $this->slash_6;
Expand All @@ -69,15 +70,15 @@ function test_edit_post() {
$_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

edit_post();
$post = get_post( $id );
$post = get_post( $post_id );

$this->assertSame( $this->slash_6, get_post_meta( $id, 'slash_test_0', true ) );
$this->assertSame( $this->slash_1, get_post_meta( $id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $id, 'slash_test_3', true ) );
$this->assertSame( $this->slash_6, get_post_meta( $post_id, 'slash_test_0', true ) );
$this->assertSame( $this->slash_1, get_post_meta( $post_id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $post_id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $post_id, 'slash_test_3', true ) );

$_POST = array();
$_POST['post_ID'] = $id;
$_POST['post_ID'] = $post_id;
$_POST['metakeyselect'] = '#NONE#';
$_POST['metakeyinput'] = 'slash_test_0';
$_POST['metavalue'] = $this->slash_7;
Expand All @@ -99,138 +100,140 @@ function test_edit_post() {
$_POST = add_magic_quotes( $_POST ); // The edit_post() function will strip slashes.

edit_post();
$post = get_post( $id );
$post = get_post( $post_id );

$this->assertSame( $this->slash_2, get_post_meta( $id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_5, get_post_meta( $id, 'slash_test_3', true ) );
$this->assertSame( $this->slash_2, get_post_meta( $post_id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $post_id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_5, get_post_meta( $post_id, 'slash_test_3', true ) );
}

/**
* Tests the legacy model function that expects slashed data.
*/
function test_add_post_meta() {
$id = self::factory()->post->create();
add_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
add_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
add_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );

$this->assertSame( $this->slash_1, get_post_meta( $id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $id, 'slash_test_3', true ) );
$post_id = self::factory()->post->create();

add_post_meta( $post_id, 'slash_test_1', addslashes( $this->slash_1 ) );
add_post_meta( $post_id, 'slash_test_2', addslashes( $this->slash_3 ) );
add_post_meta( $post_id, 'slash_test_3', addslashes( $this->slash_4 ) );

$this->assertSame( $this->slash_1, get_post_meta( $post_id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $post_id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $post_id, 'slash_test_3', true ) );
}

/**
* Tests the legacy model function that expects slashed data.
*/
function test_update_post_meta() {
$id = self::factory()->post->create();
update_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
update_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
update_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );

$this->assertSame( $this->slash_1, get_post_meta( $id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $id, 'slash_test_3', true ) );
$post_id = self::factory()->post->create();

update_post_meta( $post_id, 'slash_test_1', addslashes( $this->slash_1 ) );
update_post_meta( $post_id, 'slash_test_2', addslashes( $this->slash_3 ) );
update_post_meta( $post_id, 'slash_test_3', addslashes( $this->slash_4 ) );

$this->assertSame( $this->slash_1, get_post_meta( $post_id, 'slash_test_1', true ) );
$this->assertSame( $this->slash_3, get_post_meta( $post_id, 'slash_test_2', true ) );
$this->assertSame( $this->slash_4, get_post_meta( $post_id, 'slash_test_3', true ) );
}

/**
* Tests the model function that expects slashed data.
*/
function test_add_comment_meta() {
$id = self::$comment_id;
$comment_id = self::$comment_id;

add_comment_meta( $id, 'slash_test_1', $this->slash_1 );
add_comment_meta( $id, 'slash_test_2', $this->slash_3 );
add_comment_meta( $id, 'slash_test_3', $this->slash_5 );
add_comment_meta( $comment_id, 'slash_test_1', $this->slash_1 );
add_comment_meta( $comment_id, 'slash_test_2', $this->slash_3 );
add_comment_meta( $comment_id, 'slash_test_3', $this->slash_5 );

$this->assertSame( wp_unslash( $this->slash_1 ), get_comment_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_comment_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_comment_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_1 ), get_comment_meta( $comment_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_comment_meta( $comment_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_comment_meta( $comment_id, 'slash_test_3', true ) );

add_comment_meta( $id, 'slash_test_4', $this->slash_2 );
add_comment_meta( $id, 'slash_test_5', $this->slash_4 );
add_comment_meta( $id, 'slash_test_6', $this->slash_6 );
add_comment_meta( $comment_id, 'slash_test_4', $this->slash_2 );
add_comment_meta( $comment_id, 'slash_test_5', $this->slash_4 );
add_comment_meta( $comment_id, 'slash_test_6', $this->slash_6 );

$this->assertSame( wp_unslash( $this->slash_2 ), get_comment_meta( $id, 'slash_test_4', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_comment_meta( $id, 'slash_test_5', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_comment_meta( $id, 'slash_test_6', true ) );
$this->assertSame( wp_unslash( $this->slash_2 ), get_comment_meta( $comment_id, 'slash_test_4', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_comment_meta( $comment_id, 'slash_test_5', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_comment_meta( $comment_id, 'slash_test_6', true ) );
}

/**
* Tests the model function that expects slashed data.
*/
function test_update_comment_meta() {
$id = self::$comment_id;
$comment_id = self::$comment_id;

add_comment_meta( $id, 'slash_test_1', 'foo' );
add_comment_meta( $id, 'slash_test_2', 'foo' );
add_comment_meta( $id, 'slash_test_3', 'foo' );
add_comment_meta( $comment_id, 'slash_test_1', 'foo' );
add_comment_meta( $comment_id, 'slash_test_2', 'foo' );
add_comment_meta( $comment_id, 'slash_test_3', 'foo' );

update_comment_meta( $id, 'slash_test_1', $this->slash_1 );
update_comment_meta( $id, 'slash_test_2', $this->slash_3 );
update_comment_meta( $id, 'slash_test_3', $this->slash_5 );
update_comment_meta( $comment_id, 'slash_test_1', $this->slash_1 );
update_comment_meta( $comment_id, 'slash_test_2', $this->slash_3 );
update_comment_meta( $comment_id, 'slash_test_3', $this->slash_5 );

$this->assertSame( wp_unslash( $this->slash_1 ), get_comment_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_comment_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_comment_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_1 ), get_comment_meta( $comment_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_comment_meta( $comment_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_comment_meta( $comment_id, 'slash_test_3', true ) );

update_comment_meta( $id, 'slash_test_1', $this->slash_2 );
update_comment_meta( $id, 'slash_test_2', $this->slash_4 );
update_comment_meta( $id, 'slash_test_3', $this->slash_6 );
update_comment_meta( $comment_id, 'slash_test_1', $this->slash_2 );
update_comment_meta( $comment_id, 'slash_test_2', $this->slash_4 );
update_comment_meta( $comment_id, 'slash_test_3', $this->slash_6 );

$this->assertSame( wp_unslash( $this->slash_2 ), get_comment_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_comment_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_comment_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_2 ), get_comment_meta( $comment_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_comment_meta( $comment_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_comment_meta( $comment_id, 'slash_test_3', true ) );
}

/**
* Tests the model function that expects slashed data.
*/
function test_add_user_meta() {
$id = self::factory()->user->create();
$user_id = self::factory()->user->create();

add_user_meta( $id, 'slash_test_1', $this->slash_1 );
add_user_meta( $id, 'slash_test_2', $this->slash_3 );
add_user_meta( $id, 'slash_test_3', $this->slash_5 );
add_user_meta( $user_id, 'slash_test_1', $this->slash_1 );
add_user_meta( $user_id, 'slash_test_2', $this->slash_3 );
add_user_meta( $user_id, 'slash_test_3', $this->slash_5 );

$this->assertSame( wp_unslash( $this->slash_1 ), get_user_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_user_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_user_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_1 ), get_user_meta( $user_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_user_meta( $user_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_user_meta( $user_id, 'slash_test_3', true ) );

add_user_meta( $id, 'slash_test_4', $this->slash_2 );
add_user_meta( $id, 'slash_test_5', $this->slash_4 );
add_user_meta( $id, 'slash_test_6', $this->slash_6 );
add_user_meta( $user_id, 'slash_test_4', $this->slash_2 );
add_user_meta( $user_id, 'slash_test_5', $this->slash_4 );
add_user_meta( $user_id, 'slash_test_6', $this->slash_6 );

$this->assertSame( wp_unslash( $this->slash_2 ), get_user_meta( $id, 'slash_test_4', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_user_meta( $id, 'slash_test_5', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_user_meta( $id, 'slash_test_6', true ) );
$this->assertSame( wp_unslash( $this->slash_2 ), get_user_meta( $user_id, 'slash_test_4', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_user_meta( $user_id, 'slash_test_5', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_user_meta( $user_id, 'slash_test_6', true ) );
}

/**
* Tests the model function that expects slashed data.
*/
function test_update_user_meta() {
$id = self::factory()->user->create();
$user_id = self::factory()->user->create();

add_user_meta( $id, 'slash_test_1', 'foo' );
add_user_meta( $id, 'slash_test_2', 'foo' );
add_user_meta( $id, 'slash_test_3', 'foo' );
add_user_meta( $user_id, 'slash_test_1', 'foo' );
add_user_meta( $user_id, 'slash_test_2', 'foo' );
add_user_meta( $user_id, 'slash_test_3', 'foo' );

update_user_meta( $id, 'slash_test_1', $this->slash_1 );
update_user_meta( $id, 'slash_test_2', $this->slash_3 );
update_user_meta( $id, 'slash_test_3', $this->slash_5 );
update_user_meta( $user_id, 'slash_test_1', $this->slash_1 );
update_user_meta( $user_id, 'slash_test_2', $this->slash_3 );
update_user_meta( $user_id, 'slash_test_3', $this->slash_5 );

$this->assertSame( wp_unslash( $this->slash_1 ), get_user_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_user_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_user_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_1 ), get_user_meta( $user_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_3 ), get_user_meta( $user_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_5 ), get_user_meta( $user_id, 'slash_test_3', true ) );

update_user_meta( $id, 'slash_test_1', $this->slash_2 );
update_user_meta( $id, 'slash_test_2', $this->slash_4 );
update_user_meta( $id, 'slash_test_3', $this->slash_6 );
update_user_meta( $user_id, 'slash_test_1', $this->slash_2 );
update_user_meta( $user_id, 'slash_test_2', $this->slash_4 );
update_user_meta( $user_id, 'slash_test_3', $this->slash_6 );

$this->assertSame( wp_unslash( $this->slash_2 ), get_user_meta( $id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_user_meta( $id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_user_meta( $id, 'slash_test_3', true ) );
$this->assertSame( wp_unslash( $this->slash_2 ), get_user_meta( $user_id, 'slash_test_1', true ) );
$this->assertSame( wp_unslash( $this->slash_4 ), get_user_meta( $user_id, 'slash_test_2', true ) );
$this->assertSame( wp_unslash( $this->slash_6 ), get_user_meta( $user_id, 'slash_test_3', true ) );
}
}

0 comments on commit 4018e92

Please sign in to comment.