Skip to content
Snippets Groups Projects
Commit bc5021e9 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

some test fixes (down to 67 failing ones) 

darcs-hash:20051022210519-7ad00-5d4e204bd3c7cbe8a69f4c386c303e967c2d51cd.gz
parent 840583dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
_test/cases/inc/parser/lexer.group.php
+ 0
− 5
View file @ bc5021e9
......@@ -5,11 +5,6 @@
* @subpackage Tests
*/
/**
* Init
*/
require_once('./testconfig.php');
/**
* @package JPSpan
* @subpackage Tests
......
_test/cases/inc/parser/parser.group.php
+ 0
− 5
View file @ bc5021e9
......@@ -5,11 +5,6 @@
* @subpackage Tests
*/
/**
* Init
*/
require_once('./testconfig.php');
/**
* @package Dokuwiki
* @subpackage Tests
......
_test/cases/inc/parser/parser_i18n.test.php
+ 2
− 2
View file @ bc5021e9
......@@ -62,10 +62,10 @@ class TestOfDoku_Parser_i18n extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nFoo\n")),
array('p_close',array()),
array('header',array(' Iñtërnâtiônàlizætiøn ',3)),
array('header',array('Iñtërnâtiônàlizætiøn',3,5)),
array('section_open',array(3)),
array('p_open',array()),
array('cdata',array(" Bar\n")),
array('cdata',array("\n Bar\n")),
array('p_close',array()),
array('section_close',array()),
array('document_end',array()),
......
_test/cases/inc/parser/parser_preformatted.test.php
+ 52
− 7
View file @ bc5021e9
......@@ -175,15 +175,38 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
// test with PHP allowed
function testPHP() {
global $conf;
$conf['phpok'] = 1;
$this->P->addMode('php',new Doku_Parser_Mode_PHP());
$this->P->parse('Foo <php>testing</php> Bar');
$calls = array (
array('document_start',array()),
array('p_open',array()),
array('cdata',array("\n".'Foo ')),
array('p_close',array()),
array('php',array('testing')),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
// test with PHP forbidden
function testPHPno() {
global $conf;
$conf['phpok'] = 0;
$this->P->addMode('php',new Doku_Parser_Mode_PHP());
$this->P->parse('Foo <php>testing</php> Bar');
$calls = array (
array('document_start',array()),
array('p_open',array()),
array('cdata',array("\n".'Foo ')),
array('p_close',array()),
array('file',array('testing')),
array('p_open',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
......@@ -191,16 +214,39 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
// test with HTML allowed
function testHTML() {
global $conf;
$conf['htmlok'] = 1;
$this->P->addMode('html',new Doku_Parser_Mode_HTML());
$this->P->parse('Foo <html>testing</html> Bar');
$calls = array (
array('document_start',array()),
array('p_open',array()),
array('cdata',array("\n".'Foo ')),
array('p_close',array()),
array('html',array('testing')),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
// test with HTML forbidden
function testHTMLno() {
global $conf;
$conf['htmlok'] = 0;
$this->P->addMode('html',new Doku_Parser_Mode_HTML());
$this->P->parse('Foo <html>testing</html> Bar');
$calls = array (
array('document_start',array()),
array('p_open',array()),
array('cdata',array("\n".'Foo ')),
array('p_close',array()),
array('file',array('testing')),
array('p_open',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
......@@ -208,6 +254,9 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
function testPreformattedPlusHeaderAndEol() {
// Note that EOL must come after preformatted!
......@@ -224,10 +273,6 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array('Bar')),
array('p_close',array()),
array('p_open',array()),
array('p_close',array()),
array('p_open',array()),
array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
......
_test/runtests.php
+ 1
− 1
View file @ bc5021e9
......@@ -5,7 +5,7 @@ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/
define('TEST_ROOT', dirname(__FILE__));
define('TMPL_FILESCHEME_PATH', TEST_ROOT . '/filescheme/');
define('TEST_RUNNING',TRUE);
error_reporting(E_ALL);
error_reporting(E_ALL ^ E_NOTICE);
require_once 'lib/testmanager.php';
TestManager::setup();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment