]> granicus.if.org Git - php/commitdiff
ext/tidy: update the configuration file test to not inspect output.
authorMichael Orlitzky <michael@orlitzky.com>
Fri, 10 Jun 2016 03:29:14 +0000 (23:29 -0400)
committerAnatol Belski <ab@php.net>
Mon, 11 Jul 2016 12:05:43 +0000 (14:05 +0200)
One of the tests for tidy (016.phpt) is testing that we can use a
configuration file (016.tcfg) instead of a string to configure
tidy. It was observing the output of an API call, which proved too
fragile now that we support tidy-html5 as well. Instead, the test was
updated to inspect $tidy->getConfig() to ensure that the config file
was actually processed and will be respected.

ext/tidy/tests/016.phpt

index 001371aa3e13e9cfc0d3982e250aafd4b9d11c90..05b7cc18f9af3db44a3d7f56fb9bf47c056b5733 100644 (file)
@@ -4,21 +4,10 @@ Passing configuration file through tidy_parse_file() (may fail with buggy libtid
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
 <?php
-        $tidy = tidy_parse_file(dirname(__FILE__)."/016.html", dirname(__FILE__)."/016.tcfg");
-       tidy_clean_repair($tidy);
-        echo tidy_get_output($tidy);
+        $tidy = tidy_parse_file(dirname(__FILE__)."/016.html",
+                                dirname(__FILE__)."/016.tcfg");
+        $cfg = $tidy->getConfig();
+        echo $cfg["clean"];
 ?>
 --EXPECT--
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-<title></title>
-
-<style type="text/css">
- p.c1 {font-weight: bold}
-</style>
-</head>
-<body>
-<p class="c1">testing</p>
-</body>
-</html>
+1