Various fixes:

Edward Z. Yang · Edward Z. Yang · commit a4181a80d718 · 2008-04-15T03:33:09.000Z
- Resync standalone with includes - Fix error queue code - Fix heisenbug with flush and certain definition error messages - Fix premature $end in ini files - Make $php config variable actually do something git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1659 48356398-32a2-884e-a903-53898d9a118a
diff --git a/maintenance/generate-standalone.php b/maintenance/generate-standalone.php
@@ -133,12 +133,15 @@ function replace_includes_callback($matches) {
 
 // data files
 $FS->mkdirr('standalone/HTMLPurifier/DefinitionCache/Serializer');
-make_dir_standalone('HTMLPurifier/EntityLookup');
+make_file_standalone('HTMLPurifier/EntityLookup/entities.ser');
 make_file_standalone('HTMLPurifier/ConfigSchema/schema.ser');
 
 // non-standard inclusion setup
+make_dir_standalone('HTMLPurifier/ConfigSchema');
 make_dir_standalone('HTMLPurifier/Language');
 make_dir_standalone('HTMLPurifier/Filter');
+make_dir_standalone('HTMLPurifier/Printer');
+make_file_standalone('HTMLPurifier/Printer.php');
 make_file_standalone('HTMLPurifier/Lexer/PH5P.php');
 make_file_standalone('HTMLPurifier/Lexer/PEARSax3.php');
 
diff --git a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
@@ -71,9 +71,10 @@ function testAlternateWrapper() {
     }
     
     function testError() {
-        // $this->expectError('Cannot use non-block element as block wrapper');
+        $this->expectError('Cannot use non-block element as block wrapper');
         $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
         $this->config->set('HTML', 'BlockWrapper', 'dav');
+        $this->config->set('Cache', 'DefinitionImpl', null);
         $this->assertResult('Needs wrap', '<p>Needs wrap</p>');
     }
     
diff --git a/tests/HTMLPurifier/ConfigTest-create.ini b/tests/HTMLPurifier/ConfigTest-create.ini
@@ -1,2 +1,2 @@
 [Cake]
-Sprinkles = 42
+Sprinkles = 42
diff --git a/tests/HTMLPurifier/ConfigTest-finalize.ini b/tests/HTMLPurifier/ConfigTest-finalize.ini
@@ -1,2 +1,2 @@
 [Poem]
-Meter = alexandrine
+Meter = alexandrine
diff --git a/tests/HTMLPurifier/ConfigTest-loadIni.ini b/tests/HTMLPurifier/ConfigTest-loadIni.ini
@@ -1,4 +1,4 @@
 [Shortcut]
 Copy = q
 Cut = t
-Paste = p
+Paste = p
diff --git a/tests/HTMLPurifier/Strategy/FixNestingTest.php b/tests/HTMLPurifier/Strategy/FixNestingTest.php
@@ -106,7 +106,8 @@ function testRemoveBlockNodeInInlineRootNode() {
    function testInvalidParentError() {
         // test fallback to div
         $this->config->set('HTML', 'Parent', 'obviously-impossible');
-        // $this->expectError('Cannot use unrecognized element as parent');
+        $this->config->set('Cache', 'DefinitionImpl', null);
+        $this->expectError('Cannot use unrecognized element as parent');
         $this->assertResult('<div>Accept</div>');
     }
     
diff --git a/tests/common.php b/tests/common.php
@@ -215,9 +215,8 @@ function htmlpurifier_flush($php, $reporter) {
 function htmlpurifier_dump_error_queue() {
     $context = SimpleTest::getContext();
     $queue = $context->get('SimpleErrorQueue');
-    if ($queue && !empty($queue->_queue)) {
-        // replace this with something prettier
-        var_dump($queue->_queue);
+    while (($error = $queue->extract()) !== false) {
+        var_dump($error);
     }
 }
 register_shutdown_function('htmlpurifier_dump_error_queue');
diff --git a/tests/index.php b/tests/index.php
@@ -25,6 +25,8 @@
 define('HTMLPURIFIER_SCHEMA_STRICT', true); // validate schemas
 chdir(dirname(__FILE__));
 
+$php = 'php'; // for safety
+
 require 'common.php';
 
 $AC = array(); // parameters
@@ -33,7 +35,7 @@
 $AC['file'] = '';
 $AC['xml'] = false;
 $AC['dry'] = false;
-$AC['php'] = 'php';
+$AC['php'] = $php;
 
 // Convenience parameters for running quicker tests; ideally all tests
 // should be performed.
diff --git a/tests/multitest.php b/tests/multitest.php
@@ -24,6 +24,8 @@
  */
 
 define('HTMLPurifierTest', 1);
+$php = 'php'; // for safety
+
 require_once 'common.php';
 
 if (!SimpleReporter::inCli()) {
@@ -37,7 +39,7 @@
 $AC['file']  = '';
 $AC['xml']   = false;
 $AC['quiet'] = false;
-$AC['php'] = 'php';
+$AC['php'] = $php;
 $AC['disable-phpt'] = false;
 $AC['only-phpt'] = false;
 $aliases = array(
@@ -80,15 +82,15 @@
     }
     if (!$AC['only-phpt']) {
         if (!$AC['exclude-normal']) {
-            $test->addTestCase(
+            $test->add(
                 new CliTestCase(
                     "$phpv $version index.php --xml $flush --disable-phpt $file",
                     $AC['quiet'], $size
                 )
             );
         }
         if (!$AC['exclude-standalone']) {
-            $test->addTestCase(
+            $test->add(
                 new CliTestCase(
                     "$phpv $version index.php --xml $flush --standalone --disable-phpt $file",
                     $AC['quiet'], $size
@@ -97,7 +99,7 @@
         }
     }
     if (!$AC['disable-phpt']) { // naming is not consistent
-        $test->addTestCase(
+        $test->add(
             new CliTestCase(
                 $AC['php'] . " index.php --xml --php \"$phpv $version\" --only-phpt",
                 $AC['quiet'], $size
@@ -108,8 +110,6 @@
 
 // This is the HTML Purifier website's test XML file. We could
 // add more websites, i.e. more configurations to test.
-$test->addTestCase(new RemoteTestCase('http://htmlpurifier.org/dev/tests/?xml=1', 'http://htmlpurifier.org/dev/tests/?xml=1&dry=1&flush=1'));
+// $test->add(new RemoteTestCase('http://htmlpurifier.org/dev/tests/?xml=1', 'http://htmlpurifier.org/dev/tests/?xml=1&dry=1&flush=1'));
 
 $test->run($reporter);
-
-shell_exec($AC['php'] . ' ../maintenance/flush-definition-cache.php');

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,10 @@ function testAlternateWrapper() {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`function testError() {`
`74`		`- // $this->expectError('Cannot use non-block element as block wrapper');`
	`74`	`+ $this->expectError('Cannot use non-block element as block wrapper');`
`75`	`75`	`$this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div \| p');`
`76`	`76`	`$this->config->set('HTML', 'BlockWrapper', 'dav');`
	`77`	`+ $this->config->set('Cache', 'DefinitionImpl', null);`
`77`	`78`	`$this->assertResult('Needs wrap', '<p>Needs wrap</p>');`
`78`	`79`	`}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[Cake]`
`2`		`-Sprinkles = 42`
	`2`	`+Sprinkles = 42`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[Poem]`
`2`		`-Meter = alexandrine`
	`2`	`+Meter = alexandrine`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ function testRemoveBlockNodeInInlineRootNode() {`
`106`	`106`	`function testInvalidParentError() {`
`107`	`107`	`// test fallback to div`
`108`	`108`	`$this->config->set('HTML', 'Parent', 'obviously-impossible');`
`109`		`- // $this->expectError('Cannot use unrecognized element as parent');`
	`109`	`+ $this->config->set('Cache', 'DefinitionImpl', null);`
	`110`	`+ $this->expectError('Cannot use unrecognized element as parent');`
`110`	`111`	`$this->assertResult('<div>Accept</div>');`
`111`	`112`	`}`
`112`	`113`
Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,8 @@ function htmlpurifier_flush($php, $reporter) {`
`215`	`215`	`function htmlpurifier_dump_error_queue() {`
`216`	`216`	`$context = SimpleTest::getContext();`
`217`	`217`	`$queue = $context->get('SimpleErrorQueue');`
`218`		`- if ($queue && !empty($queue->_queue)) {`
`219`		`- // replace this with something prettier`
`220`		`- var_dump($queue->_queue);`
	`218`	`+ while (($error = $queue->extract()) !== false) {`
	`219`	`+ var_dump($error);`
`221`	`220`	`}`
`222`	`221`	`}`
`223`	`222`	`register_shutdown_function('htmlpurifier_dump_error_queue');`