From 3899a460b1b77d73f7e99150a1ae6665201997f0 Mon Sep 17 00:00:00 2001 From: Tobias Sarnowski Date: Mon, 16 Apr 2012 18:38:59 +0000 Subject: use DokuWikiTest class instead of PHPUnit_Framework_TestCase --- _testing/tests/inc/auth_aclcheck.test.php | 2 +- _testing/tests/inc/auth_admincheck.test.php | 2 +- _testing/tests/inc/auth_nameencode.test.php | 2 +- _testing/tests/inc/common_cleanText.test.php | 2 +- _testing/tests/inc/common_clientip.test.php | 2 +- _testing/tests/inc/common_obfuscate.test.php | 2 +- _testing/tests/inc/common_pagetemplate.test.php | 2 +- _testing/tests/inc/form_form.test.php | 2 +- _testing/tests/inc/httpclient_http.test.php | 2 +- _testing/tests/inc/init_fullpath.test.php | 2 +- _testing/tests/inc/init_getbaseurl.test.php | 2 +- _testing/tests/inc/ixr_library_date.test.php | 2 +- _testing/tests/inc/ixr_library_ixr_message.test.php | 2 +- _testing/tests/inc/mail_isvalid.test.php | 2 +- _testing/tests/inc/mail_quoted_printable_encode.test.php | 2 +- _testing/tests/inc/pageutils_clean_id.test.php | 2 +- _testing/tests/inc/pageutils_getid.test.php | 2 +- _testing/tests/inc/pageutils_resolve_id.test.php | 2 +- _testing/tests/inc/pageutils_resolve_pageid.test.php | 2 +- _testing/tests/inc/parser/lexer.test.php | 12 ++++++------ .../inc/parserutils_set_metadata_during_rendering.test.php | 2 +- _testing/tests/inc/remote.test.php | 2 +- _testing/tests/inc/safefn.test.php | 2 +- _testing/tests/inc/search/search.test.php | 2 +- _testing/tests/inc/utf8_correctidx.test.php | 2 +- _testing/tests/inc/utf8_html.test.php | 2 +- _testing/tests/inc/utf8_stripspecials.test.php | 2 +- _testing/tests/inc/utf8_substr.test.php | 2 +- _testing/tests/inc/utf8_unicode.test.php | 2 +- _testing/tests/inc/utf8_utf16be.test.php | 2 +- _testing/tests/lib/exe/css_css_compress.test.php | 2 +- _testing/tests/lib/exe/css_css_loadfile.test.php | 2 +- _testing/tests/lib/exe/js_js_compress.test.php | 2 +- _testing/tests/testing/inttests_globals.test.php | 2 +- _testing/tests/testing/inttests_hooks.test.php | 2 +- _testing/tests/testing/inttests_scope.test.php | 2 +- 36 files changed, 41 insertions(+), 41 deletions(-) diff --git a/_testing/tests/inc/auth_aclcheck.test.php b/_testing/tests/inc/auth_aclcheck.test.php index 53c6f03f1..837926904 100644 --- a/_testing/tests/inc/auth_aclcheck.test.php +++ b/_testing/tests/inc/auth_aclcheck.test.php @@ -4,7 +4,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/auth.php'; require_once DOKU_INC.'inc/auth/basic.class.php'; -class auth_acl_test extends PHPUnit_Framework_TestCase { +class auth_acl_test extends DokuWikiTest { var $oldConf; var $oldAuthAcl; diff --git a/_testing/tests/inc/auth_admincheck.test.php b/_testing/tests/inc/auth_admincheck.test.php index b3ead7d23..c108c60c0 100644 --- a/_testing/tests/inc/auth_admincheck.test.php +++ b/_testing/tests/inc/auth_admincheck.test.php @@ -10,7 +10,7 @@ class auth_admin_test_AuthInSensitive extends auth_basic { } } -class auth_admin_test extends PHPUnit_Framework_TestCase { +class auth_admin_test extends DokuWikiTest { private $oldauth; diff --git a/_testing/tests/inc/auth_nameencode.test.php b/_testing/tests/inc/auth_nameencode.test.php index 12a333f66..a3df6ac8c 100644 --- a/_testing/tests/inc/auth_nameencode.test.php +++ b/_testing/tests/inc/auth_nameencode.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/auth.php'; -class auth_nameencode_test extends PHPUnit_Framework_TestCase { +class auth_nameencode_test extends DokuWikiTest { function teardown() { global $cache_authname; diff --git a/_testing/tests/inc/common_cleanText.test.php b/_testing/tests/inc/common_cleanText.test.php index 68e70e2ea..58f38d9bf 100644 --- a/_testing/tests/inc/common_cleanText.test.php +++ b/_testing/tests/inc/common_cleanText.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC . 'inc/init.php'; require_once DOKU_INC . 'inc/common.php'; -class common_cleanText_test extends PHPUnit_Framework_TestCase { +class common_cleanText_test extends DokuWikiTest { function test_unix(){ $unix = 'one diff --git a/_testing/tests/inc/common_clientip.test.php b/_testing/tests/inc/common_clientip.test.php index a2dfb84ed..680050e42 100644 --- a/_testing/tests/inc/common_clientip.test.php +++ b/_testing/tests/inc/common_clientip.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; -class common_clientIP_test extends PHPUnit_Framework_TestCase { +class common_clientIP_test extends DokuWikiTest { function test_simple_all(){ $_SERVER['REMOTE_ADDR'] = '123.123.123.123'; diff --git a/_testing/tests/inc/common_obfuscate.test.php b/_testing/tests/inc/common_obfuscate.test.php index d7c947117..19dd2ff2c 100644 --- a/_testing/tests/inc/common_obfuscate.test.php +++ b/_testing/tests/inc/common_obfuscate.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; -class common_obfuscate_test extends PHPUnit_Framework_TestCase { +class common_obfuscate_test extends DokuWikiTest { function test_none(){ global $conf; diff --git a/_testing/tests/inc/common_pagetemplate.test.php b/_testing/tests/inc/common_pagetemplate.test.php index c4cc58295..c4a2dfdf9 100644 --- a/_testing/tests/inc/common_pagetemplate.test.php +++ b/_testing/tests/inc/common_pagetemplate.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; -class common_pagetemplate_test extends PHPUnit_Framework_TestCase { +class common_pagetemplate_test extends DokuWikiTest { function test_none(){ global $conf; diff --git a/_testing/tests/inc/form_form.test.php b/_testing/tests/inc/form_form.test.php index 6bc042ba6..f55f16106 100644 --- a/_testing/tests/inc/form_form.test.php +++ b/_testing/tests/inc/form_form.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/init.php'; -class form_test extends PHPUnit_Framework_TestCase { +class form_test extends DokuWikiTest { function _testform() { $form = new Doku_Form(array('id' => 'dw__testform', 'action' => '/test')); diff --git a/_testing/tests/inc/httpclient_http.test.php b/_testing/tests/inc/httpclient_http.test.php index 66faa16c2..3857273f7 100644 --- a/_testing/tests/inc/httpclient_http.test.php +++ b/_testing/tests/inc/httpclient_http.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/HTTPClient.php'; -class httpclient_http_test extends PHPUnit_Framework_TestCase { +class httpclient_http_test extends DokuWikiTest { protected $server = 'http://httpbin.org'; function test_simpleget(){ diff --git a/_testing/tests/inc/init_fullpath.test.php b/_testing/tests/inc/init_fullpath.test.php index 23a627617..e5b322874 100644 --- a/_testing/tests/inc/init_fullpath.test.php +++ b/_testing/tests/inc/init_fullpath.test.php @@ -1,7 +1,7 @@ assertEquals($stack->getCurrent(), "one"); @@ -156,7 +156,7 @@ class TestParser { } } -class TestOfLexer extends PHPUnit_Framework_TestCase { +class TestOfLexer extends DokuWikiTest { function testNoPatterns() { $handler = $this->getMock('TestParser'); $handler->expects($this->never())->method('accept'); @@ -208,7 +208,7 @@ class TestOfLexer extends PHPUnit_Framework_TestCase { } } -class TestOfLexerModes extends PHPUnit_Framework_TestCase { +class TestOfLexerModes extends DokuWikiTest { function testIsolatedPattern() { $handler = $this->getMock('TestParser'); $handler->expects($this->at(0))->method('a') @@ -333,7 +333,7 @@ class TestOfLexerModes extends PHPUnit_Framework_TestCase { } } -class TestOfLexerHandlers extends PHPUnit_Framework_TestCase { +class TestOfLexerHandlers extends DokuWikiTest { function testModeMapping() { $handler = $this->getMock('TestParser'); $handler->expects($this->at(0))->method('a') @@ -371,7 +371,7 @@ class TestParserByteIndex { function caught() {} } -class TestOfLexerByteIndices extends PHPUnit_Framework_TestCase { +class TestOfLexerByteIndices extends DokuWikiTest { function testIndex() { $doc = "aaabcdeee"; diff --git a/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php b/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php index 93914264c..66371509c 100644 --- a/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php +++ b/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/init.php'; -class parserutils_set_metadata_during_rendering_test extends PHPUnit_Framework_TestCase { +class parserutils_set_metadata_during_rendering_test extends DokuWikiTest { // the id used for this test case private $id; // if the test case is currently running diff --git a/_testing/tests/inc/remote.test.php b/_testing/tests/inc/remote.test.php index e4efeb0d2..5dc868295 100644 --- a/_testing/tests/inc/remote.test.php +++ b/_testing/tests/inc/remote.test.php @@ -114,7 +114,7 @@ class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { } -class remote_test extends PHPUnit_Framework_TestCase { +class remote_test extends DokuWikiTest { var $originalConf; var $userinfo; diff --git a/_testing/tests/inc/safefn.test.php b/_testing/tests/inc/safefn.test.php index 17169770b..78e08fec6 100644 --- a/_testing/tests/inc/safefn.test.php +++ b/_testing/tests/inc/safefn.test.php @@ -4,7 +4,7 @@ if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); require_once DOKU_INC.'inc/utf8.php'; require_once DOKU_INC.'inc/SafeFN.class.php'; -class safeFN_test extends PHPUnit_Framework_TestCase { +class safeFN_test extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/search/search.test.php b/_testing/tests/inc/search/search.test.php index 7ed14d476..f7ea469b9 100644 --- a/_testing/tests/inc/search/search.test.php +++ b/_testing/tests/inc/search/search.test.php @@ -1,7 +1,7 @@ file = tempnam('/tmp', 'css'); } diff --git a/_testing/tests/lib/exe/js_js_compress.test.php b/_testing/tests/lib/exe/js_js_compress.test.php index c6b0a2d2c..75c69c347 100644 --- a/_testing/tests/lib/exe/js_js_compress.test.php +++ b/_testing/tests/lib/exe/js_js_compress.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'lib/exe/js.php'; -class js_js_compress_test extends PHPUnit_Framework_TestCase { +class js_js_compress_test extends DokuWikiTest { function test_mlcom1(){ $text = '/** diff --git a/_testing/tests/testing/inttests_globals.test.php b/_testing/tests/testing/inttests_globals.test.php index 6608044c1..d3beb433d 100644 --- a/_testing/tests/testing/inttests_globals.test.php +++ b/_testing/tests/testing/inttests_globals.test.php @@ -3,7 +3,7 @@ /** * @group integration */ -class InttestsGlobalsTest extends PHPUnit_Framework_TestCase { +class InttestsGlobalsTest extends DokuWikiTest { /** * Global variables should be restored for every test case. */ diff --git a/_testing/tests/testing/inttests_hooks.test.php b/_testing/tests/testing/inttests_hooks.test.php index d3fdbd738..98ca77e82 100644 --- a/_testing/tests/testing/inttests_hooks.test.php +++ b/_testing/tests/testing/inttests_hooks.test.php @@ -3,7 +3,7 @@ /** * @group integration */ -class InttestsHooksTest extends PHPUnit_Framework_TestCase { +class InttestsHooksTest extends DokuWikiTest { function testHookTriggering() { $request = new TestRequest(); diff --git a/_testing/tests/testing/inttests_scope.test.php b/_testing/tests/testing/inttests_scope.test.php index 80c1fbd4e..af0e267b5 100644 --- a/_testing/tests/testing/inttests_scope.test.php +++ b/_testing/tests/testing/inttests_scope.test.php @@ -3,7 +3,7 @@ /** * @group integration */ -class InttestsScopeTest extends PHPUnit_Framework_TestCase { +class InttestsScopeTest extends DokuWikiTest { /** * It should be possible to have two test cases within one test class. */ -- cgit v1.2.3