From 23b3dd7e9529d1724efdd6e5ae8c9e59ff71efea Mon Sep 17 00:00:00 2001 From: vrana Date: Sun, 17 Jun 2012 08:13:40 -0700 Subject: [PATCH] Display number of assertions in unit test details Test Plan: Show Full Unit Results on this diff. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D2777 --- scripts/__init_script__.php | 5 +++++ src/unit/engine/phutil/ArcanistPhutilTestCase.php | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php index 70708eca..38c6e4ed 100644 --- a/scripts/__init_script__.php +++ b/scripts/__init_script__.php @@ -62,6 +62,11 @@ PhutilTranslator::getInstance() ), 'line(s)' => array('line', 'lines'), + + '%d assertion(s) passed.' => array( + '%d assertion passed.', + '%d assertions passed.', + ), )); phutil_load_library(dirname(dirname(__FILE__)).'/src/'); diff --git a/src/unit/engine/phutil/ArcanistPhutilTestCase.php b/src/unit/engine/phutil/ArcanistPhutilTestCase.php index cea863d0..e0ec47d8 100644 --- a/src/unit/engine/phutil/ArcanistPhutilTestCase.php +++ b/src/unit/engine/phutil/ArcanistPhutilTestCase.php @@ -28,6 +28,7 @@ */ abstract class ArcanistPhutilTestCase { + private $assertions = 0; private $runningTest; private $testStartTime; private $results = array(); @@ -59,6 +60,7 @@ abstract class ArcanistPhutilTestCase { */ final protected function assertEqual($expect, $result, $message = null) { if ($expect === $result) { + $this->assertions++; return; } @@ -422,6 +424,7 @@ abstract class ArcanistPhutilTestCase { $name = $method->getName(); if (preg_match('/^test/', $name)) { $this->runningTest = $name; + $this->assertions = 0; $this->testStartTime = microtime(true); try { @@ -433,7 +436,7 @@ abstract class ArcanistPhutilTestCase { call_user_func_array( array($this, $name), array()); - $this->passTest("All assertions passed."); + $this->passTest(pht('%d assertion(s) passed.', $this->assertions)); } catch (Exception $ex) { $test_exception = $ex; }