Fixed PHPUnit warnings

Changed all uses of getMock() to getMockBuilder().
KacerCZ · Nov 19, 2017 · 7bdbcbc · 7bdbcbc
1 parent 5951ca8
commit 7bdbcbc
Show file tree

Hide file tree

Showing 34 changed files with 379 additions and 353 deletions.
diff --git a/src/test/php/PDepend/AbstractTest.php b/src/test/php/PDepend/AbstractTest.php
@@ -492,7 +492,12 @@ public static function assertInternalType($expected, $actual, $message = '')
      */
     protected function getMockWithoutConstructor($className)
     {
-        return $this->getMock($className, array('__construct'), array(), '', false);
+        $mock = $this->getMockBuilder($className)
+            ->setMethods(array('__construct'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return $mock;
     }
 
     /**
@@ -539,7 +544,10 @@ protected function createConfigurationFixture()
      */
     protected function createCacheFixture()
     {
-        return $this->getMock('\\PDepend\\Util\\Cache\\CacheDriver');
+        $cache = $this->getMockBuilder('\\PDepend\\Util\\Cache\\CacheDriver')
+            ->getMock();
+
+        return $cache;
     }
 
     /**
@@ -588,7 +596,9 @@ protected function createClassFixture($name = null)
         $class = new ASTClass($name);
         $class->setCompilationUnit(new ASTCompilationUnit($GLOBALS['argv'][0]));
         $class->setCache(new MemoryCacheDriver());
-        $class->setContext($this->getMock('PDepend\\Source\\Builder\\BuilderContext'));
+        $context = $this->getMockBuilder('PDepend\\Source\\Builder\\BuilderContext')
+            ->getMock();
+        $class->setContext($context);
 
         return $class;
     }

diff --git a/src/test/php/PDepend/Bugs/InputIteratorShouldOnlyFilterOnLocalPathBug164Test.php b/src/test/php/PDepend/Bugs/InputIteratorShouldOnlyFilterOnLocalPathBug164Test.php
@@ -63,7 +63,8 @@ class InputIteratorShouldOnlyFilterOnLocalPathBug164Test extends AbstractRegress
      */
     public function testIteratorOnlyPassesLocalPathToFilter()
     {
-        $filter = $this->getMock('\\PDepend\\Input\\Filter');
+        $filter = $this->getMockBuilder('\\PDepend\\Input\\Filter')
+            ->getMock();
         $filter->expects($this->once())
             ->method('accept')
             ->with($this->equalTo(DIRECTORY_SEPARATOR . basename(__FILE__)));

diff --git a/src/test/php/PDepend/Input/IteratorTest.php b/src/test/php/PDepend/Input/IteratorTest.php
@@ -88,7 +88,8 @@ public function testIteratorWithMultipleFileExtensions()
      */
     public function testIteratorPassesLocalPathToFilterWhenRootIsPresent()
     {
-        $filter = $this->getMock('\\PDepend\\Input\\Filter');
+        $filter = $this->getMockBuilder('\\PDepend\\Input\\Filter')
+            ->getMock();
         $filter->expects($this->once())
             ->method('accept')
             ->with($this->equalTo(DIRECTORY_SEPARATOR . basename(__FILE__)));
@@ -110,7 +111,8 @@ public function testIteratorPassesAbsolutePathToFilterWhenNoRootIsPresent()
     {
         $files = new \ArrayIterator(array(new \SplFileInfo(__FILE__)));
 
-        $filter = $this->getMock('\\PDepend\\Input\\Filter');
+        $filter = $this->getMockBuilder('\\PDepend\\Input\\Filter')
+            ->getMock();
         $filter->expects($this->once())
             ->method('accept')
             ->with($this->equalTo(__FILE__), $this->equalTo(__FILE__));
@@ -128,7 +130,8 @@ public function testIteratorPassesAbsolutePathToFilterWhenRootNotMatches()
     {
         $files = new \ArrayIterator(array(new \SplFileInfo(__FILE__)));
 
-        $filter = $this->getMock('\\PDepend\\Input\\Filter');
+        $filter = $this->getMockBuilder('\\PDepend\\Input\\Filter')
+            ->getMock();
         $filter->expects($this->once())
             ->method('accept')
             ->with($this->equalTo(__FILE__), $this->equalTo(__FILE__));

diff --git a/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php
@@ -63,12 +63,13 @@ class CouplingAnalyzerTest extends AbstractMetricsTest
      */
     public function testGetNodeMetricsReturnsAnEmptyArrayByDefault()
     {
+        $astArtifact = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTArtifact')
+            ->getMock();
+
         $analyzer = new CouplingAnalyzer();
         $this->assertEquals(
             array(),
-            $analyzer->getNodeMetrics(
-                $this->getMock('\\PDepend\\Source\\AST\\ASTArtifact')
-            )
+            $analyzer->getNodeMetrics($astArtifact)
         );
     }
 

diff --git a/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php
@@ -241,7 +241,8 @@ private function _createCloverReportFile()
      */
     private function _createCyclomaticComplexityAnalyzerMock($ccn = 42)
     {
-        $mock = $this->getMock('PDepend\\Metrics\\Analyzer\\CyclomaticComplexityAnalyzer');
+        $mock = $this->getMockBuilder('PDepend\\Metrics\\Analyzer\\CyclomaticComplexityAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getCCN2')
             ->will($this->returnValue($ccn));

diff --git a/src/test/php/PDepend/Metrics/Analyzer/CyclomaticComplexityAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CyclomaticComplexityAnalyzerTest.php
@@ -83,7 +83,9 @@ protected function setUp()
     public function testGetCCNReturnsZeroForUnknownNode()
     {
         $analyzer = $this->_createAnalyzer();
-        $this->assertEquals(0, $analyzer->getCcn($this->getMock('\\PDepend\\Source\\AST\\ASTArtifact')));
+        $astArtifact = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTArtifact')
+            ->getMock();
+        $this->assertEquals(0, $analyzer->getCcn($astArtifact));
     }
 
     /**
@@ -94,7 +96,9 @@ public function testGetCCNReturnsZeroForUnknownNode()
     public function testGetCCN2ReturnsZeroForUnknownNode()
     {
         $analyzer = $this->_createAnalyzer();
-        $this->assertEquals(0, $analyzer->getCcn2($this->getMock('\\PDepend\\Source\\AST\\ASTArtifact')));
+        $astArtifact = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTArtifact')
+            ->getMock();
+        $this->assertEquals(0, $analyzer->getCcn2($astArtifact));
     }
 
     /**

diff --git a/src/test/php/PDepend/Metrics/Analyzer/HalsteadAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/HalsteadAnalyzerTest.php
@@ -83,7 +83,9 @@ protected function setUp()
     public function testGetNodeMetricsReturnsNothingForUnknownNode()
     {
         $analyzer = $this->_createAnalyzer();
-        $this->assertEquals(array(), $analyzer->getNodeMetrics($this->getMock('\\PDepend\\Source\\AST\\ASTArtifact')));
+        $astArtifact = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTArtifact')
+            ->getMock();
+        $this->assertEquals(array(), $analyzer->getNodeMetrics($astArtifact));
     }
 
     /**

diff --git a/src/test/php/PDepend/Metrics/Analyzer/MaintainabilityIndexAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/MaintainabilityIndexAnalyzerTest.php
@@ -83,7 +83,9 @@ protected function setUp()
     public function testGetNodeMetricsReturnsNothingForUnknownNode()
     {
         $analyzer = $this->_createAnalyzer();
-        $this->assertEquals(array(), $analyzer->getNodeMetrics($this->getMock('\\PDepend\\Source\\AST\\ASTArtifact')));
+        $astArtifact = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTArtifact')
+            ->getMock();
+        $this->assertEquals(array(), $analyzer->getNodeMetrics($astArtifact));
     }
 
     /**

diff --git a/src/test/php/PDepend/Metrics/AnalyzerIteratorTest.php b/src/test/php/PDepend/Metrics/AnalyzerIteratorTest.php
@@ -62,7 +62,8 @@ class AnalyzerIteratorTest extends AbstractTest
      */
     public function testIteratorReturnsEnabledAnalyzerInstances()
     {
-        $analyzer = $this->getMock('\\PDepend\\Metrics\\Analyzer');
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer')
+            ->getMock();
         $analyzer->expects($this->exactly(2))
             ->method('isEnabled')
             ->will($this->returnValue(true));
@@ -78,7 +79,8 @@ public function testIteratorReturnsEnabledAnalyzerInstances()
      */
     public function testIteratorDoesNotReturnDisabledAnalyzerInstances()
     {
-        $analyzer = $this->getMock('\\PDepend\\Metrics\\Analyzer');
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer')
+            ->getMock();
         $analyzer->expects($this->at(0))
             ->method('isEnabled')
             ->will($this->returnValue(true));

diff --git a/src/test/php/PDepend/ParserTest.php b/src/test/php/PDepend/ParserTest.php
@@ -1438,7 +1438,8 @@ public function testParserHandlesStringWithQuestionMarkNotAsTernaryOperator()
      */
     public function testParserStopsProcessingWhenCacheContainsValidResult()
     {
-        $builder = $this->getMock('\\PDepend\\Source\\Builder\\Builder');
+        $builder = $this->getMockBuilder('\\PDepend\\Source\\Builder\\Builder')
+            ->getMock();
 
         $tokenizer = new PHPTokenizerInternal();
         $tokenizer->setSourceFile(__FILE__);

diff --git a/src/test/php/PDepend/Report/Dependencies/XmlTest.php b/src/test/php/PDepend/Report/Dependencies/XmlTest.php
@@ -134,8 +134,11 @@ public function testThrowsExceptionForInvalidLogTarget()
      */
     public function testLogMethodReturnsFalseForWrongAnalyzer()
     {
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\AnalyzerNodeAware')
+            ->getMock();
+
         $logger = new Xml();
-        $actual = $logger->log($this->getMock('\\PDepend\\Metrics\\AnalyzerNodeAware'));
+        $actual = $logger->log($analyzer);
 
         $this->assertFalse($actual);
     }
@@ -147,8 +150,11 @@ public function testLogMethodReturnsFalseForWrongAnalyzer()
      */
     public function testLogMethodReturnsTrueForAnalyzerOfTypeClassDepenendecyAnalyzer()
     {
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\ClassDependencyAnalyzer')
+            ->getMock();
+
         $logger = new Xml();
-        $actual = $logger->log($this->getMock('\\PDepend\\Metrics\\Analyzer\\ClassDependencyAnalyzer'));
+        $actual = $logger->log($analyzer);
 
         $this->assertTrue($actual);
     }
@@ -186,7 +192,9 @@ public function testXmlLogWithMetrics()
     {
         $this->namespaces = self::parseCodeResourceForTest();
 
-        $type = $this->getMock('\\PDepend\\Source\\AST\\AbstractASTClassOrInterface', array(), array(), '', false);
+        $type = $this->getMockBuilder('\\PDepend\\Source\\AST\\AbstractASTClassOrInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
         $type
             ->expects($this->any())
             ->method('getName')
@@ -196,7 +204,8 @@ public function testXmlLogWithMetrics()
             ->method('getNamespaceName')
             ->will($this->returnValue('namespace'));
 
-        $analyzer = $this->getMock('\\PDepend\\Metrics\\Analyzer\\ClassDependencyAnalyzer');
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\ClassDependencyAnalyzer')
+            ->getMock();
         $analyzer
             ->expects($this->any())
             ->method('getEfferents')

diff --git a/src/test/php/PDepend/Report/Jdepend/ChartTest.php b/src/test/php/PDepend/Report/Jdepend/ChartTest.php
@@ -226,7 +226,8 @@ public function testCalculateCorrectEllipseSize()
     {
         $nodes = $this->_createPackages(true, true);
 
-        $analyzer = $this->getMock('\\PDepend\\Metrics\\Analyzer\\DependencyAnalyzer');
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\DependencyAnalyzer')
+            ->getMock();
         $analyzer->expects($this->atLeastOnce())
             ->method('getStats')
             ->will(
@@ -345,12 +346,11 @@ private function _createPackages()
      */
     private function _createPackage($userDefined, $packageName)
     {
-        $packageA = $this->getMock(
-            '\\PDepend\\Source\\AST\\ASTNamespace',
-            array('isUserDefined'),
-            array($packageName),
-            'package_' . md5(microtime())
-        );
+        $packageA = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTNamespace')
+            ->setMethods(array('isUserDefined'))
+            ->setConstructorArgs(array($packageName))
+            ->setMockClassName('package_' . md5(microtime()))
+            ->getMock();
         $packageA->expects($this->atLeastOnce())
             ->method('isUserDefined')
             ->will($this->returnValue($userDefined));

diff --git a/src/test/php/PDepend/Report/Overview/PyramidTest.php b/src/test/php/PDepend/Report/Overview/PyramidTest.php
@@ -265,7 +265,8 @@ public function testCollectedAndComputedValuesInOutputSVG()
 
     private function createCouplingAnalyzer()
     {
-        $mock = $this->getMock('\\PDepend\\Metrics\\Analyzer\\CouplingAnalyzer');
+        $mock = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\CouplingAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getProjectMetrics')
             ->will($this->returnValue(
@@ -280,7 +281,8 @@ private function createCouplingAnalyzer()
 
     private function createComplexityAnalyzer()
     {
-        $mock = $this->getMock('\\PDepend\\Metrics\\Analyzer\\CyclomaticComplexityAnalyzer');
+        $mock = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\CyclomaticComplexityAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getProjectMetrics')
             ->will($this->returnValue(
@@ -294,7 +296,8 @@ private function createComplexityAnalyzer()
 
     private function createInheritanceAnalyzer()
     {
-        $mock = $this->getMock('\\PDepend\\Metrics\\Analyzer\\InheritanceAnalyzer');
+        $mock = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\InheritanceAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getProjectMetrics')
             ->will($this->returnValue(
@@ -309,7 +312,8 @@ private function createInheritanceAnalyzer()
 
     private function createNodeCountAnalyzer()
     {
-        $mock = $this->getMock('\\PDepend\\Metrics\\Analyzer\\NodeCountAnalyzer');
+        $mock = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\NodeCountAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getProjectMetrics')
             ->will($this->returnValue(
@@ -326,7 +330,8 @@ private function createNodeCountAnalyzer()
 
     private function createNodeLocAnalyzer()
     {
-        $mock = $this->getMock('\\PDepend\\Metrics\\Analyzer\\NodeLocAnalyzer');
+        $mock = $this->getMockBuilder('\\PDepend\\Metrics\\Analyzer\\NodeLocAnalyzer')
+            ->getMock();
         $mock->expects($this->any())
             ->method('getProjectMetrics')
             ->will($this->returnValue(

diff --git a/src/test/php/PDepend/Report/Summary/XmlTest.php b/src/test/php/PDepend/Report/Summary/XmlTest.php
@@ -146,8 +146,11 @@ public function testThrowsExceptionForInvalidLogTarget()
      */
     public function testLogMethodReturnsTrueForAnalyzerOfTypeProjectAware()
     {
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\AnalyzerProjectAware')
+            ->getMock();
+
         $logger = new Xml();
-        $actual = $logger->log($this->getMock('\\PDepend\\Metrics\\AnalyzerProjectAware'));
+        $actual = $logger->log($analyzer);
 
         $this->assertTrue($actual);
     }
@@ -159,8 +162,11 @@ public function testLogMethodReturnsTrueForAnalyzerOfTypeProjectAware()
      */
     public function testLogMethodReturnsTrueForAnalyzerOfTypeNodeAware()
     {
+        $analyzer = $this->getMockBuilder('\\PDepend\\Metrics\\AnalyzerNodeAware')
+            ->getMock();
+
         $logger = new Xml();
-        $actual = $logger->log($this->getMock('\\PDepend\\Metrics\\AnalyzerNodeAware'));
+        $actual = $logger->log($analyzer);
 
         $this->assertTrue($actual);
     }

diff --git a/src/test/php/PDepend/Source/AST/ASTClassOrInterfaceReferenceTest.php b/src/test/php/PDepend/Source/AST/ASTClassOrInterfaceReferenceTest.php
@@ -324,6 +324,9 @@ protected function createNodeInstance()
      */
     protected function getBuilderContextMock()
     {
-        return $this->getMock('PDepend\\Source\\Builder\\BuilderContext');
+        $context = $this->getMockBuilder('PDepend\\Source\\Builder\\BuilderContext')
+            ->getMock();
+
+        return $context;
     }
 }
diff --git a/src/test/php/PDepend/Source/AST/ASTClassReferenceTest.php b/src/test/php/PDepend/Source/AST/ASTClassReferenceTest.php
@@ -248,6 +248,9 @@ protected function createNodeInstance()
      */
     protected function getBuilderContextMock()
     {
-        return $this->getMock('PDepend\\Source\\Builder\\BuilderContext');
+        $context = $this->getMockBuilder('PDepend\\Source\\Builder\\BuilderContext')
+            ->getMock();
+
+        return $context;
     }
 }