http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89666

Revision: 89666
Author:   brion
Date:     2011-06-07 17:56:40 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Added phpunit test cases for r87497, r88076: ResourceLoader module name prefix 
collapsing

Modified Paths:
--------------
    trunk/phase3/tests/phpunit/includes/ResourceLoaderTest.php

Modified: trunk/phase3/tests/phpunit/includes/ResourceLoaderTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/ResourceLoaderTest.php  2011-06-07 
17:54:09 UTC (rev 89665)
+++ trunk/phase3/tests/phpunit/includes/ResourceLoaderTest.php  2011-06-07 
17:56:40 UTC (rev 89666)
@@ -46,6 +46,40 @@
                $resourceLoader->register( $name, $module );
                $this->assertEquals( $module, $resourceLoader->getModule( $name 
) );
        }
+
+       /**
+        * @dataProvider providePackedModules
+        */
+       public function testMakePackedModulesString( $desc, $modules, $packed ) 
{
+               $this->assertEquals( $packed, 
ResourceLoader::makePackedModulesString( $modules ), $desc );
+       }
+
+       /**
+        * @dataProvider providePackedModules
+        */
+       public function testexpandModuleNames( $desc, $modules, $packed ) {
+               $this->assertEquals( $modules, 
ResourceLoaderContext::expandModuleNames( $packed ), $desc );
+       }
+
+       public function providePackedModules() {
+               return array(
+                       array(
+                               'Example from makePackedModulesString doc 
comment',
+                               array( 'foo.bar', 'foo.baz', 'bar.baz', 
'bar.quux' ),
+                               'foo.bar,baz|bar.baz,quux',
+                       ),
+                       array(
+                               'Example from expandModuleNames doc comment',
+                               array( 'jquery.foo', 'jquery.bar', 
'jquery.ui.baz', 'jquery.ui.quux' ),
+                               'jquery.foo,bar|jquery.ui.baz,quux',
+                       ),
+                       array(
+                               'Regression fixed in r88706 with dotless names',
+                               array( 'foo', 'bar', 'baz' ),
+                               'foo,bar,baz',
+                       )
+               );
+       }
 }
 
 /* Stubs */


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to