adding a skipped status to tests

Author: jaydiablo

tests/Cache/AbstractTestCase.php

@@ -49,6 +49,7 @@ public function prepareData()
     public function testAsResultCache()
     {
         if (!$this->_isEnabled()) {
+            $this->skip();
             return;
         }
         $this->_clearCache();
@@ -82,6 +83,7 @@ public function testAsResultCache()
     public function testCacheCore()
     {
         if (!$this->_isEnabled()) {
+            $this->skip();
             return;
         }
         $this->_clearCache();
@@ -100,6 +102,7 @@ public function testCacheCore()
     public function testDeleteByPrefix()
     {
         if (!$this->_isEnabled()) {
+            $this->skip();
             return;
         }
         $this->_clearCache();
@@ -119,6 +122,7 @@ public function testDeleteByPrefix()
     public function testDeleteBySuffix()
     {
         if (!$this->_isEnabled()) {
+            $this->skip();
             return;
         }
         $this->_clearCache();
@@ -138,6 +142,7 @@ public function testDeleteBySuffix()
     public function testDeleteByRegex()
     {
         if (!$this->_isEnabled()) {
+            $this->skip();
             return;
         }
         $this->_clearCache();

tests/DoctrineTest/GroupTest.php

@@ -79,8 +79,9 @@ public function run(DoctrineTest_Reporter $reporter = null, $filter = null)
                 $testCase->addMessage($message);
             }
 
-            $this->_passed += $testCase->getPassCount();
-            $this->_failed += $testCase->getFailCount();
+            $this->_passed  += $testCase->getPassCount();
+            $this->_failed  += $testCase->getFailCount();
+            $this->_skipped += $testCase->getSkipCount();
 
             $this->_testCases[$k] = null;
 

tests/DoctrineTest/Reporter.php

@@ -19,6 +19,8 @@ public function format($message, $type)
                 $color = 'green';
             } elseif ($type == 'ERROR') {
                 $color = 'red';
+            } elseif ($type == 'COMMENT') {
+                $color = 'yellow';
             } else {
                 $color = 'black';
             }
@@ -37,10 +39,21 @@ public function paintMessages()
         $class    = get_class($this->_test);
         $messages = $this->_test->getMessages();
         $failed   = ($this->_test->getFailCount() || count($messages)) ? true:false;
+        $skipped  = $this->_test->getSkipCount() ? true : false;
 
         if ($class != 'GroupTest') {
             $strRepeatLength = $max - strlen($class);
-            echo $class . str_repeat('.', $strRepeatLength) . $this->format($failed ? 'failed':'passed', $failed ? 'ERROR':'INFO') . "\n";
+            $message         = 'passed';
+            $type            = 'INFO';
+            if ($failed) {
+                $message = 'failed';
+                $type    = 'ERROR';
+            } elseif ($skipped) {
+                $message = 'skipped';
+                $type    = 'COMMENT';
+            }
+
+            echo $class . str_repeat('.', $strRepeatLength) . $this->format($message, $type) . "\n";
         }
 
         if (! empty($messages)) {

tests/DoctrineTest/Reporter/Cli.php

@@ -14,6 +14,7 @@ public function paintFooter()
         echo $this->format('Tested: ' . $this->_test->getTestCaseCount() . ' test cases.', 'INFO') . "\n";
         echo $this->format('Successes: ' . $this->_test->getPassCount() . ' passes.', 'INFO') . "\n";
         echo $this->format('Failures: ' . $this->_test->getFailCount() . ' fails.', $this->_test->getFailCount() ? 'ERROR':'INFO') . "\n";
+        echo $this->format('Skips: ' . $this->_test->getSkipCount() . ' skips.', $this->_test->getSkipCount() ? 'COMMENT':'INFO') . "\n";
         echo $this->format('Number of new Failures: ' . $this->_test->getNumNewFails(), $this->_test->getNumNewFails() ? 'ERROR':'INFO') . ' ' . implode(', ', $this->_test->getNewFails()) . "\n";
         echo $this->format('Number of fixed Failures: ' . $this->_test->getNumFixedFails(), $this->_test->getNumFixedFails() ? 'INFO':'HEADER') . ' ' . implode(', ', $this->_test->getFixedFails()) . "\n";
     }

tests/DoctrineTest/UnitTestCase.php

@@ -5,11 +5,13 @@ class UnitTestCase
 
     protected $_failed = 0;
 
+    protected $_skipped = 0;
+
     protected $_messages = array();
 
-    protected static $_passesAndFails = array('passes' => array(), 'fails' => array());
+    protected static $_passesAndFails = array('passes' => array(), 'fails' => array(), 'skips' => array());
 
-    protected static $_lastRunsPassesAndFails = array('passes' => array(), 'fails' => array());
+    protected static $_lastRunsPassesAndFails = array('passes' => array(), 'fails' => array(), 'skips' => array());
 
     public function init()
     {
@@ -116,6 +118,15 @@ public function pass()
         $this->_passed++;
     }
 
+    public function skip()
+    {
+        $class = get_class($this);
+        if (! isset(self::$_passesAndFails['skips'][$class])) {
+            self::$_passesAndFails['skips'][$class] = $class;
+        }
+        $this->_skipped++;
+    }
+
     public function fail($message = '')
     {
         $this->_fail($message);
@@ -177,6 +188,11 @@ public function getPassCount()
         return $this->_passed;
     }
 
+    public function getSkipCount()
+    {
+        return $this->_skipped;
+    }
+
     public function getPassesAndFailsCachePath()
     {
         $dir = dirname(__FILE__) . '/doctrine_tests';
@@ -225,7 +241,6 @@ public function getNewFails()
             }
         }
         return $newFails;
-        ;
     }
 
     public function getFixedFails()
@@ -239,7 +254,6 @@ public function getFixedFails()
             }
         }
         return $fixed;
-        ;
     }
 
     public function getNumNewFails()

tests/Ticket/DC841TestCase.php

@@ -78,6 +78,7 @@ public function testSelectJoinWith()
 
     public function testSelectWithStaticParameter()
     {
+        $this->skip();
         return; // doesn't work
         Doctrine::getTable('Ticket_DC841_Model')
             ->createQuery('t')