Changeset 106

Timestamp:

01/09/08 00:08:16 (12 months ago)

Author:

iteman

Message:

- Refactored.

Files:

• trunk/src/Stagehand/TestRunner/PHPSpec/Reporter.php (modified) (4 diffs)

trunk/src/Stagehand/TestRunner/PHPSpec/Reporter.php

@@ -107 +107 @@
             switch ($symbol) {
             case '.':
-                $symbol = Console_Color::convert("%g$symbol%n");
+                $symbol = $this->_green($symbol);
                 break;
             case 'F':
-                $symbol = Console_Color::convert("%r$symbol%n");
+                $symbol = $this->_red($symbol);
                 break;
             case 'E':
-                $symbol = Console_Color::convert("%p$symbol%n");
+                $symbol = $this->_magenta($symbol);
                 break;
             case 'P':
-                $symbol = Console_Color::convert("%y$symbol%n");
+                $symbol = $this->_yellow($symbol);
                 break;
             }
@@ -145 +145 @@
 
             if ($failuresCount + $deliberateFailuresCount + $errorsCount + $exceptionsCount + $pendingsCount == 0) {
-                $colorCode = '%g';
+                $colorCode = 'green';
             } elseif ($pendingsCount && $failuresCount + $deliberateFailuresCount + $errorsCount + $exceptionsCount == 0) {
-                $colorCode = '%y';
+                $colorCode = 'yellow';
             } else {
-                $colorCode = '%r';
+                $colorCode = 'red';
             }
 
@@ -165 +165 @@
                                                                 '/^(Pending:)/m'
                                                                 ),
-                                                          array("$colorCode\$1%n",
-                                                                '%p$1$2$3%n',
-                                                                '%r$1$2$3%n',
-                                                                '%r$1$2$3%n',
-                                                                '%y$1$2$3%n',
-                                                                '%g$1$2$3%n',
-                                                                '$1%p$2%n',
-                                                                '$1%r$2%n',
-                                                                '$1%y$2%n',
-                                                                '%p$1%n',
-                                                                '%r$1%n',
-                                                                '%y$1%n'
+                                                          array($this->{"_$colorCode"}('$1'),
+                                                                $this->_magenta('$1$2$3'),
+                                                                $this->_red('$1$2$3'),
+                                                                $this->_red('$1$2$3'),
+                                                                $this->_yellow('$1$2$3'),
+                                                                $this->_green('$1$2$3'),
+                                                                '$1' . $this->_magenta('$2'),
+                                                                '$1' . $this->_red('$2'),
+                                                                '$1' . $this->_yellow('$2'),
+                                                                $this->_magenta('$1'),
+                                                                $this->_red('$1'),
+                                                                $this->_yellow('$1')
                                                                 ),
                                                           Console_Color::escape($output))
@@ -196 +196 @@
      * @access private
      */
+
+    // }}}
+    // {{{ _green()
+
+    /**
+     * @param string $text
+     * @return text
+     */
+    private function _green($text)
+    {
+        return Console_Color::convert("%g$text%n");
+    }
+
+    // }}}
+    // {{{ _red()
+
+    /**
+     * @param string $text
+     * @return text
+     */
+    private function _red($text)
+    {
+        return Console_Color::convert("%r$text%n");
+    }
+
+    // }}}
+    // {{{ _magenta()
+
+    /**
+     * @param string $text
+     * @return text
+     */
+    private function _magenta($text)
+    {
+        return Console_Color::convert("%m$text%n");
+    }
+
+    // }}}
+    // {{{ _yellow()
+
+    /**
+     * @param string $text
+     * @return text
+     */
+    private function _yellow($text)
+    {
+        return Console_Color::convert("%y$text%n");
+    }
 
     /**#@-*/