diff --git a/Tester/NetteTestCase.php b/Tester/NetteTestCase.php index df273166..5e30d198 100644 --- a/Tester/NetteTestCase.php +++ b/Tester/NetteTestCase.php @@ -284,6 +284,7 @@ public static function compare($left, $right) '%d?%'=> '[0-9]*', // zero or more digits '%i%' => '[+-]?[0-9]+', // signed integer value '%f%' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', // floating point number + '%h%' => '[0-9a-fA-F]+',// one or more HEX digits '%[^' => '[^', // reg-exp '%[' => '[', // reg-exp ']%' => ']+', // reg-exp diff --git a/Tester/conventions.txt b/Tester/conventions.txt index e5db8615..18e91462 100644 --- a/Tester/conventions.txt +++ b/Tester/conventions.txt @@ -44,6 +44,7 @@ PHP (All test cases are valid PHP files) %d?% zero or more digits %i% signed integer value %f% floating point number + %h% one or more HEX digits %[..]% reg-exp diff --git a/Tester/initialize.php b/Tester/initialize.php index 9bf2481a..193091bd 100644 --- a/Tester/initialize.php +++ b/Tester/initialize.php @@ -203,6 +203,9 @@ public static function dump(& $var, $level = 0) } echo "\n"; + } elseif ($var instanceof Exception) { + echo 'Exception ', get_class($var), ': ', ($var->getCode() ? '#' . $var->getCode() . ' ' : '') . $var->getMessage(), "\n"; + } elseif (is_object($var)) { $arr = (array) $var; echo "object(" . get_class($var) . ") (" . count($arr) . ") ";