Merge "Tests: Fix case of some methods"

diff --combined tests/phpunit/includes/content/ContentHandlerTest.php
index 2b77978,5f75dc9..ac8dcef
--- 1/tests/phpunit/includes/content/ContentHandlerTest.php
--- 2/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@@ -10,9 -10,9 +10,9 @@@
   */
  class ContentHandlerTest extends MediaWikiTestCase {
  
-       public function setup() {
+       public function setUp() {
                global $wgContLang;
-               parent::setup();
+               parent::setUp();
  
                $this->setMwGlobals( array(
                        'wgExtraNamespaces' => array(
@@@ -145,72 -145,62 +145,72 @@@
                $this->assertEquals( $expected->getCode(), $lang->getCode() );
        }
  
 -      public function testGetContentText_Null() {
 -              global $wgContentHandlerTextFallback;
 +      public static function dataGetContentText_Null() {
 +              return array(
 +                      array( 'fail' ),
 +                      array( 'serialize' ),
 +                      array( 'ignore' ),
 +              );
 +      }
  
 -              $content = null;
 +      /**
 +       * @dataProvider dataGetContentText_Null
 +       */
 +      public function testGetContentText_Null( $contentHandlerTextFallback ) {
 +              $this->setMwGlobals( 'wgContentHandlerTextFallback', $contentHandlerTextFallback );
  
 -              $wgContentHandlerTextFallback = 'fail';
 -              $text = ContentHandler::getContentText( $content );
 -              $this->assertEquals( '', $text );
 +              $content = null;
  
 -              $wgContentHandlerTextFallback = 'serialize';
                $text = ContentHandler::getContentText( $content );
                $this->assertEquals( '', $text );
 +      }
  
 -              $wgContentHandlerTextFallback = 'ignore';
 -              $text = ContentHandler::getContentText( $content );
 -              $this->assertEquals( '', $text );
 +      public static function dataGetContentText_TextContent() {
 +              return array(
 +                      array( 'fail' ),
 +                      array( 'serialize' ),
 +                      array( 'ignore' ),
 +              );
        }
  
 -      public function testGetContentText_TextContent() {
 -              global $wgContentHandlerTextFallback;
 +      /**
 +       * @dataProvider dataGetContentText_TextContent
 +       */
 +      public function testGetContentText_TextContent( $contentHandlerTextFallback ) {
 +              $this->setMwGlobals( 'wgContentHandlerTextFallback', $contentHandlerTextFallback );
  
                $content = new WikitextContent( "hello world" );
  
 -              $wgContentHandlerTextFallback = 'fail';
 -              $text = ContentHandler::getContentText( $content );
 -              $this->assertEquals( $content->getNativeData(), $text );
 -
 -              $wgContentHandlerTextFallback = 'serialize';
 -              $text = ContentHandler::getContentText( $content );
 -              $this->assertEquals( $content->serialize(), $text );
 -
 -              $wgContentHandlerTextFallback = 'ignore';
                $text = ContentHandler::getContentText( $content );
                $this->assertEquals( $content->getNativeData(), $text );
        }
  
 -      public function testGetContentText_NonTextContent() {
 -              global $wgContentHandlerTextFallback;
 +      /**
 +       * ContentHandler::getContentText should have thrown an exception for non-text Content object
 +       * @expectedException MWException
 +       */
 +      public function testGetContentText_NonTextContent_fail() {
 +              $this->setMwGlobals( 'wgContentHandlerTextFallback', 'fail' );
  
                $content = new DummyContentForTesting( "hello world" );
  
 -              $wgContentHandlerTextFallback = 'fail';
 +              ContentHandler::getContentText( $content );
 +      }
  
 -              try {
 -                      $text = ContentHandler::getContentText( $content );
 +      public function testGetContentText_NonTextContent_serialize() {
 +              $this->setMwGlobals( 'wgContentHandlerTextFallback', 'serialize' );
  
 -                      $this->fail( "ContentHandler::getContentText should have thrown an exception for non-text Content object" );
 -              } catch ( MWException $ex ) {
 -                      // as expected
 -              }
 +              $content = new DummyContentForTesting( "hello world" );
  
 -              $wgContentHandlerTextFallback = 'serialize';
                $text = ContentHandler::getContentText( $content );
                $this->assertEquals( $content->serialize(), $text );
 +      }
 +
 +      public function testGetContentText_NonTextContent_ignore() {
 +              $this->setMwGlobals( 'wgContentHandlerTextFallback', 'ignore' );
 +
 +              $content = new DummyContentForTesting( "hello world" );
  
 -              $wgContentHandlerTextFallback = 'ignore';
                $text = ContentHandler::getContentText( $content );
                $this->assertNull( $text );
        }