com php-src: ext/tidy: fix non-deterministic expected output in two tests.: ext/tidy/tests/010.phpt ext/tidy/tests/012.phpt

From: Date: Mon, 11 Jul 2016 12:05:43 +0000
Subject: com php-src: ext/tidy: fix non-deterministic expected output in two tests.: ext/tidy/tests/010.phpt ext/tidy/tests/012.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92925@lists.php.net to get a copy of this message
Commit: 08b10f17f1794e0bee209383b505d4c66bf5f39e Author: Michael Orlitzky <michael@orlitzky.com> Thu, 9 Jun 2016 23:12:17 -0400 Committer: Anatol Belski <ab@php.net> Mon, 11 Jul 2016 14:05:43 +0200 Parents: 0e3e132a8affa976ef86cce051ba94f8bb43e147 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08b10f17f1794e0bee209383b505d4c66bf5f39e Log: ext/tidy: fix non-deterministic expected output in two tests. Some of the tidy tests expect output that can change. The motivating example is an object "id" that is some integer, but no integer in particular. Those hard-coded values have been changed to accept any integer so that the test suite passes when tidy-html5 is used. Changed paths: M ext/tidy/tests/010.phpt M ext/tidy/tests/012.phpt Diff: diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt index 85d9df5..695e1c9 100644 --- a/ext/tidy/tests/010.phpt +++ b/ext/tidy/tests/010.phpt @@ -11,7 +11,7 @@ var_dump($a->html()); var_dump($a->head()); ?> ---EXPECT-- +--EXPECTF-- object(tidyNode)#2 (8) { ["value"]=> string(94) "<html> @@ -100,7 +100,7 @@ object(tidyNode)#2 (8) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -231,7 +231,7 @@ object(tidyNode)#2 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -307,7 +307,7 @@ object(tidyNode)#2 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt index 39ce22b..e86aa6c 100644 --- a/ext/tidy/tests/012.phpt +++ b/ext/tidy/tests/012.phpt @@ -30,7 +30,7 @@ Accessing children nodes dump_nodes($html); ?> ---EXPECT-- +--EXPECTF-- bool(true) object(tidyNode)#3 (9) { ["value"]=> @@ -70,7 +70,7 @@ object(tidyNode)#3 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -94,7 +94,7 @@ object(tidyNode)#4 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(111) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -222,7 +222,7 @@ object(tidyNode)#5 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -365,7 +365,7 @@ object(tidyNode)#8 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=> @@ -426,7 +426,7 @@ object(tidyNode)#10 (9) { ["proprietary"]=> bool(false) ["id"]=> - int(114) + int(%i) ["attribute"]=> NULL ["child"]=>

« previous php.cvs (#92925) next »