Merge "tests: Reset LanguageConverter conversion tables between test cases"

diff --git a/languages/FakeConverter.php b/languages/FakeConverter.php
index 0cddc99..0bf88c6 100644 (file)
--- a/languages/FakeConverter.php
+++ b/languages/FakeConverter.php
@@ -125,4 +125,7 @@ class FakeConverter {
 
        public function updateConversionTable( Title $title ) {
        }
+
+       public function reloadTables() {
+       }
 }

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 19d644c..ef88c12 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -891,7 +891,9 @@ class LanguageConverter {
        /**
         * Reload the conversion tables.
         *
-        * @private
+        * Public only for use by test suites which need to reset the converter
+        * state.
+        *
         */
        function reloadTables() {
                if ( $this->mTables ) {

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 3ae3561..6d5910d 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -1045,6 +1045,8 @@ class ParserTestRunner {
                $context->setUser( $user );
                $context->setLanguage( $lang );
                $teardown[] = function () use ( $context ) {
+                       // Clear language conversion tables
+                       $context->getLanguage()->getConverter()->reloadTables();
                        // Reset context to the restored globals
                        $context->setUser( $GLOBALS['wgUser'] );
                        $context->setLanguage( $GLOBALS['wgContLang'] );