<!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>[47452] trunk/tests/phpunit/tests/functions.php: Tests: Extract `is_serialized()` test cases into data providers; reuse them for `maybe_serialize()` and `maybe_unserialize()` tests.</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/47452">47452</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47452","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-13 20:39:02 +0000 (Fri, 13 Mar 2020)</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: Extract `is_serialized()` test cases into data providers; reuse them for `maybe_serialize()` and `maybe_unserialize()` tests.
Props pbearne, mikeschroder, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/36416">#36416</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2020-03-12 15:53:01 UTC (rev 47451)
+++ trunk/tests/phpunit/tests/functions.php 2020-03-13 20:39:02 UTC (rev 47452)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_normalize_path( $path, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, wp_normalize_path( $path ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> function data_wp_normalize_path() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Windows paths.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,54 +221,118 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $upload_dir;
</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 test_is_serialized() {
- $cases = array(
- serialize( null ),
- serialize( true ),
- serialize( false ),
- serialize( -25 ),
- serialize( 25 ),
- serialize( 1.1 ),
- serialize( 'this string will be serialized' ),
- serialize( "a\nb" ),
- serialize( array() ),
- serialize( array( 1, 1, 2, 3, 5, 8, 13 ) ),
- serialize(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @dataProvider data_is_not_serialized
+ */
+ function test_maybe_serialize( $value ) {
+ if ( is_array( $value ) || is_object( $value ) ) {
+ $expected = serialize( $value );
+ } else {
+ $expected = $value;
+ }
+
+ $this->assertSame( $expected, maybe_serialize( $value ) );
+ }
+
+ /**
+ * @dataProvider data_is_serialized
+ */
+ function test_maybe_serialize_with_double_serialization( $value ) {
+ $expected = serialize( $value );
+
+ $this->assertSame( $expected, maybe_serialize( $value ) );
+ }
+
+ /**
+ * @dataProvider data_is_serialized
+ * @dataProvider data_is_not_serialized
+ */
+ function test_maybe_unserialize( $value, $is_serialized ) {
+ if ( $is_serialized ) {
+ $expected = unserialize( trim( $value ) );
+ } else {
+ $expected = $value;
+ }
+
+ if ( is_object( $expected ) ) {
+ $this->assertEquals( $expected, maybe_unserialize( $value ) );
+ } else {
+ $this->assertSame( $expected, maybe_unserialize( $value ) );
+ }
+ }
+
+ /**
+ * @dataProvider data_is_serialized
+ * @dataProvider data_is_not_serialized
+ */
+ function test_is_serialized( $value, $expected ) {
+ $this->assertSame( $expected, is_serialized( $value ) );
+ }
+
+ function data_is_serialized() {
+ return array(
+ array( serialize( null ), true ),
+ array( serialize( true ), true ),
+ array( serialize( false ), true ),
+ array( serialize( -25 ), true ),
+ array( serialize( 25 ), true ),
+ array( serialize( 1.1 ), true ),
+ array( serialize( 'this string will be serialized' ), true ),
+ array( serialize( "a\nb" ), true ),
+ array( serialize( array() ), true ),
+ array( serialize( array( 1, 1, 2, 3, 5, 8, 13 ) ), true ),
+ array(
+ serialize(
+ (object) array(
+ 'test' => true,
+ '3',
+ 4,
+ )
+ ),
+ true,
+ ),
+ );
+ }
+
+ function data_is_not_serialized() {
+ return array(
+ array( null, false ),
+ array( true, false ),
+ array( false, false ),
+ array( -25, false ),
+ array( 25, false ),
+ array( 1.1, false ),
+ array( 'this string will be serialized', false ),
+ array( "a\nb", false ),
+ array( array(), false ),
+ array( array( 1, 1, 2, 3, 5, 8, 13 ), false ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ false,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'a string', false ),
+ array( 'garbage:a:0:garbage;', false ),
+ array( 's:4:test;', false ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- foreach ( $cases as $case ) {
- $this->assertTrue( is_serialized( $case ), "Serialized data: $case" );
- }
-
- $not_serialized = array(
- 'a string',
- 'garbage:a:0:garbage;',
- 's:4:test;',
- );
-
- foreach ( $not_serialized as $case ) {
- $this->assertFalse( is_serialized( $case ), "Test data: $case" );
- }
</del><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 class="cx" style="display: block; padding: 0 10px"> * @ticket 46570
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_is_serialized_should_return_true_for_large_floats
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_serialized_should_return_true_for_large_floats() {
- $cases = array(
- serialize( 1.7976931348623157E+308 ),
- serialize( array( 1.7976931348623157E+308, 1.23e50 ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_is_serialized_should_return_true_for_large_floats( $value ) {
+ $this->assertTrue( is_serialized( $value ) );
+ }
+
+ function data_is_serialized_should_return_true_for_large_floats() {
+ return array(
+ array( serialize( 1.7976931348623157E+308 ) ),
+ array( serialize( array( 1.7976931348623157E+308, 1.23e50 ) ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- foreach ( $cases as $case ) {
- $this->assertTrue( is_serialized( $case ), "Serialized data: $case" );
- }
</del><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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +342,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_serialized( 'C:16:"Serialized_Class":6:{a:0:{}}' ) );
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group add_query_arg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>