From 91d273a7dd9a113da47a96c4618bbfaae74b331d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Jan 2012 07:02:41 -0800
Subject: [PATCH] Slightly improve Arcanist unit test output messages

Summary:
  - Show file/line so you can tell which assertion failed if there's a block
with a zillion of them and they don't have messages.
  - Try to format stuff a little better.

Test Plan:   - Ran some failing unit tests.

Reviewers: btrahan, jungejason

Reviewed By: btrahan

CC: aran, btrahan

Differential Revision: https://secure.phabricator.com/D1304
---
 .../testcase/ArcanistPhutilTestCase.php       | 35 ++++++++++++++-----
 src/unit/engine/phutil/testcase/__init__.php  |  3 ++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php b/src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php
index 2b8b8c27..a7e6e1f7 100644
--- a/src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php
+++ b/src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,17 +57,36 @@ abstract class ArcanistPhutilTestCase {
       return;
     }
 
-    if (is_array($expect)) {
-      $expect = print_r($expect, true);
+    $expect = PhutilReadableSerializer::printableValue($expect);
+    $result = PhutilReadableSerializer::printableValue($result);
+
+    $where = debug_backtrace();
+    $where = array_shift($where);
+
+    $line = idx($where, 'line');
+    $file = basename(idx($where, 'file'));
+
+    $output = "Assertion failed at line {$line} in {$file}";
+
+    if ($message) {
+      $output .= ": {$message}";
     }
 
-    if (is_array($result)) {
-      $result = print_r($result, true);
+    $output .= "\n";
+
+    if (strpos($expect, "\n") !== false) {
+      $expect = "\n{$expect}";
     }
 
-    $message = "Values {$expect} and {$result} differ: {$message}";
-    $this->failTest($message);
-    throw new ArcanistPhutilTestTerminatedException($message);
+    if (strpos($result, "\n") !== false) {
+      $result = "\n{$result}";
+    }
+
+    $output .= "Expected: {$expect}\n";
+    $output .= "Actual: {$result}";
+
+    $this->failTest($output);
+    throw new ArcanistPhutilTestTerminatedException($output);
   }
 
 
diff --git a/src/unit/engine/phutil/testcase/__init__.php b/src/unit/engine/phutil/testcase/__init__.php
index 7f7dbd12..6a8819e9 100644
--- a/src/unit/engine/phutil/testcase/__init__.php
+++ b/src/unit/engine/phutil/testcase/__init__.php
@@ -9,5 +9,8 @@
 phutil_require_module('arcanist', 'unit/engine/phutil/testcase/exception');
 phutil_require_module('arcanist', 'unit/result');
 
+phutil_require_module('phutil', 'readableserializer');
+phutil_require_module('phutil', 'utils');
+
 
 phutil_require_source('ArcanistPhutilTestCase.php');