[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-25263-geddbee7
The branch, master has been updated via eddbee7e73b13b621e573621edc0d613cc863ac8 (commit) from c638f77339596ec1b8f5fbb6a9bac0522e23b124 (commit)
- Log ----------------------------------------------------------------- commit eddbee7e73b13b621e573621edc0d613cc863ac8 Author: Michal Čihař mcihar@suse.cz Date: Mon Dec 19 14:59:42 2011 +0100
Use PHPUnit_Framework_TestCase insead of PHPUnit_Extensions_OutputTestCase
This is needed for phpunit 3.6 (otherwise it throws out tons of warnings).
-----------------------------------------------------------------------
Summary of changes: test/classes/PMA_Message_test.php | 2 +- test/classes/PMA_Theme_test.php | 2 +- test/libraries/common/PMA_ajaxResponse_test.php | 2 +- .../libraries/common/PMA_browseUploadFile_test.php | 2 +- test/libraries/common/PMA_checkParameters_test.php | 2 +- .../common/PMA_display_html_checkbox_test.php | 2 +- .../common/PMA_display_html_radio_test.php | 2 +- .../libraries/common/PMA_expandUserString_test.php | 2 +- .../libraries/common/PMA_extractFieldSpec_test.php | 2 +- .../common/PMA_generate_slider_effect_test.php | 2 +- .../common/PMA_showMessage_test_disabled.php | 2 +- test/libraries/core/PMA_fatalError_test.php | 2 +- .../core/PMA_headerLocation_test_disabled.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php index 72ab91a..64e0429 100644 --- a/test/classes/PMA_Message_test.php +++ b/test/classes/PMA_Message_test.php @@ -14,7 +14,7 @@ require_once 'libraries/core.lib.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/php-gettext/gettext.inc';
-class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase +class PMA_Message_test extends PHPUnit_Framework_TestCase { /** * @var PMA_Message diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index d8ca699..c9b2358 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -6,7 +6,7 @@ require_once 'libraries/Theme.class.php'; * Test class for PMA_Theme. * Generated by PHPUnit on 2011-07-18 at 03:19:13. */ -class PMA_ThemeTest extends PHPUnit_Extensions_OutputTestCase +class PMA_ThemeTest extends PHPUnit_Framework_TestCase { /** * @var PMA_Theme diff --git a/test/libraries/common/PMA_ajaxResponse_test.php b/test/libraries/common/PMA_ajaxResponse_test.php index 8c6b72d..f3fa4eb 100644 --- a/test/libraries/common/PMA_ajaxResponse_test.php +++ b/test/libraries/common/PMA_ajaxResponse_test.php @@ -14,7 +14,7 @@ require_once 'libraries/common.lib.php'; require_once 'libraries/Message.class.php';
-class PMA_ajaxResponse_test extends PHPUnit_Extensions_OutputTestCase +class PMA_ajaxResponse_test extends PHPUnit_Framework_TestCase { function testAjaxResponseText() { diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php index 4abc9cf..d372ee6 100644 --- a/test/libraries/common/PMA_browseUploadFile_test.php +++ b/test/libraries/common/PMA_browseUploadFile_test.php @@ -13,7 +13,7 @@ */ require_once 'libraries/common.lib.php';
-class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase +class PMA_browseUploadFile_test extends PHPUnit_Framework_TestCase {
/* diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index 7e1bd4f..1a352f8 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -14,7 +14,7 @@ require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php';
-class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase +class PMA_checkParameters_test extends PHPUnit_Framework_TestCase { function setup() { diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php index 36fbafb..9686552 100644 --- a/test/libraries/common/PMA_display_html_checkbox_test.php +++ b/test/libraries/common/PMA_display_html_checkbox_test.php @@ -13,7 +13,7 @@ */ require_once 'libraries/common.lib.php';
-class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase +class PMA_display_html_checkbox_test extends PHPUnit_Framework_TestCase { function testDisplayHtmlCheckbox() { diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_display_html_radio_test.php index 6c7b96b..3d02308 100644 --- a/test/libraries/common/PMA_display_html_radio_test.php +++ b/test/libraries/common/PMA_display_html_radio_test.php @@ -13,7 +13,7 @@ */ require_once 'libraries/common.lib.php';
-class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase +class PMA_display_html_radio_test extends PHPUnit_Framework_TestCase { function testDisplayHtmlRadioEmpty() { diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index e8c13c8..1b76a07 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -20,7 +20,7 @@ if (!defined('PMA_VERSION')) { /** * Test for PMA_expandUserString function. */ -class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase +class PMA_expandUserString_test extends PHPUnit_Framework_TestCase {
/** diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index c46b6e5..cd2a6cb 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -16,7 +16,7 @@ require_once 'libraries/common.lib.php'; /** * Test for PMA_extractFieldSpec function. */ -class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase +class PMA_extractFieldSpec_test extends PHPUnit_Framework_TestCase { /** * Test case for parsing SHOW COLUMNS output diff --git a/test/libraries/common/PMA_generate_slider_effect_test.php b/test/libraries/common/PMA_generate_slider_effect_test.php index 5736d3e..247f14d 100644 --- a/test/libraries/common/PMA_generate_slider_effect_test.php +++ b/test/libraries/common/PMA_generate_slider_effect_test.php @@ -13,7 +13,7 @@ */ require_once 'libraries/common.lib.php';
-class PMA_generate_slider_effect_test extends PHPUnit_Extensions_OutputTestCase +class PMA_generate_slider_effect_test extends PHPUnit_Framework_TestCase { function testGenerateSliderEffectTest() { diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php index bf757e4..2defc73 100644 --- a/test/libraries/common/PMA_showMessage_test_disabled.php +++ b/test/libraries/common/PMA_showMessage_test_disabled.php @@ -18,7 +18,7 @@ require_once 'libraries/Table.class.php'; require_once 'libraries/database_interface.lib.php'; require_once 'libraries/js_escape.lib.php';
-class PMA_showMessage_test extends PHPUnit_Extensions_OutputTestCase +class PMA_showMessage_test extends PHPUnit_Framework_TestCase { function setUp() { diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index b89c544..8e0a4e2 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -17,7 +17,7 @@ require_once 'libraries/core.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php';
-class PMA_fatalError_test extends PHPUnit_Extensions_OutputTestCase +class PMA_fatalError_test extends PHPUnit_Framework_TestCase { public function testFatalErrorMessage() { diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php index 3ef82c9..e0cb329 100644 --- a/test/libraries/core/PMA_headerLocation_test_disabled.php +++ b/test/libraries/core/PMA_headerLocation_test_disabled.php @@ -27,7 +27,7 @@ require_once 'libraries/select_lang.lib.php'; * @package PhpMyAdmin-test */
-class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase +class PMA_headerLocation_test extends PHPUnit_Framework_TestCase {
protected $oldIISvalue;
hooks/post-receive
-
Michal Čihař