From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 27 Oct 2011 20:54:27 +0000 (+0000)
Subject: FU r100915: split out GlobalWithDBTest (tests which need the DB)
X-Git-Tag: 1.31.0-rc.0~26867
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=a727d79f97d7667feb9aafc81301b88d7cdab5ef;p=lhc%2Fweb%2Fwiklou.git

FU r100915: split out GlobalWithDBTest (tests which need the DB)
---

diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 25581de031..01da0a522b 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -934,29 +934,6 @@ class GlobalTest extends MediaWikiTestCase {
 				"Called eval.php --help --test with wrapper and php option" ),
 		);
 	}
-
-	/**
-	 * @dataProvider provideWfIsBadImageList
-	 */
-	function testWfIsBadImage( $name, $title, $blacklist, $expected, $desc ) {
-		$this->assertEquals( $expected, wfIsBadImage( $name, $title, $blacklist ), $desc );
-	}
-
-	function provideWfIsBadImageList() {
-		$blacklist = '* [[File:Bad.jpg]] except [[Nasty page]]';
-		return array(
-			array( 'Bad.jpg', false, $blacklist, true,
-				'Called on a bad image' ),
-			array( 'Bad.jpg', Title::makeTitle( NS_MAIN, 'A page' ), $blacklist, true,
-				'Called on a bad image' ),
-			array( 'NotBad.jpg', false, $blacklist, false,
-				'Called on a non-bad image' ),
-			array( 'Bad.jpg', Title::makeTitle( NS_MAIN, 'Nasty page' ), $blacklist, false,
-				'Called on a bad image but is on a whitelisted page' ),
-			array( 'File:Bad.jpg', false, $blacklist, false,
-				'Called on a bad image with File:' ),
-		);
-	}
 	/* TODO: many more! */
 }
 
diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php
new file mode 100644
index 0000000000..4879a38d72
--- /dev/null
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @group Database
+ */
+class GlobalWithDBTest extends MediaWikiTestCase {
+	/**
+	 * @dataProvider provideWfIsBadImageList
+	 */
+	function testWfIsBadImage( $name, $title, $blacklist, $expected, $desc ) {
+		$this->assertEquals( $expected, wfIsBadImage( $name, $title, $blacklist ), $desc );
+	}
+
+	function provideWfIsBadImageList() {
+		$blacklist = '* [[File:Bad.jpg]] except [[Nasty page]]';
+		return array(
+			array( 'Bad.jpg', false, $blacklist, true,
+				'Called on a bad image' ),
+			array( 'Bad.jpg', Title::makeTitle( NS_MAIN, 'A page' ), $blacklist, true,
+				'Called on a bad image' ),
+			array( 'NotBad.jpg', false, $blacklist, false,
+				'Called on a non-bad image' ),
+			array( 'Bad.jpg', Title::makeTitle( NS_MAIN, 'Nasty page' ), $blacklist, false,
+				'Called on a bad image but is on a whitelisted page' ),
+			array( 'File:Bad.jpg', false, $blacklist, false,
+				'Called on a bad image with File:' ),
+		);
+	}
+}