* Made resetDB() actually clear out the tables rather than leave the contents

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

diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index 9287d53..7618986 100644 (file)
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -365,6 +365,10 @@ class TestFileIterator implements Iterator {
        function readNextTest() {
                $this->clearSection();
 
+               # Create a fake parser tests which never run anything unless
+               # asked to do so. This will avoid running hooks for a disabled test
+               $delayedParserTest = new DelayedParserTest();
+
                while ( false !== ( $line = fgets( $this->fh ) ) ) {
                        $this->lineNum++;
                        $matches = array();
@@ -390,9 +394,7 @@ class TestFileIterator implements Iterator {
                                                $line = trim( $line );
 
                                                if ( $line ) {
-                                                       if ( !$this->parserTest->requireHook( $line ) ) {
-                                                               return false;
-                                                       }
+                                                       $delayedParserTest->requireHook( $line );
                                                }
                                        }
 
@@ -408,9 +410,7 @@ class TestFileIterator implements Iterator {
                                                $line = trim( $line );
 
                                                if ( $line ) {
-                                                       if ( !$this->parserTest->requireFunctionHook( $line ) ) {
-                                                               return false;
-                                                       }
+                                                       $delayedParserTest->requireFunctionHook( $line );
                                                }
                                        }
 
@@ -428,17 +428,29 @@ class TestFileIterator implements Iterator {
                                                $this->sectionData['options'] = '';
                                        }
 
-                                       if ( !isset( $this->sectionData['config'] ) )
+                                       if ( !isset( $this->sectionData['config'] ) ) {
                                                $this->sectionData['config'] = '';
+                                       }
 
                                        if ( ( ( preg_match( '/\\bdisabled\\b/i', $this->sectionData['options'] ) && !$this->parserTest->runDisabled )
                                                         || !preg_match( "/" . $this->parserTest->regex . "/i", $this->sectionData['test'] ) )  ) {
                                                # disabled test
                                                $this->clearSection();
 
+                                               # Forget any pending hooks call since test is disabled
+                                               $delayedParserTest->reset();
+
                                                continue;
                                        }
 
+                                       # We are really going to run the test, run pending hooks and hooks function
+                                       wfDebug( __METHOD__ . " unleashing delayed test for: {$this->sectionData['test']}" );
+                                       $hooksResult = $delayedParserTest->unleash( $this->parserTest );
+                                       if( !$hooksResult ) {
+                                               # Some hook reported an issue. Abort.
+                                               return false;
+                                       }
+
                                        $this->test = array(
                                                'test'    => ParserTest::chomp( $this->sectionData['test']    ),
                                                'input'   => ParserTest::chomp( $this->sectionData['input']   ),
@@ -502,3 +514,74 @@ class TestFileIterator implements Iterator {
                return true;
        }
 }
+
+
+/**
+ * A class to delay execution of a parser test hooks.
+ *   
+ */
+class DelayedParserTest {
+
+       /** Initialized on construction */
+       private $hooks;
+       private $fnHooks;
+
+       public function __construct() {
+               $this->reset();
+       }
+
+       /**
+        * Init/reset or forgot about the current delayed test.
+        * Call to this will erase any hooks function that were pending.
+        */
+       public function reset() {
+               $this->hooks   = array();
+               $this->fnHooks = array();
+       }
+
+       /**
+        * Called whenever we actually want to run the hook.
+        * Should be the case if we found the parserTest is not disabled 
+        */
+       public function unleash( &$parserTest ) {
+               if( !($parserTest instanceof ParserTest || $parserTest instanceof NewParserTest
+               ) ) {
+                       throw new MWException( __METHOD__ . " must be passed an instance of ParserTest or NewParserTest classes\n" );
+               }
+
+               # Trigger delayed hooks. Any failure will make us abort
+               foreach( $this->hooks as $hook ) {
+                       $ret = $parserTest->requireHook( $hook );
+                       if( !$ret ) {
+                               return false;
+                       }
+               }
+
+               # Trigger delayed function hooks. Any failure will make us abort
+               foreach( $this->fnHooks as $fnHook ) {
+                       $ret = $parserTest->requireFunctionHook( $fnHook );
+                       if( !$ret ) {
+                               return false;
+                       }
+               }
+
+               # Delayed execution was successful.
+               return true;
+       }
+
+       /**
+        * Similar to ParserTest object but does not run anything
+        * Use unleash() to really execute the hook
+        */
+       public function requireHook( $hook ) {
+               $this->hooks[] = $hook;
+       }
+       /**
+        * Similar to ParserTest object but does not run anything
+        * Use unleash() to really execute the hook function
+        */
+       public function requireFunctionHook( $fnHook ) {
+               $this->fnHooks[] = $fnHook;
+       }
+
+}