ChangeLog-4.8.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.6] - 2015-08-24
+
+### Fixed
+
+* Fixed [#1835](https://github.com/sebastianbergmann/phpunit/issues/1835): Skipped test reported as errored since PHPUnit 4.7.4
+
 ## [4.8.5] - 2015-08-19
 
 ### Fixed
@@ -47,6 +53,7 @@ All notable changes of the PHPUnit 4.8 release series are documented in this fil
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.6]: https://github.com/sebastianbergmann/phpunit/compare/4.8.5...4.8.6
 [4.8.5]: https://github.com/sebastianbergmann/phpunit/compare/4.8.4...4.8.5
 [4.8.4]: https://github.com/sebastianbergmann/phpunit/compare/4.8.3...4.8.4
 [4.8.3]: https://github.com/sebastianbergmann/phpunit/compare/4.8.2...4.8.3

src/Framework/TestCase.php

@@ -766,9 +766,9 @@ public function runBare()
             $e = $_e;
         }
 
-        if (isset($e)) {
+        if (isset($_e)) {
             $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-            $this->statusMessage = $e->getMessage();
+            $this->statusMessage = $_e->getMessage();
         }
 
         // Clean up the mock objects.

src/Runner/Version.php

@@ -30,7 +30,7 @@ public static function id()
         }
 
         if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.5', dirname(dirname(__DIR__)));
+            $version       = new SebastianBergmann\Version('4.8.6', dirname(dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 

src/TextUI/Command.php

@@ -592,7 +592,6 @@ protected function handleArguments(array $argv)
                 $this->arguments['stderr'] = $phpunit['stderr'];
             }
 
-
             if (isset($phpunit['columns']) && ! isset($this->arguments['columns'])) {
                 $this->arguments['columns'] = $phpunit['columns'];
             }

tests/Framework/TestCaseTest.php

@@ -47,8 +47,10 @@ public function testSuccess()
         $test   = new Success;
         $result = $test->run();
 
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_PASSED, $test->getStatus());
         $this->assertEquals(0, $result->errorCount());
         $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(0, $result->skippedCount());
         $this->assertEquals(1, count($result));
     }
 
@@ -57,8 +59,10 @@ public function testFailure()
         $test   = new Failure;
         $result = $test->run();
 
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, $test->getStatus());
         $this->assertEquals(0, $result->errorCount());
         $this->assertEquals(1, $result->failureCount());
+        $this->assertEquals(0, $result->skippedCount());
         $this->assertEquals(1, count($result));
     }
 
@@ -67,8 +71,36 @@ public function testError()
         $test   = new TestError;
         $result = $test->run();
 
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_ERROR, $test->getStatus());
         $this->assertEquals(1, $result->errorCount());
         $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(0, $result->skippedCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testSkipped()
+    {
+        $test   = new TestSkipped();
+        $result = $test->run();
+
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, $test->getStatus());
+        $this->assertEquals('Skipped test', $test->getStatusMessage());
+        $this->assertEquals(0, $result->errorCount());
+        $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testIncomplete()
+    {
+        $test   = new TestIncomplete();
+        $result = $test->run();
+
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, $test->getStatus());
+        $this->assertEquals('Incomplete test', $test->getStatusMessage());
+        $this->assertEquals(0, $result->errorCount());
+        $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(0, $result->skippedCount());
         $this->assertEquals(1, count($result));
     }
 

tests/_files/TestIncomplete.php

@@ -0,0 +1,8 @@
+<?php
+class TestIncomplete extends PHPUnit_Framework_TestCase
+{
+    protected function runTest()
+    {
+        $this->markTestIncomplete('Incomplete test');
+    }
+}

tests/_files/TestSkipped.php

@@ -0,0 +1,8 @@
+<?php
+class TestSkipped extends PHPUnit_Framework_TestCase
+{
+    protected function runTest()
+    {
+        $this->markTestSkipped('Skipped test');
+    }
+}