From 391e4f31e3f0e7935a46431783896153156a65eb Mon Sep 17 00:00:00 2001 From: Technosophos Date: Mon, 15 Apr 2013 17:47:58 -0500 Subject: Unit tests for DOCTYPE are all passing. --- test/HTML5/Parser/EventStack.php | 2 +- test/HTML5/Parser/TokenizerTest.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/HTML5/Parser/EventStack.php b/test/HTML5/Parser/EventStack.php index 24bd144..e865507 100644 --- a/test/HTML5/Parser/EventStack.php +++ b/test/HTML5/Parser/EventStack.php @@ -35,7 +35,7 @@ class EventStack implements EventHandler { } public function doctype($name, $type = 0, $id = NULL, $quirks = FALSE) { - $args = func_get_args(); + $args = array($name, $type, $id, $quirks); $this->store('doctype', $args); } diff --git a/test/HTML5/Parser/TokenizerTest.php b/test/HTML5/Parser/TokenizerTest.php index 349b713..fb33e37 100644 --- a/test/HTML5/Parser/TokenizerTest.php +++ b/test/HTML5/Parser/TokenizerTest.php @@ -227,7 +227,7 @@ class TokenizerTest extends \HTML5\Tests\TestCase { foreach ($good as $test => $expects) { $events = $this->parse($test); - $this->assertEquals(2, $events->depth(), "Counting events for '$test'"); + $this->assertEquals(2, $events->depth(), "Counting events for '$test': " . print_r($events, TRUE)); $this->assertEventEquals('doctype', $expects, $events->get(0)); } @@ -239,16 +239,20 @@ class TokenizerTest extends \HTML5\Tests\TestCase { '' => array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), '' => array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), ' array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), - ' array('foo', EventStack::DOCTYPE_PUBLIC, NULL, TRUE), - '' => array('foo', EventStack::DOCTYPE_PUBLIC, NULL, TRUE), - ' array('foo', EventStack::DOCTYPE_SYSTEM, NULL, TRUE), - '' => array('foo', EventStack::DOCTYPE_SYSTEM, NULL, TRUE), + + // Can't tell whether these are ids or ID types, since the context is chopped. + ' array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), + '' => array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), + ' array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), + '' => array('foo', EventStack::DOCTYPE_NONE, NULL, TRUE), + ' array('html', EventStack::DOCTYPE_SYSTEM, 'foo bar', TRUE), '' => array('html', EventStack::DOCTYPE_SYSTEM, 'foo bar', TRUE), ); foreach ($bad as $test => $expects) { $events = $this->parse($test); - $this->assertEquals(3, $events->depth(), "Counting events for '$test'"); + //fprintf(STDOUT, $test . PHP_EOL); + $this->assertEquals(3, $events->depth(), "Counting events for '$test': " . print_r($events, TRUE)); $this->assertEventError($events->get(0)); $this->assertEventEquals('doctype', $expects, $events->get(1)); } -- cgit v1.2.3