Merge "Fix wrong @return type hints in Language::tsTo… methods"

[lhc/web/wiklou.git] / tests / phpunit / includes / specials / QueryAllSpecialPagesTest.php

diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
index 3b82e07..061e598 100644 (file)
--- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -8,19 +8,15 @@
  * @group Database
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       die( 1 );
-}
-
-global $IP;
-require_once "$IP/includes/QueryPage.php"; // Needed to populate $wgQueryPages
-
+/**
+ * @covers QueryPage<extended>
+ */
 class QueryAllSpecialPagesTest extends MediaWikiTestCase {
 
        /** List query pages that can not be tested automatically */
-       protected $manualTest = array(
+       protected $manualTest = [
                'LinkSearchPage'
-       );
+       ];
 
        /**
         * Pages whose query use the same DB table more than once.
@@ -28,9 +24,9 @@ class QueryAllSpecialPagesTest extends MediaWikiTestCase {
         * which does not support reopening a temporary table. See upstream bug:
         * http://bugs.mysql.com/bug.php?id=10327
         */
-       protected $reopensTempTable = array(
+       protected $reopensTempTable = [
                'BrokenRedirects',
-       );
+       ];
 
        /**
         * Initialize all query page objects
@@ -38,8 +34,7 @@ class QueryAllSpecialPagesTest extends MediaWikiTestCase {
        function __construct() {
                parent::__construct();
 
-               global $wgQueryPages;
-               foreach ( $wgQueryPages as $page ) {
+               foreach ( QueryPage::getPages() as $page ) {
                        $class = $page[0];
                        if ( !in_array( $class, $this->manualTest ) ) {
                                $this->queryPages[$class] = new $class;
@@ -51,18 +46,18 @@ class QueryAllSpecialPagesTest extends MediaWikiTestCase {
         * Test SQL for each of our QueryPages objects
         * @group Database
         */
-       function testQuerypageSqlQuery() {
+       public function testQuerypageSqlQuery() {
                global $wgDBtype;
 
                foreach ( $this->queryPages as $page ) {
-
                        // With MySQL, skips special pages reopening a temporary table
                        // See http://bugs.mysql.com/bug.php?id=10327
                        if (
                                $wgDBtype === 'mysql'
                                && in_array( $page->getName(), $this->reopensTempTable )
                        ) {
-                               $this->markTestSkipped( "SQL query for page {$page->getName()} can not be tested on MySQL backend (it reopens a temporary table)" );
+                               $this->markTestSkipped( "SQL query for page {$page->getName()} "
+                                       . "can not be tested on MySQL backend (it reopens a temporary table)" );
                                continue;
                        }