Changeset 106567 in spip-zone
- Timestamp:
- Oct 8, 2017, 3:52:01 PM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
_core_/tests/test.inc
r104117 r106567 91 91 } 92 92 $ok = false; 93 #var_dump($res); 93 $expected = null; 94 $affdiff = true; 94 95 if (is_array($ess) and is_array($ess[0]) and isset($ess[0][0]) 95 96 && is_string($ess[0][0]) && function_exists($ess[0][0]) && isset($ess[0][1]) && isset($ess[0][2])) { 96 97 $ok = ($ess[0][0]($ess[0][1],$res)==$ess[0][2]); 98 $expected = $ess[0][0]."(".sql_quote($ess[0][1]).", \$res) == " . sql_quote($ess[0][2]); 99 $affdiff = false; 97 100 } else { 98 101 $ok = test_equality($res,$ess[0]); … … 105 108 $erritem_args[] = htmlspecialchars(var_export($ess[$iarg], true)); 106 109 } 110 $opts['affdiff'] = $affdiff; 107 111 $err[] = display_error( 108 112 $titre, 109 113 "$fun(". join($erritem_args,', ') . ")", 110 114 $res, 111 $e ss[0],115 $expected ? $expected : $ess[0], 112 116 $opts 113 117 ); … … 129 133 // l'enrobage de sortie 130 134 list($bef, $mid, $end) = explode('@', $out); 135 } 136 $affdiff = true; 137 if (isset($opts['affdiff'])) { 138 $affdiff = $opts['affdiff']; 131 139 } 132 140 … … 155 163 . "<pre>$call</pre>" 156 164 . "<table style='width:100%;'><tr><th>diff</th><th>attendu</th><th>resultat</th></tr><tr>" 157 . "<td><pre>". $diff->renderDiffToHTML()."</pre></td>"165 . "<td><pre>".( $affdiff ? $diff->renderDiffToHTML() : $affdiff )."</pre></td>" 158 166 . '<td><pre>' . htmlspecialchars(var_export($expected, true))."</pre></td>" 159 167 . '<td><pre>' . htmlspecialchars(var_export($result, true))."</pre></td>"
Note: See TracChangeset
for help on using the changeset viewer.