From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 3 Nov 2010 16:42:19 +0000 (+0000)
Subject: Follow up r75906.
X-Git-Tag: 1.31.0-rc.0~34111
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=2b69b707b85ac366ff159d1bd6efed8e59deee99;p=lhc%2Fweb%2Fwiklou.git

Follow up r75906.
Those RandomImageGenerator exceptions are not nice. Skip the tests if you have no dictionaries.
Change spaces to tabs.
Place ApiUploadTest in Database and Destructive groups
Mark testGetParserCacheKeyWithDynamicDates() added in r75838 as needed a db
---

diff --git a/maintenance/tests/phpunit/includes/ParserOptionsTest.php b/maintenance/tests/phpunit/includes/ParserOptionsTest.php
index 0b11f1004f..2566ac352d 100644
--- a/maintenance/tests/phpunit/includes/ParserOptionsTest.php
+++ b/maintenance/tests/phpunit/includes/ParserOptionsTest.php
@@ -17,8 +17,9 @@ class ParserOptionsTest extends PHPUnit_Framework_TestCase {
 		parent::tearDown();
 	}
 	
-	/*
+	/**
 	 * ParserOptions::optionsHash was not giving consistent results when $wgUseDynamicDates was set
+	 * @group Database
 	 */
 	function testGetParserCacheKeyWithDynamicDates() {	
 		global $wgUseDynamicDates;
diff --git a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
index 1388dd0786..39f19b0911 100644
--- a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
@@ -30,17 +30,17 @@ class ApiTestUser {
 	function __construct( $username, $realname = 'Real Name', $email = 'sample@sample.com', $groups = array() ) {
 		global $wgMinimalPasswordLength;
 
-	    	$this->username = $username; 
-	    	$this->realname = $realname; 
+		$this->username = $username; 
+		$this->realname = $realname; 
 		$this->email = $email;
 		$this->groups = $groups;
 
 		// don't allow user to hardcode or select passwords -- people sometimes run tests 	
 		// on live wikis. Sometimes we create sysop users in these tests. A sysop user with
 	 	// a known password would be a Bad Thing.
-	    	$this->password = User::randomPassword();
+		$this->password = User::randomPassword();
 
-	    	$this->user = User::newFromName( $this->username );
+		$this->user = User::newFromName( $this->username );
 		$this->user->load();
 
 		// In an ideal world we'd have a new wiki (or mock data store) for every single test.
@@ -145,6 +145,10 @@ abstract class ApiTestCase extends PHPUnit_Framework_TestCase {
 
 }
 
+/**
+ * @group Database
+ * @group Destructive
+ */
 class ApiUploadTest extends ApiTestCase {
 	/**
 	 * Fixture -- run before every test 
@@ -254,7 +258,13 @@ class ApiUploadTest extends ApiTestCase {
 		$extension = 'png';
 		$mimeType = 'image/png';
 
-		$randomImageGenerator = new RandomImageGenerator();
+		try {
+			$randomImageGenerator = new RandomImageGenerator();
+		}
+		catch ( Exception $e ) {
+			$this->markTestIncomplete( $e->getMessage() );
+		}
+
 		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
 		$filePath = $filePaths[0];
 		$fileName = basename( $filePath ); 
@@ -342,7 +352,13 @@ class ApiUploadTest extends ApiTestCase {
 		$extension = 'png';
 		$mimeType = 'image/png';
 
-		$randomImageGenerator = new RandomImageGenerator();
+		try {
+			$randomImageGenerator = new RandomImageGenerator();
+		}
+		catch ( Exception $e ) {
+			$this->markTestIncomplete( $e->getMessage() );
+		}
+
 		$filePaths = $randomImageGenerator->writeImages( 2, $extension, dirname( wfTempDir() ) );
 		// we'll reuse this filename
 		$fileName = basename( $filePaths[0] ); 
@@ -410,7 +426,12 @@ class ApiUploadTest extends ApiTestCase {
 		$extension = 'png';
 		$mimeType = 'image/png';
 
-		$randomImageGenerator = new RandomImageGenerator();
+		try {
+			$randomImageGenerator = new RandomImageGenerator();
+		}
+		catch ( Exception $e ) {
+			$this->markTestIncomplete( $e->getMessage() );
+		}
 		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
 		$fileNames[0] = basename( $filePaths[0] ); 
 		$fileNames[1] = "SameContentAs" . $fileNames[0];
@@ -488,7 +509,13 @@ class ApiUploadTest extends ApiTestCase {
 		$extension = 'png';
 		$mimeType = 'image/png';
 
-		$randomImageGenerator = new RandomImageGenerator();
+		try {
+			$randomImageGenerator = new RandomImageGenerator();
+		}
+		catch ( Exception $e ) {
+			$this->markTestIncomplete( $e->getMessage() );
+		}
+
 		$filePaths = $randomImageGenerator->writeImages( 1, $extension, dirname( wfTempDir() ) );
 		$filePath = $filePaths[0];
 		$fileName = basename( $filePath );