diff options
Diffstat (limited to '_test')
| -rw-r--r-- | _test/cases/inc/auth_aclcheck.test.php | 17 | ||||
| -rw-r--r-- | _test/cases/inc/common_cleanText.test.php | 8 | ||||
| -rw-r--r-- | _test/cases/inc/common_pagetemplate.test.php | 3 | ||||
| -rw-r--r-- | _test/cases/inc/difference_engine.test.php (renamed from _test/cases/inc/DifferenceEngine.test.php) | 0 | ||||
| -rw-r--r-- | _test/cases/inc/form_form.test.php | 3 | ||||
| -rw-r--r-- | _test/cases/inc/ixr_library_date.test.php (renamed from _test/cases/inc/IXR_Library_date.test.php) | 2 | ||||
| -rw-r--r-- | _test/cases/inc/ixr_library_ixr_message.test.php (renamed from _test/cases/inc/IXR_Library_IXR_Message.test.php) | 1 | ||||
| -rw-r--r-- | _test/cases/inc/mail_isvalid.test.php | 2 | ||||
| -rw-r--r-- | _test/cases/inc/mail_quoted_printable_encode.test.php (renamed from _test/cases/inc/mail_quoted_printable_encode.php) | 0 | ||||
| -rw-r--r-- | _test/cases/inc/parser/xhtml_links.test.php | 1 |
10 files changed, 26 insertions, 11 deletions
diff --git a/_test/cases/inc/auth_aclcheck.test.php b/_test/cases/inc/auth_aclcheck.test.php index ff092c2de..3cf6a59c7 100644 --- a/_test/cases/inc/auth_aclcheck.test.php +++ b/_test/cases/inc/auth_aclcheck.test.php @@ -2,14 +2,27 @@ 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 UnitTestCase { + var $oldConf; + var $oldAuthAcl; + + function setup() { + global $conf; + global $AUTH_ACL; + global $auth; + $this->oldConf = $conf; + $this->oldAuthAcl = $AUTH_ACL; + $auth = new auth_basic(); + } + function teardown() { global $conf; global $AUTH_ACL; - unset($conf); - unset($AUTH_ACL); + $conf = $this->oldConf; + $AUTH_ACL = $this->oldAuthAcl; } diff --git a/_test/cases/inc/common_cleanText.test.php b/_test/cases/inc/common_cleanText.test.php index 936ed1d76..332dbaeed 100644 --- a/_test/cases/inc/common_cleanText.test.php +++ b/_test/cases/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_clientIP_test extends UnitTestCase { +class common_cleanText extends UnitTestCase { function test_unix(){ $unix = 'one @@ -19,9 +19,9 @@ class common_clientIP_test extends UnitTestCase { two three'; - $win = 'one
- two
-
+ $win = 'one + two + three'; $this->assertEqual(bin2hex($unix),'6f6e650a2020202020202020202020202020202074776f0a0a202020202020202020202020202020207468726565'); diff --git a/_test/cases/inc/common_pagetemplate.test.php b/_test/cases/inc/common_pagetemplate.test.php index 2db8b64ae..cc89f6906 100644 --- a/_test/cases/inc/common_pagetemplate.test.php +++ b/_test/cases/inc/common_pagetemplate.test.php @@ -1,5 +1,6 @@ <?php +require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; class common_pagetemplate_test extends UnitTestCase { @@ -11,9 +12,7 @@ class common_pagetemplate_test extends UnitTestCase { 'id' => 'page-id-long', 'tpl' => '"@PAGE@" "@!PAGE@" "@!!PAGE@" "@!PAGE!@"', ); - $old = error_reporting(E_ALL & ~E_NOTICE); $this->assertEqual(parsePageTemplate($data), '"page id long" "Page id long" "Page Id Long" "PAGE ID LONG"'); - error_reporting($old); } } //Setup VIM: ex: et ts=4 : diff --git a/_test/cases/inc/DifferenceEngine.test.php b/_test/cases/inc/difference_engine.test.php index aa1756114..aa1756114 100644 --- a/_test/cases/inc/DifferenceEngine.test.php +++ b/_test/cases/inc/difference_engine.test.php diff --git a/_test/cases/inc/form_form.test.php b/_test/cases/inc/form_form.test.php index 5d5fa72af..7bffb53e2 100644 --- a/_test/cases/inc/form_form.test.php +++ b/_test/cases/inc/form_form.test.php @@ -1,7 +1,6 @@ <?php -require_once DOKU_INC.'inc/auth.php'; -require_once DOKU_INC.'inc/form.php'; +require_once DOKU_INC.'inc/init.php'; class form_test extends UnitTestCase { diff --git a/_test/cases/inc/IXR_Library_date.test.php b/_test/cases/inc/ixr_library_date.test.php index 28fa86486..2a915c0b0 100644 --- a/_test/cases/inc/IXR_Library_date.test.php +++ b/_test/cases/inc/ixr_library_date.test.php @@ -1,4 +1,6 @@ <?php + +require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/IXR_Library.php'; class ixr_library_date_test extends UnitTestCase { diff --git a/_test/cases/inc/IXR_Library_IXR_Message.test.php b/_test/cases/inc/ixr_library_ixr_message.test.php index bc9be572d..483ba2476 100644 --- a/_test/cases/inc/IXR_Library_IXR_Message.test.php +++ b/_test/cases/inc/ixr_library_ixr_message.test.php @@ -1,4 +1,5 @@ <?php +require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/IXR_Library.php'; class ixr_library_ixr_message_test extends UnitTestCase { diff --git a/_test/cases/inc/mail_isvalid.test.php b/_test/cases/inc/mail_isvalid.test.php index d8c88765e..60f1e9353 100644 --- a/_test/cases/inc/mail_isvalid.test.php +++ b/_test/cases/inc/mail_isvalid.test.php @@ -1,6 +1,6 @@ <?php // use no mbstring help here -require_once DOKU_INC.'inc/mail.php'; +require_once DOKU_INC.'inc/init.php'; class mail_isvalid extends UnitTestCase { diff --git a/_test/cases/inc/mail_quoted_printable_encode.php b/_test/cases/inc/mail_quoted_printable_encode.test.php index a5a36e35b..a5a36e35b 100644 --- a/_test/cases/inc/mail_quoted_printable_encode.php +++ b/_test/cases/inc/mail_quoted_printable_encode.test.php diff --git a/_test/cases/inc/parser/xhtml_links.test.php b/_test/cases/inc/parser/xhtml_links.test.php index a9a6dfdbc..cac5e9252 100644 --- a/_test/cases/inc/parser/xhtml_links.test.php +++ b/_test/cases/inc/parser/xhtml_links.test.php @@ -1,5 +1,6 @@ <?php if (!defined('DOKU_BASE')) define('DOKU_BASE','./'); +require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/parser/xhtml.php'; require_once DOKU_INC.'inc/pageutils.php'; |