diff options
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 @@ <?php require_once DOKU_INC.'inc/init.php'; -class init_fullpath_test extends PHPUnit_Framework_TestCase { +class init_fullpath_test extends DokuWikiTest { function test_unix_paths(){ $base = $_SERVER['SCRIPT_FILENAME']; diff --git a/_testing/tests/inc/init_getbaseurl.test.php b/_testing/tests/inc/init_getbaseurl.test.php index 0cc31f4fd..9d1377b3c 100644 --- a/_testing/tests/inc/init_getbaseurl.test.php +++ b/_testing/tests/inc/init_getbaseurl.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/init.php'; -class init_getBaseURL_test extends PHPUnit_Framework_TestCase { +class init_getBaseURL_test extends DokuWikiTest { /** * Apache, mod_php, subdirectory diff --git a/_testing/tests/inc/ixr_library_date.test.php b/_testing/tests/inc/ixr_library_date.test.php index 8b5f3e83e..377b0fd33 100644 --- a/_testing/tests/inc/ixr_library_date.test.php +++ b/_testing/tests/inc/ixr_library_date.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/IXR_Library.php'; -class ixr_library_date_test extends PHPUnit_Framework_TestCase { +class ixr_library_date_test extends DokuWikiTest { function test_parseIso(){ diff --git a/_testing/tests/inc/ixr_library_ixr_message.test.php b/_testing/tests/inc/ixr_library_ixr_message.test.php index 9de3d61aa..ea7646b6a 100644 --- a/_testing/tests/inc/ixr_library_ixr_message.test.php +++ b/_testing/tests/inc/ixr_library_ixr_message.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/IXR_Library.php'; -class ixr_library_ixr_message_test extends PHPUnit_Framework_TestCase { +class ixr_library_ixr_message_test extends DokuWikiTest { diff --git a/_testing/tests/inc/mail_isvalid.test.php b/_testing/tests/inc/mail_isvalid.test.php index e4eaf8d78..58f8e69d7 100644 --- a/_testing/tests/inc/mail_isvalid.test.php +++ b/_testing/tests/inc/mail_isvalid.test.php @@ -2,7 +2,7 @@ // use no mbstring help here require_once DOKU_INC.'inc/init.php'; -class mail_isvalid extends PHPUnit_Framework_TestCase { +class mail_isvalid extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/mail_quoted_printable_encode.test.php b/_testing/tests/inc/mail_quoted_printable_encode.test.php index 8228d007b..888b1d1bf 100644 --- a/_testing/tests/inc/mail_quoted_printable_encode.test.php +++ b/_testing/tests/inc/mail_quoted_printable_encode.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/mail.php'; -class mail_quotedprintable_encode extends PHPUnit_Framework_TestCase { +class mail_quotedprintable_encode extends DokuWikiTest { function test_simple(){ $in = 'hello'; diff --git a/_testing/tests/inc/pageutils_clean_id.test.php b/_testing/tests/inc/pageutils_clean_id.test.php index 0c9c41da1..37debfa0a 100644 --- a/_testing/tests/inc/pageutils_clean_id.test.php +++ b/_testing/tests/inc/pageutils_clean_id.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/utf8.php'; require_once DOKU_INC.'inc/pageutils.php'; -class init_clean_id_test extends PHPUnit_Framework_TestCase { +class init_clean_id_test extends DokuWikiTest { function teardown() { global $cache_cleanid; diff --git a/_testing/tests/inc/pageutils_getid.test.php b/_testing/tests/inc/pageutils_getid.test.php index 41cb4bd14..608760298 100644 --- a/_testing/tests/inc/pageutils_getid.test.php +++ b/_testing/tests/inc/pageutils_getid.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/utf8.php'; require_once DOKU_INC.'inc/pageutils.php'; -class init_getID_test extends PHPUnit_Framework_TestCase { +class init_getID_test extends DokuWikiTest { /** * fetch media files with basedir and urlrewrite=2 diff --git a/_testing/tests/inc/pageutils_resolve_id.test.php b/_testing/tests/inc/pageutils_resolve_id.test.php index e8cec2aef..91f8dc696 100644 --- a/_testing/tests/inc/pageutils_resolve_id.test.php +++ b/_testing/tests/inc/pageutils_resolve_id.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'inc/utf8.php'; require_once DOKU_INC.'inc/pageutils.php'; -class init_resolve_id_test extends PHPUnit_Framework_TestCase { +class init_resolve_id_test extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/pageutils_resolve_pageid.test.php b/_testing/tests/inc/pageutils_resolve_pageid.test.php index defbd2a69..32e5f841f 100644 --- a/_testing/tests/inc/pageutils_resolve_pageid.test.php +++ b/_testing/tests/inc/pageutils_resolve_pageid.test.php @@ -5,7 +5,7 @@ require_once DOKU_INC.'inc/pageutils.php'; global $conf; if (!isset($conf['datadir'])) $conf['datadir'] = $conf['savedir'].'/pages'; -class init_resolve_pageid_test extends PHPUnit_Framework_TestCase { +class init_resolve_pageid_test extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/parser/lexer.test.php b/_testing/tests/inc/parser/lexer.test.php index 4fccc6688..9b914fbd4 100644 --- a/_testing/tests/inc/parser/lexer.test.php +++ b/_testing/tests/inc/parser/lexer.test.php @@ -14,7 +14,7 @@ require_once DOKU_INC . 'inc/parser/lexer.php'; * @package Doku * @subpackage Tests */ -class TestOfLexerParallelRegex extends PHPUnit_Framework_TestCase { +class TestOfLexerParallelRegex extends DokuWikiTest { function testNoPatterns() { $regex = new Doku_LexerParallelRegex(false); @@ -120,7 +120,7 @@ class TestOfLexerParallelRegex extends PHPUnit_Framework_TestCase { } -class TestOfLexerStateStack extends PHPUnit_Framework_TestCase { +class TestOfLexerStateStack extends DokuWikiTest { function testStartState() { $stack = new Doku_LexerStateStack("one"); $this->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 = "aaa<file>bcd</file>eee"; 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 @@ <?php require_once DOKU_INC.'inc/init.php'; -class search_test extends PHPUnit_Framework_TestCase { +class search_test extends DokuWikiTest { function strip_index_data($entry) { $n_entry = array(); foreach(array('id', 'type', 'level', 'open') as $k) { diff --git a/_testing/tests/inc/utf8_correctidx.test.php b/_testing/tests/inc/utf8_correctidx.test.php index 694cf9a21..5c37627b6 100644 --- a/_testing/tests/inc/utf8_correctidx.test.php +++ b/_testing/tests/inc/utf8_correctidx.test.php @@ -3,7 +3,7 @@ if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); require_once DOKU_INC.'inc/utf8.php'; -class utf8_correctidx_test extends PHPUnit_Framework_TestCase { +class utf8_correctidx_test extends DokuWikiTest { function test_singlebyte(){ diff --git a/_testing/tests/inc/utf8_html.test.php b/_testing/tests/inc/utf8_html.test.php index 9f40514fc..94acc6d6c 100644 --- a/_testing/tests/inc/utf8_html.test.php +++ b/_testing/tests/inc/utf8_html.test.php @@ -5,7 +5,7 @@ require_once DOKU_INC.'inc/utf8.php'; // use no mbstring help here if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); -class utf8_html_test extends PHPUnit_Framework_TestCase { +class utf8_html_test extends DokuWikiTest { function test_from_1byte(){ $in = 'a'; diff --git a/_testing/tests/inc/utf8_stripspecials.test.php b/_testing/tests/inc/utf8_stripspecials.test.php index 10d4eab48..532430b60 100644 --- a/_testing/tests/inc/utf8_stripspecials.test.php +++ b/_testing/tests/inc/utf8_stripspecials.test.php @@ -3,7 +3,7 @@ if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); require_once DOKU_INC.'inc/utf8.php'; -class utf8_stripspecials extends PHPUnit_Framework_TestCase { +class utf8_stripspecials extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/utf8_substr.test.php b/_testing/tests/inc/utf8_substr.test.php index b4684d4a2..19eea4eb4 100644 --- a/_testing/tests/inc/utf8_substr.test.php +++ b/_testing/tests/inc/utf8_substr.test.php @@ -3,7 +3,7 @@ if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); require_once DOKU_INC.'inc/utf8.php'; -class utf8_substr_test extends PHPUnit_Framework_TestCase { +class utf8_substr_test extends DokuWikiTest { function test1(){ diff --git a/_testing/tests/inc/utf8_unicode.test.php b/_testing/tests/inc/utf8_unicode.test.php index bbd41ae99..a34fec86d 100644 --- a/_testing/tests/inc/utf8_unicode.test.php +++ b/_testing/tests/inc/utf8_unicode.test.php @@ -5,7 +5,7 @@ require_once DOKU_INC.'inc/utf8.php'; // use no mbstring help here if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); -class utf8_unicode_test extends PHPUnit_Framework_TestCase { +class utf8_unicode_test extends DokuWikiTest { function test_from_1byte(){ $in = 'a'; diff --git a/_testing/tests/inc/utf8_utf16be.test.php b/_testing/tests/inc/utf8_utf16be.test.php index 3a939a660..0150a8e4a 100644 --- a/_testing/tests/inc/utf8_utf16be.test.php +++ b/_testing/tests/inc/utf8_utf16be.test.php @@ -5,7 +5,7 @@ require_once DOKU_INC.'inc/utf8.php'; // use no mbstring help here if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1); -class utf8_utf16be_test extends PHPUnit_Framework_TestCase { +class utf8_utf16be_test extends DokuWikiTest { // some chars from various code regions var $utf8 = '鈩ℵŁöx'; var $utf16 = "\x92\x29\x21\x35\x1\x41\x0\xf6\x0\x78"; diff --git a/_testing/tests/lib/exe/css_css_compress.test.php b/_testing/tests/lib/exe/css_css_compress.test.php index 3fbb5820d..811b0cee8 100644 --- a/_testing/tests/lib/exe/css_css_compress.test.php +++ b/_testing/tests/lib/exe/css_css_compress.test.php @@ -3,7 +3,7 @@ require_once DOKU_INC.'lib/exe/css.php'; -class css_css_compress_test extends PHPUnit_Framework_TestCase { +class css_css_compress_test extends DokuWikiTest { function test_mlcom1(){ $text = '/** diff --git a/_testing/tests/lib/exe/css_css_loadfile.test.php b/_testing/tests/lib/exe/css_css_loadfile.test.php index c1706c4a4..c89b69b2c 100644 --- a/_testing/tests/lib/exe/css_css_loadfile.test.php +++ b/_testing/tests/lib/exe/css_css_loadfile.test.php @@ -2,7 +2,7 @@ require_once DOKU_INC.'lib/exe/css.php'; -class css_css_loadfile_test extends PHPUnit_Framework_TestCase { +class css_css_loadfile_test extends DokuWikiTest { public function setUp() { $this->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. */ |