Changeset 106567 in spip-zone

Timestamp:

Oct 8, 2017, 3:52:01 PM (3 years ago)

Author:

cedric@…

Message:

Attention, si la fonction de test fourni un resultat qui est un preg pour tester le resultat, il ne faut pas afficher de diff, ca n'a aucun sens

File:

• _core_/tests/test.inc (modified) (4 diffs)

_core_/tests/test.inc

@@ -91 +91 @@
                 }
                 $ok = false;
-                #var_dump($res);
+                $expected = null;
+                $affdiff =  true;
                 if (is_array($ess) and is_array($ess[0]) and isset($ess[0][0])
                         && is_string($ess[0][0]) && function_exists($ess[0][0]) && isset($ess[0][1]) && isset($ess[0][2])) {
                         $ok = ($ess[0][0]($ess[0][1],$res)==$ess[0][2]);
+                        $expected = $ess[0][0]."(".sql_quote($ess[0][1]).", \$res) == " . sql_quote($ess[0][2]);
+                        $affdiff = false;
                 } else {
                         $ok = test_equality($res,$ess[0]);
@@ -105 +108 @@
                                 $erritem_args[] = htmlspecialchars(var_export($ess[$iarg], true));
                         }
+                        $opts['affdiff'] = $affdiff;
                         $err[] = display_error(
                           $titre,
                                 "$fun(". join($erritem_args,', ') . ")",
                                 $res,
-                                $ess[0],
+                                $expected ? $expected : $ess[0],
                                 $opts
                         );
@@ -129 +133 @@
                 // l'enrobage de sortie
                 list($bef, $mid, $end) = explode('@', $out);
+        }
+        $affdiff = true;
+        if (isset($opts['affdiff'])) {
+                $affdiff = $opts['affdiff'];
         }
 
@@ -155 +163 @@
           . "<pre>$call</pre>"
           . "<table style='width:100%;'><tr><th>diff</th><th>attendu</th><th>resultat</th></tr><tr>"
-          . "<td><pre>".$diff->renderDiffToHTML()."</pre></td>"
+          . "<td><pre>".( $affdiff ? $diff->renderDiffToHTML() : $affdiff )."</pre></td>"
           . '<td><pre>' . htmlspecialchars(var_export($expected, true))."</pre></td>"
                 . '<td><pre>' . htmlspecialchars(var_export($result, true))."</pre></td>"