From eb849bc2db046fb7c56b3c3f627b74560d8c1829 Mon Sep 17 00:00:00 2001 From: rurban Date: Wed, 22 Dec 2004 18:35:24 +0000 Subject: [PATCH] add testIncludePagePlugin loading: ADODB error with _id_cache logic git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4330 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- tests/unit/lib/DumpHtml.php | 7 ++++--- tests/unit/lib/SetupWiki.php | 25 ++++++++++++++++--------- tests/unit/test.php | 5 +++-- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/unit/lib/DumpHtml.php b/tests/unit/lib/DumpHtml.php index f1895267d..872feb400 100644 --- a/tests/unit/lib/DumpHtml.php +++ b/tests/unit/lib/DumpHtml.php @@ -1,6 +1,7 @@ setArg('pages',''); + //$request->setArg('exclude','LinkDatabase'); // this does not work with format=text => exit DumpHtmlToDir($request); $this->assertTrue(file_exists($cur_dir."/.dumphtml/HomePage.html")); } } - -?> +?> \ No newline at end of file diff --git a/tests/unit/lib/SetupWiki.php b/tests/unit/lib/SetupWiki.php index 9056dd19a..5a324de59 100644 --- a/tests/unit/lib/SetupWiki.php +++ b/tests/unit/lib/SetupWiki.php @@ -1,6 +1,6 @@ getDbh(); - $pagename = 'OldMarkupTestPage'; - $dbi->deletePage($pagename); + $dbi->purgePage($pagename); $this->assertFalse($dbi->isWikiPage($pagename)); $request->setArg('source', FindFile('pgsrc/'.$pagename)); @@ -21,16 +20,24 @@ class SetupWiki extends phpwiki_TestCase { $request->setArg('source', false); $this->assertTrue($dbi->isWikiPage($pagename)); } - + + /* PCRE memory problem (crash) with such big pages and anchored blocks */ + function testOldMarkupTestPage() { + $this->_loadPage('OldMarkupTestPage'); + } + + /* ADODB set_links _id_cache error: IncludePagePlugin => HomePage */ + function testIncludePagePlugin() { + $this->_loadPage('IncludePagePlugin'); + } + function testSetupWiki() { global $request; - //print "Purge the testbox ... "; purge_testbox(); - //print "\n"; $dbi = $request->getDbh(); - $dbi->deletePage('HomePage'); // possibly in cache + $dbi->purgePage('HomePage'); // possibly in cache $this->assertFalse($dbi->isWikiPage('HomePage')); $request->setArg('source', FindFile('pgsrc')); @@ -43,4 +50,4 @@ class SetupWiki extends phpwiki_TestCase { } } -?> +?> \ No newline at end of file diff --git a/tests/unit/test.php b/tests/unit/test.php index 9ad9e5e78..887356d48 100644 --- a/tests/unit/test.php +++ b/tests/unit/test.php @@ -332,7 +332,7 @@ function updateLevelEdit(formObj) { $option->pushContent(HTML::input($input), "WIKIAUTH_".$s, HTML::br()); } $form->pushContent(HTML::td($option)); - + unset($input); $option = HTML::div(array('class' => 'option'), 'defines: ', HTML::br()); if (!empty($GLOBALS['define'])) @@ -347,11 +347,12 @@ function updateLevelEdit(formObj) { $table = HTML::form(array('action' => $_SERVER['PHP_SELF'], 'method' => 'GET', 'accept-charset' => $GLOBALS['charset']), - HiddenInputs(array('start_debug' => $start_debug)), $js, HTML::table(HTML::tr(array('valign'=>'top'), $form)), HTML::input(array('type' => 'submit')), HTML::input(array('type' => 'reset'))); + if ($start_debug) + $table->pushContent(HiddenInputs(array('start_debug' => $start_debug))); return $table->printXml(); } -- 2.45.0