Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345833 )
Change subject: ResourceLoaderModuleTest: Exchange first two parameter of assertEquals ...................................................................... ResourceLoaderModuleTest: Exchange first two parameter of assertEquals For assertEquals of PHPUnit the first parameter is $expected and the second parameter is $actual. https://phpunit.de/manual/current/en/appendixes.assertions.html#appendixes.assertions.assertEquals Change-Id: Iad4b37ee74a03aa00f2dc14d3c474796b3191b51 --- M tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/33/345833/1 diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php index 6751f4d..d3f3388 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php @@ -20,8 +20,8 @@ // Exactly the same $module = new ResourceLoaderFileModule( $baseParams ); $this->assertEquals( - $version, json_encode( $module->getVersionHash( $context ) ), + $version, 'Instance is insignificant' ); @@ -30,8 +30,8 @@ 'dependencies' => [ 'mediawiki', 'jquery' ], ] + $baseParams ); $this->assertEquals( - $version, json_encode( $module->getVersionHash( $context ) ), + $version, 'Order of dependencies is insignificant' ); @@ -40,8 +40,8 @@ 'messages' => [ 'world', 'hello' ], ] + $baseParams ); $this->assertEquals( - $version, json_encode( $module->getVersionHash( $context ) ), + $version, 'Order of messages is insignificant' ); @@ -50,16 +50,16 @@ 'scripts' => [ 'bar.js', 'foo.js' ], ] + $baseParams ); $this->assertNotEquals( - $version, json_encode( $module->getVersionHash( $context ) ), + $version, 'Order of scripts is significant' ); // Subclass $module = new ResourceLoaderFileModuleTestModule( $baseParams ); $this->assertNotEquals( - $version, json_encode( $module->getVersionHash( $context ) ), + $version, 'Class is significant' ); } @@ -76,11 +76,11 @@ 'script' => "var a = 'this is';\n {\ninvalid" ] ); $this->assertEquals( - $module->getScript( $context ), 'mw.log.error(' . '"JavaScript parse error: Parse error: Unexpected token; ' . 'token } expected in file \'input\' on line 3"' . ');', + $module->getScript( $context ), 'Replace invalid syntax with error logging' ); @@ -88,8 +88,8 @@ 'script' => "\n'valid';" ] ); $this->assertEquals( - $module->getScript( $context ), "\n'valid';", + $module->getScript( $context ), 'Leave valid scripts as-is' ); } @@ -120,13 +120,13 @@ '../skins/Example/images/quux.png', ]; $this->assertEquals( - $getRelativePaths->invoke( null, $raw ), $canonical, + $getRelativePaths->invoke( null, $raw ), 'Insert placeholders' ); $this->assertEquals( - $expandRelativePaths->invoke( null, $canonical ), $raw, + $expandRelativePaths->invoke( null, $canonical ), 'Substitute placeholders' ); } -- To view, visit https://gerrit.wikimedia.org/r/345833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad4b37ee74a03aa00f2dc14d3c474796b3191b51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
