Strip newlines from exception messages for more concise failures

Author: jmikola

tests/utils/tools.php

@@ -243,13 +243,15 @@ function throws($function, $exceptionname, $infunction = null) {
                 if (strcasecmp($function, $infunction) == 0) {
                     printf("OK: Got %s thrown from %s\n", $exceptionname, $infunction);
                 } else {
-                    printf("ALMOST: Got %s - but was thrown in %s, not %s (%s)\n", $exceptionname, $function, $infunction, $e->getMessage());
+                    $message = str_replace(array("\n", "\r", ' ', $e->getMessage()));
+                    printf("ALMOST: Got %s - but was thrown in %s, not %s (%s)\n", $exceptionname, $function, $infunction, $message);
                 }
                 return $e->getMessage();
             }
             printf("OK: Got %s\n", $exceptionname);
         } else {
-            printf("ALMOST: Got %s - expected %s: %s\n", get_class($e), $exceptionname, $e->getMessage());
+            $message = str_replace(array("\n", "\r", ' ', $e->getMessage()));
+            printf("ALMOST: Got %s - expected %s: %s\n", get_class($e), $exceptionname, $message);
         }
         return $e->getMessage();
     }