From bbc4e95775842a75526be3cee83e5bb76b30beb9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Sat, 6 Feb 2010 15:57:51 +0000
Subject: [PATCH] Add a `make tap' target which runs the tests with `prove' and
 `phpunit --tap'

Also rename files so that all *Test*.php files are real test cases and
not just skeletons used for setup, those are now called *Setup*.php.
---
 maintenance/tests/Makefile                                  | 6 ++++++
 maintenance/tests/MediaWikiAPITest.php                      | 4 ++--
 .../{MediaWikiAPI_TestCase.php => MediaWikiAPI_Setup.php}   | 2 +-
 .../tests/{MediaWiki_TestCase.php => MediaWiki_Setup.php}   | 2 +-
 maintenance/tests/SearchEngineTest.php                      | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)
 rename maintenance/tests/{MediaWikiAPI_TestCase.php => MediaWikiAPI_Setup.php} (94%)
 rename maintenance/tests/{MediaWiki_TestCase.php => MediaWiki_Setup.php} (95%)

diff --git a/maintenance/tests/Makefile b/maintenance/tests/Makefile
index 545a8b1962..5c8139485d 100644
--- a/maintenance/tests/Makefile
+++ b/maintenance/tests/Makefile
@@ -1,11 +1,17 @@
 .PHONY: help test
 all test:
 	phpunit
+
+tap:
+	prove -e 'phpunit --tap' *Test*.php
+
 install:
 	pear channel-discover pear.phpunit.de
 	pear install phpunit/PHPUnit
+
 help:
 	# Options:
 	# 	test (default)		Run the unit tests
+	#	tap			Run the tests individually through Test::Harness's prove(1)
 	#	install			Install PHPUnit from phpunit.de
 	#	help			You're looking at it!
diff --git a/maintenance/tests/MediaWikiAPITest.php b/maintenance/tests/MediaWikiAPITest.php
index a08a9c97ae..045ec418ed 100644
--- a/maintenance/tests/MediaWikiAPITest.php
+++ b/maintenance/tests/MediaWikiAPITest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once( "MediaWikiAPI_TestCase.php" );
+require_once( "MediaWikiAPI_Setup.php" );
 
-class MediaWikiAPITest extends MediaWikiAPI_TestCase {
+class MediaWikiAPITest extends MediaWikiAPI_Setup {
 
 	function setup() {
 		parent::setup();
diff --git a/maintenance/tests/MediaWikiAPI_TestCase.php b/maintenance/tests/MediaWikiAPI_Setup.php
similarity index 94%
rename from maintenance/tests/MediaWikiAPI_TestCase.php
rename to maintenance/tests/MediaWikiAPI_Setup.php
index e00e79b17a..67807ac42c 100644
--- a/maintenance/tests/MediaWikiAPI_TestCase.php
+++ b/maintenance/tests/MediaWikiAPI_Setup.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class MediaWikiAPI_TestCase extends PHPUnit_Framework_TestCase {
+abstract class MediaWikiAPI_Setup extends PHPUnit_Framework_TestCase {
 	protected static $userName;
 	protected static $passWord;
 	protected static $user;
diff --git a/maintenance/tests/MediaWiki_TestCase.php b/maintenance/tests/MediaWiki_Setup.php
similarity index 95%
rename from maintenance/tests/MediaWiki_TestCase.php
rename to maintenance/tests/MediaWiki_Setup.php
index 3e6b40acdf..da42893c8c 100644
--- a/maintenance/tests/MediaWiki_TestCase.php
+++ b/maintenance/tests/MediaWiki_Setup.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class MediaWiki_TestCase extends PHPUnit_Framework_TestCase {
+abstract class MediaWiki_Setup extends PHPUnit_Framework_TestCase {
 	/**
 	 * @param string $serverType
 	 * @param array $tables
diff --git a/maintenance/tests/SearchEngineTest.php b/maintenance/tests/SearchEngineTest.php
index dc5023f456..dd3367a9f3 100644
--- a/maintenance/tests/SearchEngineTest.php
+++ b/maintenance/tests/SearchEngineTest.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once( 'MediaWiki_TestCase.php' );
+require_once( 'MediaWiki_Setup.php' );
 
 /** @todo document
  */
 
-class SearchEngineTest extends MediaWiki_TestCase {
+class SearchEngineTest extends MediaWiki_Setup {
 	var $db, $search;
 
 	function insertSearchData() {
-- 
2.20.1