jenkins-bot has submitted this change and it was merged.

Change subject: Use PHPUnit_Framework_TestCase where MediaWikiTestCase isn't 
needed
......................................................................


Use PHPUnit_Framework_TestCase where MediaWikiTestCase isn't needed

Change-Id: I28b87bc3663ebfa737c408cdf7cf2f7116824777
---
M tests/unit/ConnectionTest.php
R tests/unit/HooksTest.php
M tests/unit/Job/MassIndexTest.php
M tests/unit/Search/EscaperTest.php
M tests/unit/Search/FiltersTest.php
5 files changed, 14 insertions(+), 9 deletions(-)

Approvals:
  Manybubbles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/unit/ConnectionTest.php b/tests/unit/ConnectionTest.php
index df9759f..d0aef1f 100644
--- a/tests/unit/ConnectionTest.php
+++ b/tests/unit/ConnectionTest.php
@@ -2,7 +2,7 @@
 
 namespace CirrusSearch;
 
-use \MediaWikiTestCase;
+use \PHPUnit_Framework_TestCase;
 
 /**
  * Make sure cirrus doens't break any hooks.
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class ConnectionTest extends MediaWikiTestCase {
+class ConnectionTest extends PHPUnit_Framework_TestCase {
        /**
         * @dataProvider provideNamespacesInIndexType
         */
diff --git a/tests/unit/CirrusSearchHooksTest.php b/tests/unit/HooksTest.php
similarity index 89%
rename from tests/unit/CirrusSearchHooksTest.php
rename to tests/unit/HooksTest.php
index 4c7aef8..de54834 100644
--- a/tests/unit/CirrusSearchHooksTest.php
+++ b/tests/unit/HooksTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace CirrusSearch;
+
+use \PHPUnit_Framework_TestCase;
+
 /**
  * Make sure cirrus doens't break any hooks.
  *
@@ -17,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class CirrusSearchHooksTest extends MediaWikiTestCase {
+class HooksTest extends PHPUnit_Framework_TestCase {
        public function testHooksAreArrays() {
                global $wgHooks;
 
diff --git a/tests/unit/Job/MassIndexTest.php b/tests/unit/Job/MassIndexTest.php
index 965f3cd..1aff6a2 100644
--- a/tests/unit/Job/MassIndexTest.php
+++ b/tests/unit/Job/MassIndexTest.php
@@ -2,7 +2,7 @@
 
 namespace CirrusSearch\Job;
 
-use \MediaWikiTestCase;
+use \PHPUnit_Framework_TestCase;
 use \Title;
 
 /**
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class MassIndexTest extends MediaWikiTestCase {
+class MassIndexTest extends PHPUnit_Framework_TestCase {
        /**
         * @dataProvider workItemCountTestCases
         */
diff --git a/tests/unit/Search/EscaperTest.php 
b/tests/unit/Search/EscaperTest.php
index 1ff10d9..98a750a 100644
--- a/tests/unit/Search/EscaperTest.php
+++ b/tests/unit/Search/EscaperTest.php
@@ -2,7 +2,7 @@
 
 namespace CirrusSearch\Search;
 
-use \MediaWikiTestCase;
+use \PHPUnit_Framework_TestCase;
 
 /**
  * Test escaping search strings.
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class EscaperTest extends MediaWikiTestCase {
+class EscaperTest extends PHPUnit_Framework_TestCase {
        /**
         * @dataProvider quoteEscapeTestCases
         */
diff --git a/tests/unit/Search/FiltersTest.php 
b/tests/unit/Search/FiltersTest.php
index 9b49239..b0efdc8 100644
--- a/tests/unit/Search/FiltersTest.php
+++ b/tests/unit/Search/FiltersTest.php
@@ -7,7 +7,7 @@
 use \Elastica\Filter\BoolNot;
 use \Elastica\Filter\Script;
 use \Elastica\Filter\Term;
-use \MediaWikiTestCase;
+use \PHPUnit_Framework_TestCase;
 
 /**
  * Test for filter utilities.
@@ -27,7 +27,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class FiltersTest extends MediaWikiTestCase {
+class FiltersTest extends PHPUnit_Framework_TestCase {
        /**
         * @dataProvider unifyTestCases
         */

-- 
To view, visit https://gerrit.wikimedia.org/r/207388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I28b87bc3663ebfa737c408cdf7cf2f7116824777
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Jdouglas <jdoug...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to