Merge "test: abstract parser test result"

diff --combined tests/TestsAutoLoader.php
index 83c2fcb,363d0a2..ca92fe3
--- 1/tests/TestsAutoLoader.php
--- 2/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@@ -30,6 -30,7 +30,7 @@@ $wgAutoloadClasses += array
        'DbTestPreviewer' => "$testDir/testHelpers.inc",
        'DbTestRecorder' => "$testDir/testHelpers.inc",
        'DelayedParserTest' => "$testDir/testHelpers.inc",
+       'ParserTestResult' => "$testDir/parser/ParserTestResult.php",
        'TestFileIterator' => "$testDir/testHelpers.inc",
        'TestRecorder' => "$testDir/testHelpers.inc",
  
@@@ -47,7 -48,9 +48,7 @@@
  
        //db
        'ORMTableTest' => "$testDir/phpunit/includes/db/ORMTableTest.php",
 -
 -      //Selenium
 -      'SeleniumTestConstants' => "$testDir/selenium/SeleniumTestConstants.php",
 +      'DatabaseTestHelper' => "$testDir/phpunit/includes/db/DatabaseTestHelper.php",
  
        # tests/phpunit/includes/api
        'ApiFormatTestBase' => "$testDir/phpunit/includes/api/format/ApiFormatTestBase.php",

diff --combined tests/parser/parserTest.inc
index 3d34f34,526a6d6..7c8daf2
--- 1/tests/parser/parserTest.inc
--- 2/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@@ -487,7 -487,7 +487,7 @@@ class ParserTest 
                } elseif ( isset( $opts['comment'] ) ) {
                        $out = Linker::formatComment( $input, $title, $local );
                } elseif ( isset( $opts['preload'] ) ) {
 -                      $out = $parser->getpreloadText( $input, $title, $options );
 +                      $out = $parser->getPreloadText( $input, $title, $options );
                } else {
                        $output = $parser->parse( $input, $title, $options, true, true, 1337 );
                        $out = $output->getText();
@@@ -518,18 -518,23 +518,23 @@@
                }
  
                $this->teardownGlobals();
-               return $this->showTestResult( $desc, $result, $out );
+ 
+               $testResult = new ParserTestResult( $desc );
+               $testResult->expected = $result;
+               $testResult->actual = $out;
+ 
+               return $this->showTestResult( $testResult );
        }
  
        /**
-        *
+        * Refactored in 1.22 to use ParserTestResult
         */
