Merge branch '2.0'

sebastianbergmann · sebastianbergmann · commit 1c29ed670ecc · 2014-06-29T10:51:15.000+02:00
diff --git a/tests/PHP/CodeCoverage/FilterTest.php b/tests/PHP/CodeCoverage/FilterTest.php
@@ -273,7 +273,7 @@ public function testIsFile()
         $this->assertFalse($this->filter->isFile('runtime-created function'));
         $this->assertFalse($this->filter->isFile('assert code'));
         $this->assertFalse($this->filter->isFile('regexp code'));
-        $this->assertTrue($this->filter->isFile('filename'));
+        $this->assertTrue($this->filter->isFile(__FILE__));
     }
 
     /**
@@ -315,6 +315,6 @@ public function testNonFilesAreFiltered()
         $this->assertTrue($this->filter->isFiltered('runtime-created function'));
         $this->assertTrue($this->filter->isFiltered('assert code'));
         $this->assertTrue($this->filter->isFiltered('regexp code'));
-        $this->assertFalse($this->filter->isFiltered('filename'));
+        $this->assertFalse($this->filter->isFiltered(__FILE__));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function testIsFile()`
`273`	`273`	`$this->assertFalse($this->filter->isFile('runtime-created function'));`
`274`	`274`	`$this->assertFalse($this->filter->isFile('assert code'));`
`275`	`275`	`$this->assertFalse($this->filter->isFile('regexp code'));`
`276`		`- $this->assertTrue($this->filter->isFile('filename'));`
	`276`	`+ $this->assertTrue($this->filter->isFile(__FILE__));`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`/**`
`@@ -315,6 +315,6 @@ public function testNonFilesAreFiltered()`
`315`	`315`	`$this->assertTrue($this->filter->isFiltered('runtime-created function'));`
`316`	`316`	`$this->assertTrue($this->filter->isFiltered('assert code'));`
`317`	`317`	`$this->assertTrue($this->filter->isFiltered('regexp code'));`
`318`		`- $this->assertFalse($this->filter->isFiltered('filename'));`
	`318`	`+ $this->assertFalse($this->filter->isFiltered(__FILE__));`
`319`	`319`	`}`
`320`	`320`	`}`