diff options
| author | Asmir Mustafic <[email protected]> | 2014-07-08 10:40:06 +0200 |
|---|---|---|
| committer | Asmir Mustafic <[email protected]> | 2014-07-08 10:40:06 +0200 |
| commit | 072da11763d0188e0dad12335c85f43fe6fcf9b2 (patch) | |
| tree | 3fd78a6a15d775099e5561a169273c1a5953aa44 /test | |
| parent | 7c176539423d7e1acd0e5191855bdee8f0ed1a37 (diff) | |
Removed xmlns workaround, using a different method, that supports XMLNS
declarations
Diffstat (limited to 'test')
| -rw-r--r-- | test/HTML5/Parser/DOMTreeBuilderTest.php | 23 | ||||
| -rw-r--r-- | test/HTML5/Serializer/OutputRulesTest.php | 37 |
2 files changed, 36 insertions, 24 deletions
diff --git a/test/HTML5/Parser/DOMTreeBuilderTest.php b/test/HTML5/Parser/DOMTreeBuilderTest.php index c1b19e5..5227c40 100644 --- a/test/HTML5/Parser/DOMTreeBuilderTest.php +++ b/test/HTML5/Parser/DOMTreeBuilderTest.php @@ -157,17 +157,22 @@ class DOMTreeBuilderTest extends \Masterminds\HTML5\Tests\TestCase $dom = $this->parse( '<!DOCTYPE html><html> <body xmlns:x="http://www.prefixed.com" id="body"> - <a id="bar1" xmlns="bar1"> - <b id="bar4" xmlns="bar4"><x:prefixed id="prefixed"/></b> + <a id="bar1" xmlns="http://www.prefixed.com/bar1"> + <b id="bar4" xmlns="http://www.prefixed.com/bar4"><x:prefixed id="prefixed"/></b> </a> <svg id="svg"></svg> - <c id="bar2" xmlns="bar2"></c> + <c id="bar2" xmlns="http://www.prefixed.com/bar2"></c> <div id="div"></div> <d id="bar3"></d> + <xn:d xmlns:xn="http://www.prefixed.com/xn" xmlns="http://www.prefixed.com/bar5_x" id="bar5"><x id="bar5_x"/></xn:d> </body> </html>', array( 'xmlNamespaces' => true )); + + + $this->assertEmpty($this->errors); + $div = $dom->getElementById('div'); $this->assertEquals('http://www.w3.org/1999/xhtml', $div->namespaceURI); @@ -175,22 +180,28 @@ class DOMTreeBuilderTest extends \Masterminds\HTML5\Tests\TestCase $this->assertEquals('http://www.w3.org/1999/xhtml', $body->namespaceURI); $bar1 = $dom->getElementById('bar1'); - $this->assertEquals('bar1', $bar1->namespaceURI); + $this->assertEquals('http://www.prefixed.com/bar1', $bar1->namespaceURI); $bar2 = $dom->getElementById('bar2'); - $this->assertEquals("bar2", $bar2->namespaceURI); + $this->assertEquals("http://www.prefixed.com/bar2", $bar2->namespaceURI); $bar3 = $dom->getElementById('bar3'); $this->assertEquals("http://www.w3.org/1999/xhtml", $bar3->namespaceURI); $bar4 = $dom->getElementById('bar4'); - $this->assertEquals("bar4", $bar4->namespaceURI); + $this->assertEquals("http://www.prefixed.com/bar4", $bar4->namespaceURI); $svg = $dom->getElementById('svg'); $this->assertEquals("http://www.w3.org/2000/svg", $svg->namespaceURI); $prefixed = $dom->getElementById('prefixed'); $this->assertEquals("http://www.prefixed.com", $prefixed->namespaceURI); + + $prefixed = $dom->getElementById('bar5'); + $this->assertEquals("http://www.prefixed.com/xn", $prefixed->namespaceURI); + + $prefixed = $dom->getElementById('bar5_x'); + $this->assertEquals("http://www.prefixed.com/bar5_x", $prefixed->namespaceURI); } public function testAttributes() diff --git a/test/HTML5/Serializer/OutputRulesTest.php b/test/HTML5/Serializer/OutputRulesTest.php index f12acbb..df33faa 100644 --- a/test/HTML5/Serializer/OutputRulesTest.php +++ b/test/HTML5/Serializer/OutputRulesTest.php @@ -119,21 +119,24 @@ class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase 'xmlNamespaces' => true )); - $source = '<!DOCTYPE html> -<html><body xmlns:x="http://www.prefixed.com" id="body"> - <a id="bar1" xmlns="bar1"> - <b id="bar4" xmlns="bar4"><x:prefixed id="prefixed">x</x:prefixed></b> - </a> - <svg id="svg">xx</svg> - <c id="bar2" xmlns="bar2">xx</c> - <div id="div">xx</div> - <d id="bar3">xx</d></body> -</html> -'; + $source = ' + <!DOCTYPE html> + <html><body id="body" xmlns:x="http://www.prefixed.com"> + <a id="bar1" xmlns="http://www.prefixed.com/bar1"> + <b id="bar4" xmlns="http://www.prefixed.com/bar4"><x:prefixed id="prefixed">xy</x:prefixed></b> + </a> + <svg id="svg">svg</svg> + <c id="bar2" xmlns="http://www.prefixed.com/bar2"></c> + <div id="div"></div> + <d id="bar3"></d> + <xn:d id="bar5" xmlns="http://www.prefixed.com/bar5_x" xmlns:xn="http://www.prefixed.com/xn"><x id="bar5_x">y</x></xn:d> + </body> + </html>'; $dom = $this->html5->loadHTML($source, array( 'xmlNamespaces' => true )); + $this->assertFalse($this->html5->hasErrors(), print_r($this->html5->getErrors(), 1)); $stream = fopen('php://temp', 'w'); $r = new OutputRules($stream, $this->html5->getOptions()); @@ -142,13 +145,11 @@ class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase $t->walk(); $rendered = stream_get_contents($stream, - 1, 0); - $this->assertEquals(str_replace(array( - "\n", - "\r" - ), "", $rendered), str_replace(array( - "\n", - "\r" - ), "", $source)); + $clear = function($s){ + return trim(preg_replace('/[\s]+/', " ", $s)); + }; + + $this->assertEquals($clear($source), $clear($rendered)); } public function testElementWithScript() |