Merge branch '2.0'

Author: whatthejeff

tests/PHP/CodeCoverage/FilterTest.php

@@ -269,11 +269,11 @@ public function testIsFile()
     {
         $this->assertFalse($this->filter->isFile('vfs://root/a/path'));
         $this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
-        $this->assertfalse($this->filter->isFile('eval()\'d code'));
-        $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->assertFalse($this->filter->isFile('eval()\'d code'));
+        $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'));
     }
 
     /**
@@ -282,7 +282,7 @@ public function testIsFile()
     public function testBlacklistedFileIsFiltered()
     {
         $this->filter->addFileToBlacklist($this->files[0]);
-        $this->asserttrue($this->filter->isFiltered($this->files[0]));
+        $this->assertTrue($this->filter->isFiltered($this->files[0]));
     }
 
     /**
@@ -291,7 +291,7 @@ public function testBlacklistedFileIsFiltered()
     public function testWhitelistedFileIsNotFiltered()
     {
         $this->filter->addFileToWhitelist($this->files[0]);
-        $this->assertfalse($this->filter->isFiltered($this->files[0]));
+        $this->assertFalse($this->filter->isFiltered($this->files[0]));
     }
 
     /**
@@ -300,7 +300,7 @@ public function testWhitelistedFileIsNotFiltered()
     public function testNotWhitelistedFileIsFiltered()
     {
         $this->filter->addFileToWhitelist($this->files[0]);
-        $this->asserttrue($this->filter->isFiltered($this->files[1]));
+        $this->assertTrue($this->filter->isFiltered($this->files[1]));
     }
 
     /**

tests/PHP/CodeCoverage/Report/FactoryTest.php

@@ -93,7 +93,7 @@ public function testSomething()
         $this->assertEquals('50.00%', $root->getLineExecutedPercent());
         $this->assertEquals(0, $root->getNumFunctions());
         $this->assertEquals(0, $root->getNumTestedFunctions());
-        $this->assertnull($root->getParent());
+        $this->assertNull($root->getParent());
         $this->assertEquals(array(), $root->getDirectories());
         #$this->assertEquals(array(), $root->getFiles());
         #$this->assertEquals(array(), $root->getChildNodes());