- Merge [4995:4997].

sebastianbergmann · Jul 16, 2009 · 1736910 · 1736910
1 parent f9a49da
commit 1736910
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 73 deletions.
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt
@@ -24,12 +24,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
-        <metrics methods="3" coveredmethods="5" statements="5" coveredstatements="5" elements="8" coveredelements="10"/>
+        <metrics methods="3" coveredmethods="3" statements="5" coveredstatements="5" elements="8" coveredelements="8"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="7" statements="7" coveredstatements="7" elements="10" coveredelements="14"/>
+        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="1"/>
       <line num="6" type="stmt" count="1"/>
@@ -49,8 +49,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="12" statements="12" coveredstatements="12" elements="18" coveredelements="24"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="12" elements="18" coveredelements="18"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="12" statements="12" coveredstatements="12" elements="18" coveredelements="24"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="12" elements="18" coveredelements="18"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt
@@ -23,12 +23,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
-        <metrics methods="3" coveredmethods="5" statements="5" coveredstatements="5" elements="8" coveredelements="10"/>
+        <metrics methods="3" coveredmethods="3" statements="5" coveredstatements="5" elements="8" coveredelements="8"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="7" statements="7" coveredstatements="7" elements="10" coveredelements="14"/>
+        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="1"/>
       <line num="6" type="stmt" count="1"/>
@@ -48,8 +48,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="12" statements="12" coveredstatements="12" elements="18" coveredelements="24"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="12" elements="18" coveredelements="18"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="12" statements="12" coveredstatements="12" elements="18" coveredelements="24"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="12" elements="18" coveredelements="18"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt
@@ -24,12 +24,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="7" statements="7" coveredstatements="7" elements="10" coveredelements="14"/>
+        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -49,8 +49,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="7" statements="12" coveredstatements="7" elements="18" coveredelements="14"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="7" elements="18" coveredelements="10"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="7" statements="12" coveredstatements="7" elements="18" coveredelements="14"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="7" elements="18" coveredelements="10"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-class.phpt b/PHPUnit/Tests/TextUI/coverage-clover-class.phpt
@@ -23,12 +23,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="7" statements="7" coveredstatements="7" elements="10" coveredelements="14"/>
+        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -48,8 +48,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="7" statements="12" coveredstatements="7" elements="18" coveredelements="14"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="7" elements="18" coveredelements="10"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="7" statements="12" coveredstatements="7" elements="18" coveredelements="14"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="7" elements="18" coveredelements="10"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-isolation.phpt
@@ -24,7 +24,7 @@ OK (3 tests, 3 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">
   <project name="BankAccountTest" timestamp="%i">
-    <file name="%s/BankAccount.php">
+    <file name="%sBankAccount.php">
       <class name="BankAccountException" namespace="global" fullPackage="PHPUnit" category="Testing" package="PHPUnit">
         <metrics methods="0" coveredmethods="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>

diff --git a/PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt
@@ -24,12 +24,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="3" elements="10" coveredelements="6"/>
+        <metrics methods="3" coveredmethods="1" statements="7" coveredstatements="3" elements="10" coveredelements="4"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -49,8 +49,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="3" elements="18" coveredelements="6"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="1" statements="12" coveredstatements="3" elements="18" coveredelements="4"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="3" elements="18" coveredelements="6"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="1" statements="12" coveredstatements="3" elements="18" coveredelements="4"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-method.phpt b/PHPUnit/Tests/TextUI/coverage-clover-method.phpt
@@ -23,12 +23,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="3" statements="7" coveredstatements="3" elements="10" coveredelements="6"/>
+        <metrics methods="3" coveredmethods="1" statements="7" coveredstatements="3" elements="10" coveredelements="4"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -48,8 +48,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="3" elements="18" coveredelements="6"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="1" statements="12" coveredstatements="3" elements="18" coveredelements="4"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="3" statements="12" coveredstatements="3" elements="18" coveredelements="6"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="1" statements="12" coveredstatements="3" elements="18" coveredelements="4"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt
@@ -24,12 +24,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="6" statements="7" coveredstatements="6" elements="10" coveredelements="12"/>
+        <metrics methods="3" coveredmethods="2" statements="7" coveredstatements="6" elements="10" coveredelements="8"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -49,8 +49,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="6" elements="18" coveredelements="12"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="6" elements="18" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="6" elements="18" coveredelements="12"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="6" elements="18" coveredelements="8"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt
@@ -23,12 +23,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="6" statements="7" coveredstatements="6" elements="10" coveredelements="12"/>
+        <metrics methods="3" coveredmethods="2" statements="7" coveredstatements="6" elements="10" coveredelements="8"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -48,8 +48,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="6" elements="18" coveredelements="12"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="6" elements="18" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="6" statements="12" coveredstatements="6" elements="18" coveredelements="12"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="6" elements="18" coveredelements="8"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt
@@ -24,12 +24,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="4" statements="7" coveredstatements="4" elements="10" coveredelements="8"/>
+        <metrics methods="3" coveredmethods="2" statements="7" coveredstatements="4" elements="10" coveredelements="6"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -49,8 +49,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="4" statements="12" coveredstatements="4" elements="18" coveredelements="8"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="4" elements="18" coveredelements="6"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="4" statements="12" coveredstatements="4" elements="18" coveredelements="8"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="4" elements="18" coveredelements="6"/>
   </project>
 </coverage>
diff --git a/PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt b/PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt
@@ -23,12 +23,12 @@ 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">
   <project name="CoverageTest" timestamp="%i">
-    <file name="%s/CoveredClass.php">
+    <file name="%sCoveredClass.php">
       <class name="CoveredParentClass" namespace="global">
         <metrics methods="3" coveredmethods="0" statements="5" coveredstatements="0" elements="8" coveredelements="0"/>
       </class>
       <class name="CoveredClass" namespace="global">
-        <metrics methods="3" coveredmethods="4" statements="7" coveredstatements="4" elements="10" coveredelements="8"/>
+        <metrics methods="3" coveredmethods="2" statements="7" coveredstatements="4" elements="10" coveredelements="6"/>
       </class>
       <line num="4" type="method" name="privateMethod" count="0"/>
       <line num="6" type="stmt" count="0"/>
@@ -48,8 +48,8 @@ Writing code coverage data to XML file, this may take a moment.<?xml version="1.
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="35" type="stmt" count="1"/>
-      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="4" statements="12" coveredstatements="4" elements="18" coveredelements="8"/>
+      <metrics loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="4" elements="18" coveredelements="6"/>
     </file>
-    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="4" statements="12" coveredstatements="4" elements="18" coveredelements="8"/>
+    <metrics files="1" loc="37" ncloc="37" classes="2" methods="6" coveredmethods="2" statements="12" coveredstatements="4" elements="18" coveredelements="6"/>
   </project>
 </coverage>