- Make the require_once independent of the current path / include_path.

- Avoid duplicating ResourceLoaderContext::expandModuleNames() code.
- Passed $modules as a parameter.

Change-Id: Ifcd4af1ce35c509abf366f16143eecdbe729002b

diff --git a/tests/qunit/data/testloader.php b/tests/qunit/data/testloader.php
index 7f4c48d..967983e 100644 (file)
--- a/tests/qunit/data/testloader.php
+++ b/tests/qunit/data/testloader.php
@@ -24,7 +24,8 @@
  */
 header( 'Content-Type: text/javascript; charset=utf-8' );\r
 
-require_once "../../../includes/Xml.php";
+require_once dirname( __FILE__ ) . "/../../../includes/Xml.php";
+require_once dirname( __FILE__ ) . "/../../../includes/resourceloader/ResourceLoaderContext.php";
 
 $modules = array (
        'test.use_missing' => array (
@@ -37,39 +38,7 @@ $modules = array (
        )
 );
 
-// Copied from ResourceLoaderContext
-function expandModuleNames( $modules ) {\r
-       $retval = array();\r
-       // For backwards compatibility with an earlier hack, replace ! with .\r
-       $modules = str_replace( '!', '.', $modules );\r
-       $exploded = explode( '|', $modules );\r
-       foreach ( $exploded as $group ) {\r
-               if ( strpos( $group, ',' ) === false ) {\r
-                       // This is not a set of modules in foo.bar,baz notation\r
-                       // but a single module\r
-                       $retval[] = $group;\r
-               } else {\r
-                       // This is a set of modules in foo.bar,baz notation\r
-                       $pos = strrpos( $group, '.' );\r
-                       if ( $pos === false ) {\r
-                               // Prefixless modules, i.e. without dots\r
-                               $retval = explode( ',', $group );\r
-                       } else {\r
-                               // We have a prefix and a bunch of suffixes\r
-                               $prefix = substr( $group, 0, $pos ); // 'foo'\r
-                               $suffixes = explode( ',', substr( $group, $pos + 1 ) ); // array( 'bar', 'baz' )\r
-                               foreach ( $suffixes as $suffix ) {\r
-                                       $retval[] = "$prefix.$suffix";\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       return $retval;\r
-}
-
-function addModule ( $moduleName, &$gotten ) {
-       global $modules;
-
+function addModule ( $modules, $moduleName, &$gotten ) {
        $result = "";
        if ( isset( $gotten[$moduleName] ) ) {
                return $result;
@@ -90,10 +59,10 @@ function addModule ( $moduleName, &$gotten ) {
 $result = "";
 
 if ( isset( $_GET['modules'] ) ) {
-       $toGet = expandModuleNames( $_GET['modules'] );
+       $toGet = ResourceLoaderContext::expandModuleNames( $_GET['modules'] );
        $gotten = array();
        foreach ( $toGet as $moduleName ) {
-               $result .= addModule( $moduleName, $gotten );
+               $result .= addModule( $modules, $moduleName, $gotten );
        }
 }