- Merge [4978].

sebastianbergmann · Jul 12, 2009 · 3b741a0 · 3b741a0
1 parent 785fa90
commit 3b741a0
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 41 deletions.
diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
@@ -674,24 +674,12 @@ public function run(PHPUnit_Framework_Test $test)
             $error = TRUE;
         }
 
-        $time          = PHPUnit_Util_Timer::stop();
-        $numAssertions = PHPUnit_Framework_Assert::getCount();
+        $time = PHPUnit_Util_Timer::stop();
 
         if ($useXdebug) {
             $codeCoverage = xdebug_get_code_coverage();
             xdebug_stop_code_coverage();
 
-            // Disregard code coverage information when nothing was asserted.
-            if ($numAssertions == 0) {
-                foreach ($codeCoverage as &$data) {
-                    foreach ($data as &$status) {
-                        if ($status > 0) {
-                            $status = -1;
-                        }
-                    }
-                }
-            }
-
             $this->appendCodeCoverageInformation(
               $test, $codeCoverage
             );
@@ -701,7 +689,7 @@ public function run(PHPUnit_Framework_Test $test)
             restore_error_handler();
         }
 
-        $test->addToAssertionCount($numAssertions);
+        $test->addToAssertionCount(PHPUnit_Framework_Assert::getCount());
 
         if ($error === TRUE) {
             $this->addError($test, $e, $time);

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-method.phpt b/PHPUnit/Tests/TextUI/coverage-clover-method.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-public-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-public-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-public.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-public.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-private-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-private-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-private.phpt b/PHPUnit/Tests/TextUI/coverage-clover-private.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-protected-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-protected-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-protected.phpt b/PHPUnit/Tests/TextUI/coverage-clover-protected.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-public-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-public-isolation.phpt
@@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-public.phpt b/PHPUnit/Tests/TextUI/coverage-clover-public.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 Time: %i seconds
 
-OK (1 test, 1 assertion)
+OK (1 test, 0 assertions)
 
 Writing code coverage data to XML file, this may take a moment.<?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i" phpunit="%s">

diff --git a/PHPUnit/Tests/_files/CoverageClassExtendedTest.php b/PHPUnit/Tests/_files/CoverageClassExtendedTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageClassTest.php b/PHPUnit/Tests/_files/CoverageClassTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageMethodTest.php b/PHPUnit/Tests/_files/CoverageMethodTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageNotPrivateTest.php b/PHPUnit/Tests/_files/CoverageNotPrivateTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageNotProtectedTest.php b/PHPUnit/Tests/_files/CoverageNotProtectedTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageNotPublicTest.php b/PHPUnit/Tests/_files/CoverageNotPublicTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoveragePrivateTest.php b/PHPUnit/Tests/_files/CoveragePrivateTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoverageProtectedTest.php b/PHPUnit/Tests/_files/CoverageProtectedTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }
diff --git a/PHPUnit/Tests/_files/CoveragePublicTest.php b/PHPUnit/Tests/_files/CoveragePublicTest.php
@@ -10,6 +10,5 @@ public function testPublicMethod()
     {
         $o = new CoveredClass;
         $o->publicMethod();
-        $this->assertTrue(TRUE);
     }
 }