MediaWiki 1.14.0

[autoinstalls/mediawiki.git] / tests / ArticleTest.php

diff --git a/tests/ArticleTest.php b/tests/ArticleTest.php
index 953fd43c86f0be7e6188ad6ec2a38a83cc599b03..a65e1ee345ba077c2112104277c5f1f50abe3526 100644 (file)
--- a/tests/ArticleTest.php
+++ b/tests/ArticleTest.php
@@ -1,20 +1,11 @@
 <?php
 
-require_once( 'PHPUnit.php' );
-require_once( '../includes/Defines.php' );
-require_once( '../includes/Article.php' );
-
-class ArticleTest extends PHPUnit_TestCase {
+class ArticleTest extends PHPUnit_Framework_TestCase {
        var $saveGlobals = array();
-       
-       function ArticleTest( $name ) {
-               $this->PHPUnit_TestCase( $name );
-       }
-       
+
        function setUp() {
                $globalSet = array(
                        'wgLegacyEncoding' => false,
-                       'wgUseLatin1' => false,
                        'wgCompressRevisions' => false,
                        'wgInputEncoding' => 'utf-8',
                        'wgOutputEncoding' => 'utf-8' );
@@ -23,13 +14,13 @@ class ArticleTest extends PHPUnit_TestCase {
                        $GLOBALS[$var] = $data;
                }
        }
-       
+
        function tearDown() {
                foreach( $this->saveGlobals as $var => $data ) {
                        $GLOBALS[$var] = $data;
                }
        }
-       
+
        function testGetRevisionText() {
                $row = new stdClass;
                $row->old_flags = '';
@@ -38,7 +29,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        'This is a bunch of revision text.',
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testGetRevisionTextGzip() {
                $row = new stdClass;
                $row->old_flags = 'gzip';
@@ -47,7 +38,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        'This is a bunch of revision text.',
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testGetRevisionTextUtf8Native() {
                $row = new stdClass;
                $row->old_flags = 'utf-8';
@@ -57,7 +48,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        "Wiki est l'\xc3\xa9cole superieur !",
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testGetRevisionTextUtf8Legacy() {
                $row = new stdClass;
                $row->old_flags = '';
@@ -67,7 +58,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        "Wiki est l'\xc3\xa9cole superieur !",
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testGetRevisionTextUtf8NativeGzip() {
                $row = new stdClass;
                $row->old_flags = 'gzip,utf-8';
@@ -77,7 +68,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        "Wiki est l'\xc3\xa9cole superieur !",
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testGetRevisionTextUtf8LegacyGzip() {
                $row = new stdClass;
                $row->old_flags = 'gzip';
@@ -87,7 +78,7 @@ class ArticleTest extends PHPUnit_TestCase {
                        "Wiki est l'\xc3\xa9cole superieur !",
                        Revision::getRevisionText( $row ) );
        }
-       
+
        function testCompressRevisionTextUtf8() {
                $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
                $row->old_flags = Revision::compressRevisionText( $row->old_text );
@@ -101,20 +92,6 @@ class ArticleTest extends PHPUnit_TestCase {
                        Revision::getRevisionText( $row ), "getRevisionText" );
        }
 
-       function testCompressRevisionTextLatin1() {
-               $GLOBALS['wgUseLatin1'] = true;
-               $row->old_text = "Wiki est l'\xe9cole superieur !";
-               $row->old_flags = Revision::compressRevisionText( $row->old_text );
-               $this->assertFalse( false !== strpos( $row->old_flags, 'utf-8' ),
-                       "Flags should not contain 'utf-8'" );
-               $this->assertFalse( false !== strpos( $row->old_flags, 'gzip' ),
-                       "Flags should not contain 'gzip'" );
-               $this->assertEquals( "Wiki est l'\xe9cole superieur !",
-                       $row->old_text, "Direct check" );
-               $this->assertEquals( "Wiki est l'\xe9cole superieur !",
-                       Revision::getRevisionText( $row ), "getRevisionText" );
-       }
-       
        function testCompressRevisionTextUtf8Gzip() {
                $GLOBALS['wgCompressRevisions'] = true;
                $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
@@ -128,23 +105,6 @@ class ArticleTest extends PHPUnit_TestCase {
                $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
                        Revision::getRevisionText( $row ), "getRevisionText" );
        }
-
-       function testCompressRevisionTextLatin1Gzip() {
-               $GLOBALS['wgCompressRevisions'] = true;
-               $GLOBALS['wgUseLatin1'] = true;
-               $row = new stdClass;
-               $row->old_text = "Wiki est l'\xe9cole superieur !";
-               $row->old_flags = Revision::compressRevisionText( $row->old_text );
-               $this->assertFalse( false !== strpos( $row->old_flags, 'utf-8' ),
-                       "Flags should not contain 'utf-8'" );
-               $this->assertTrue( false !== strpos( $row->old_flags, 'gzip' ),
-                       "Flags should contain 'gzip'" );
-               $this->assertEquals( "Wiki est l'\xe9cole superieur !",
-                       gzinflate( $row->old_text ), "Direct check" );
-               $this->assertEquals( "Wiki est l'\xe9cole superieur !",
-                       Revision::getRevisionText( $row ), "getRevisionText" );
-       }
-
 }
 
-?>
\ No newline at end of file
+