Skip to content

Commit

Permalink
use DokuWikiTest class instead of PHPUnit_Framework_TestCase
Browse files Browse the repository at this point in the history
  • Loading branch information
sarnowski committed Apr 16, 2012
1 parent 6ba4af4 commit 3899a46
Show file tree
Hide file tree
Showing 36 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion _testing/tests/inc/auth_aclcheck.test.php
Expand Up @@ -4,7 +4,7 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/auth_admincheck.test.php
Expand Up @@ -10,7 +10,7 @@ function isCaseSensitive(){
}
}

class auth_admin_test extends PHPUnit_Framework_TestCase {
class auth_admin_test extends DokuWikiTest {

private $oldauth;

Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/auth_nameencode.test.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/common_cleanText.test.php
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/common_clientip.test.php
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/common_obfuscate.test.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/common_pagetemplate.test.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/form_form.test.php
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/httpclient_http.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _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'];
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/init_getbaseurl.test.php
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/ixr_library_date.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/ixr_library_ixr_message.test.php
Expand Up @@ -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 {



Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/mail_isvalid.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/mail_quoted_printable_encode.test.php
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/pageutils_clean_id.test.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/pageutils_getid.test.php
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/pageutils_resolve_id.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/pageutils_resolve_pageid.test.php
Expand Up @@ -5,7 +5,7 @@
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(){
Expand Down
12 changes: 6 additions & 6 deletions _testing/tests/inc/parser/lexer.test.php
Expand Up @@ -14,7 +14,7 @@
* @package Doku
* @subpackage Tests
*/
class TestOfLexerParallelRegex extends PHPUnit_Framework_TestCase {
class TestOfLexerParallelRegex extends DokuWikiTest {

function testNoPatterns() {
$regex = new Doku_LexerParallelRegex(false);
Expand Down Expand Up @@ -120,7 +120,7 @@ function testMatchLookbehindNot() {
}


class TestOfLexerStateStack extends PHPUnit_Framework_TestCase {
class TestOfLexerStateStack extends DokuWikiTest {
function testStartState() {
$stack = new Doku_LexerStateStack("one");
$this->assertEquals($stack->getCurrent(), "one");
Expand Down Expand Up @@ -156,7 +156,7 @@ function b() {
}
}

class TestOfLexer extends PHPUnit_Framework_TestCase {
class TestOfLexer extends DokuWikiTest {
function testNoPatterns() {
$handler = $this->getMock('TestParser');
$handler->expects($this->never())->method('accept');
Expand Down Expand Up @@ -208,7 +208,7 @@ function testMultiplePattern() {
}
}

class TestOfLexerModes extends PHPUnit_Framework_TestCase {
class TestOfLexerModes extends DokuWikiTest {
function testIsolatedPattern() {
$handler = $this->getMock('TestParser');
$handler->expects($this->at(0))->method('a')
Expand Down Expand Up @@ -333,7 +333,7 @@ function testUnwindTooFar() {
}
}

class TestOfLexerHandlers extends PHPUnit_Framework_TestCase {
class TestOfLexerHandlers extends DokuWikiTest {
function testModeMapping() {
$handler = $this->getMock('TestParser');
$handler->expects($this->at(0))->method('a')
Expand Down Expand Up @@ -371,7 +371,7 @@ function ignore() {}
function caught() {}
}

class TestOfLexerByteIndices extends PHPUnit_Framework_TestCase {
class TestOfLexerByteIndices extends DokuWikiTest {

function testIndex() {
$doc = "aaa<file>bcd</file>eee";
Expand Down
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/remote.test.php
Expand Up @@ -114,7 +114,7 @@ function publicCall() {return true;}
}


class remote_test extends PHPUnit_Framework_TestCase {
class remote_test extends DokuWikiTest {

var $originalConf;
var $userinfo;
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/safefn.test.php
Expand Up @@ -4,7 +4,7 @@
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(){
Expand Down
2 changes: 1 addition & 1 deletion _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) {
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_correctidx.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_html.test.php
Expand Up @@ -5,7 +5,7 @@
// 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';
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_stripspecials.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_substr.test.php
Expand Up @@ -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(){
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_unicode.test.php
Expand Up @@ -5,7 +5,7 @@
// 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';
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/inc/utf8_utf16be.test.php
Expand Up @@ -5,7 +5,7 @@
// 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";
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/lib/exe/css_css_compress.test.php
Expand Up @@ -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 = '/**
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/lib/exe/css_css_loadfile.test.php
Expand Up @@ -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');
}
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/lib/exe/js_js_compress.test.php
Expand Up @@ -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 = '/**
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/testing/inttests_globals.test.php
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/testing/inttests_hooks.test.php
Expand Up @@ -3,7 +3,7 @@
/**
* @group integration
*/
class InttestsHooksTest extends PHPUnit_Framework_TestCase {
class InttestsHooksTest extends DokuWikiTest {

function testHookTriggering() {
$request = new TestRequest();
Expand Down
2 changes: 1 addition & 1 deletion _testing/tests/testing/inttests_scope.test.php
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 3899a46

Please sign in to comment.