-       function showTestResult( $desc, $result, $out ) {
-               if ( $result === $out ) {
-                       $this->showSuccess( $desc );
+       function showTestResult( ParserTestResult $testResult ) {
+               if ( $testResult->isSuccess() ) {
+                       $this->showSuccess( $testResult );
                        return true;
                } else {
-                       $this->showFailure( $desc, $result, $out );
+                       $this->showFailure( $testResult );
                        return false;
                }
        }
@@@ -869,36 -874,18 +874,36 @@@
                $this->uploadDir = $this->setupUploadDir();
                $user = User::createNew( 'WikiSysop' );
                $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.jpg' ) );
 +              # note that the size/width/height/bits/etc of the file
 +              # are actually set by inspecting the file itself; the arguments
 +              # to recordUpload2 have no effect.  That said, we try to make things
 +              # match up so it is less confusing to readers of the code & tests.
                $image->recordUpload2( '', 'Upload of some lame file', 'Some lame file', array(
 -                      'size' => 12345,
 +                      'size' => 7881,
                        'width' => 1941,
                        'height' => 220,
 -                      'bits' => 24,
 +                      'bits' => 8,
                        'media_type' => MEDIATYPE_BITMAP,
                        'mime' => 'image/jpeg',
                        'metadata' => serialize( array() ),
 -                      'sha1' => wfBaseConvert( '', 16, 36, 31 ),
 +                      'sha1' => wfBaseConvert( '1', 16, 36, 31 ),
                        'fileExists' => true
                ), $this->db->timestamp( '20010115123500' ), $user );
  
 +              $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Thumb.png' ) );
 +              # again, note that size/width/height below are ignored; see above.
 +              $image->recordUpload2( '', 'Upload of some lame thumbnail', 'Some lame thumbnail', array(
 +                      'size' => 22589,
 +                      'width' => 135,
 +                      'height' => 135,
 +                      'bits' => 8,
 +                      'media_type' => MEDIATYPE_BITMAP,
 +                      'mime' => 'image/png',
 +                      'metadata' => serialize( array() ),
 +                      'sha1' => wfBaseConvert( '2', 16, 36, 31 ),
 +                      'fileExists' => true
 +              ), $this->db->timestamp( '20130225203040' ), $user );
 +
                # This image will be blacklisted in [[MediaWiki:Bad image list]]
                $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Bad.jpg' ) );
                $image->recordUpload2( '', 'zomgnotcensored', 'Borderline image', array(
@@@ -909,7 -896,7 +914,7 @@@
                        'media_type' => MEDIATYPE_BITMAP,
                        'mime' => 'image/jpeg',
                        'metadata' => serialize( array() ),
 -                      'sha1' => wfBaseConvert( '', 16, 36, 31 ),
 +                      'sha1' => wfBaseConvert( '3', 16, 36, 31 ),
                        'fileExists' => true
                ), $this->db->timestamp( '20010115123500' ), $user );
        }
@@@ -978,8 -965,6 +983,8 @@@
  
                wfMkdirParents( $dir . '/3/3a', null, __METHOD__ );
                copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
 +              wfMkdirParents( $dir . '/e/ea', null, __METHOD__ );
 +              copy( "$IP/skins/monobook/wiki.png", "$dir/e/ea/Thumb.png" );
                wfMkdirParents( $dir . '/0/09', null, __METHOD__ );
                copy( "$IP/skins/monobook/headbg.jpg", "$dir/0/09/Bad.jpg" );
  
@@@ -1028,8 -1013,6 +1033,8 @@@
                                "$dir/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/960px-Foobar.jpg",
  
 +                              "$dir/e/ea/Thumb.png",
 +
                                "$dir/0/09/Bad.jpg",
  
                                "$dir/math/f/a/5/fa50b8b616463173474302ca3e63586b.png",
@@@ -1046,9 -1029,6 +1051,9 @@@
                                "$dir/thumb/3/3a",
                                "$dir/thumb/3",
  
 +                              "$dir/e/ea",
 +                              "$dir/e",
 +
                                "$dir/0/09/",
                                "$dir/0/",
                                "$dir/thumb",
@@@ -1095,10 -1075,12 +1100,12 @@@
        /**
         * Print a happy success message.
         *
-        * @param $desc String: the test name
+        * Refactored in 1.22 to use ParserTestResult
+        *
+        * @param $testResult ParserTestResult
         * @return Boolean
         */
-       protected function showSuccess( $desc ) {
+       protected function showSuccess( ParserTestResult $testResult ) {
                if ( $this->showProgress ) {
                        print $this->term->color( '1;32' ) . 'PASSED' . $this->term->reset() . "\n";
                }
@@@ -1110,28 -1092,29 +1117,29 @@@
         * Print a failure message and provide some explanatory output
         * about what went wrong if so configured.
         *
-        * @param $desc String: the test name
-        * @param $result String: expected HTML output
-        * @param $html String: actual HTML output
+        * Refactored in 1.22 to use ParserTestResult
+        *
+        * @param $testResult ParserTestResult
         * @return Boolean
         */
-       protected function showFailure( $desc, $result, $html ) {
+       protected function showFailure( ParserTestResult $testResult ) {
                if ( $this->showFailure ) {
                        if ( !$this->showProgress ) {
                                # In quiet mode we didn't show the 'Testing' message before the
                                # test, in case it succeeded. Show it now:
-                               $this->showTesting( $desc );
+                               $this->showTesting( $testResult->description );
                        }
  
                        print $this->term->color( '31' ) . 'FAILED!' . $this->term->reset() . "\n";
  
                        if ( $this->showOutput ) {
-                               print "--- Expected ---\n$result\n--- Actual ---\n$html\n";
+                               print "--- Expected ---\n{$testResult->expected}\n";
+                               print "--- Actual ---\n{$testResult->actual}\n";
                        }
  
                        if ( $this->showDiffs ) {
-                               print $this->quickDiff( $result, $html );
-                               if ( !$this->wellFormed( $html ) ) {
+                               print $this->quickDiff( $testResult->expected, $testResult->actual );
+                               if ( !$this->wellFormed( $testResult->actual ) ) {
                                        print "XML error: $this->mXmlError\n";
                                }
                        }