<!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>[41725] trunk/tests/phpunit/tests/pomo/pluralForms.php: Tests: Some tests in [41722] were using newer PHPUnit features.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41725">41725</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/41725","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-04 04:10:47 +0000 (Wed, 04 Oct 2017)</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: Some tests in <a href="https://core.trac.wordpress.org/changeset/41722">[41722]</a> were using newer PHPUnit features.
`test_cache` used PHPUnit's object mocking to test some internal behaviour in `Plural_Forms`, but made use of the `willReturn()` method, which was introduced in PHPUnit 4.0 as shorthand for `will($this->returnValue())`. Fixed by switching to the longer form.
Several tests used the `@expectedException` directive to catch generic `Exception` exceptions, which was added in PHPUnit 3.7. Fixed by changing to an explicit `try` / `catch` test.
See <a href="https://core.trac.wordpress.org/ticket/41562">#41562</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestspomopluralFormsphp">trunk/tests/phpunit/tests/pomo/pluralForms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestspomopluralFormsphp"></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/pomo/pluralForms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/pluralForms.php 2017-10-04 02:49:19 UTC (rev 41724)
+++ trunk/tests/phpunit/tests/pomo/pluralForms.php 2017-10-04 04:10:47 UTC (rev 41725)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,64 +156,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- /**
- * @expectedException Exception
- * @expectedExceptionMessage Unknown symbol "#"
- */
- public function test_invalid_operator() {
- $pluralForms = new Plural_Forms( 'n # 2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_exceptions() {
+ return array(
+ array(
+ 'n # 2', // Invalid expression to parse
+ 'Unknown symbol "#"', // Expected exception message
+ false, // Whether to call the get() method or not
+ ),
+ array(
+ 'n & 1',
+ 'Unknown operator "&"',
+ false,
+ ),
+ array(
+ '((n)',
+ 'Mismatched parentheses',
+ false,
+ ),
+ array(
+ '(n))',
+ 'Mismatched parentheses',
+ false,
+ ),
+ array(
+ 'n : 2',
+ 'Missing starting "?" ternary operator',
+ false,
+ ),
+ array(
+ 'n ? 1',
+ 'Unknown operator "?"',
+ true,
+ ),
+ array(
+ 'n n',
+ 'Too many values remaining on the stack',
+ true,
+ ),
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException Exception
- * @expectedExceptionMessage Unknown operator "&"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_exceptions
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_partial_operator() {
- $pluralForms = new Plural_Forms( 'n & 1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exceptions( $expression, $expected_exception, $call_get ) {
+ try {
+ $pluralForms = new Plural_Forms( $expression );
+ if( $call_get ) {
+ $pluralForms->get( 1 );
+ }
+ } catch ( Exception $e ) {
+ $this->assertEquals( $expected_exception, $e->getMessage() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @expectedException Exception
- * @expectedExceptionMessage Mismatched parentheses
- */
- public function test_mismatched_open_paren() {
- $pluralForms = new Plural_Forms( '((n)' );
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Mismatched parentheses
- */
- public function test_mismatched_close_paren() {
- $pluralForms = new Plural_Forms( '(n))' );
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Missing starting "?" ternary operator
- */
- public function test_missing_ternary_operator() {
- $pluralForms = new Plural_Forms( 'n : 2' );
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Unknown operator "?"
- */
- public function test_missing_ternary_else() {
- $pluralForms = new Plural_Forms( 'n ? 1' );
- $pluralForms->get( 1 );
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Too many values remaining on the stack
- */
- public function test_overflow_stack() {
- $pluralForms = new Plural_Forms( 'n n' );
- $pluralForms->get( 1 );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mock = $this->getMockBuilder( 'Plural_Forms' )
</span><span class="cx" style="display: block; padding: 0 10px"> ->setMethods(array('execute'))
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mock->expects($this->once())
</span><span class="cx" style="display: block; padding: 0 10px"> ->method('execute')
</span><span class="cx" style="display: block; padding: 0 10px"> ->with($this->identicalTo(2))
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->willReturn(1);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->will($this->returnValue(1));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $first = $mock->get( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $second = $mock->get( 2 );
</span></span></pre>
</div>
</div>
</body>
</html>