Merge "ResourceLoaderLanguageDataModule: clean up"

[lhc/web/wiklou.git] / tests / testHelpers.inc

diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index 7618986..39e18c9 100644 (file)
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -313,8 +313,6 @@ class TestFileIterator implements Iterator {
        private $eof;
 
        function __construct( $file, $parserTest ) {
-               global $IP;
-
                $this->file = $file;
                $this->fh = fopen( $this->file, "rt" );
 
@@ -323,7 +321,6 @@ class TestFileIterator implements Iterator {
                }
 
                $this->parserTest = $parserTest;
-               $this->parserTest->showRunFile( wfRelativePath( $this->file, $IP ) );
 
                $this->lineNum = $this->index = 0;
        }
@@ -463,7 +460,7 @@ class TestFileIterator implements Iterator {
                                }
 
                                if ( isset ( $this->sectionData[$this->section] ) ) {
-                                       throw new MWException( "duplicate section '$section' at line {$this->lineNum} of $this->file\n" );
+                                       throw new MWException( "duplicate section '$this->section' at line {$this->lineNum} of $this->file\n" );
                                }
 
                                $this->sectionData[$this->section] = '';
@@ -515,10 +512,8 @@ class TestFileIterator implements Iterator {
        }
 }
 
-
 /**
  * A class to delay execution of a parser test hooks.
- *   
  */
 class DelayedParserTest {