From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 18 Jun 2015 18:57:16 +0000 (+0100)
Subject: resourceloader: Make tests less susceptible to timestamp races
X-Git-Tag: 1.31.0-rc.0~10769^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=370a7d5f39c24ff09f9e22b07568447b8ecb0020;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Make tests less susceptible to timestamp races

getDefinitionSummary isn't the authoritive method to detect changes.
Using it as such may false cause something to appear detected or
undetected. Use getVersionHash() instead.

Thanks to Gilles for uncovering this bug.

Bug: T105476
Change-Id: Ibefc9fa8ffd9d45e29901d726801e8d4e008b66f
---

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index 136ca6ef2f..41653fb035 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -3,10 +3,9 @@
 class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 
 	/**
-	 * @covers ResourceLoaderModule::getDefinitionSummary
-	 * @covers ResourceLoaderFileModule::getDefinitionSummary
+	 * @covers ResourceLoaderModule::getVersionHash
 	 */
-	public function testDefinitionSummary() {
+	public function testGetVersionHash() {
 		$context = $this->getResourceLoaderContext();
 
 		$baseParams = array(
@@ -16,15 +15,13 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 		);
 
 		$module = new ResourceLoaderFileModule( $baseParams );
-
-		$jsonSummary = json_encode( $module->getDefinitionSummary( $context ) );
+		$version = json_encode( $module->getVersionHash( $context ) );
 
 		// Exactly the same
 		$module = new ResourceLoaderFileModule( $baseParams );
-
 		$this->assertEquals(
-			$jsonSummary,
-			json_encode( $module->getDefinitionSummary( $context ) ),
+			$version,
+			json_encode( $module->getVersionHash( $context ) ),
 			'Instance is insignificant'
 		);
 
@@ -32,10 +29,9 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 		$module = new ResourceLoaderFileModule( array(
 			'dependencies' => array( 'mediawiki', 'jquery' ),
 		) + $baseParams );
-
 		$this->assertEquals(
-			$jsonSummary,
-			json_encode( $module->getDefinitionSummary( $context ) ),
+			$version,
+			json_encode( $module->getVersionHash( $context ) ),
 			'Order of dependencies is insignificant'
 		);
 
@@ -43,10 +39,9 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 		$module = new ResourceLoaderFileModule( array(
 			'messages' => array( 'world', 'hello' ),
 		) + $baseParams );
-
 		$this->assertEquals(
-			$jsonSummary,
-			json_encode( $module->getDefinitionSummary( $context ) ),
+			$version,
+			json_encode( $module->getVersionHash( $context ) ),
 			'Order of messages is insignificant'
 		);
 
@@ -54,19 +49,17 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 		$module = new ResourceLoaderFileModule( array(
 			'scripts' => array( 'bar.js', 'foo.js' ),
 		) + $baseParams );
-
 		$this->assertNotEquals(
-			$jsonSummary,
-			json_encode( $module->getDefinitionSummary( $context ) ),
+			$version,
+			json_encode( $module->getVersionHash( $context ) ),
 			'Order of scripts is significant'
 		);
 
 		// Subclass
 		$module = new ResourceLoaderFileModuleTestModule( $baseParams );
-
 		$this->assertNotEquals(
-			$jsonSummary,
-			json_encode( $module->getDefinitionSummary( $context ) ),
+			$version,
+			json_encode( $module->getVersionHash( $context ) ),
 			'Class is significant'
 		);
 	}