Removed usage of deprecated getMock()

wouterj · wouterj · commit c09f45ee7cef · 2017-01-25T16:45:10.000+01:00
diff --git a/tests/Functional/BaseTestCaseTest.php b/tests/Functional/BaseTestCaseTest.php
@@ -15,38 +15,36 @@
 
 class BaseTestCaseTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
-    {
-        $this->testCase = new TestTestCase();
-
-        $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+    private $container;
+    private $kernel;
+    private $testCase;
+    private $client;
 
-        $me = $this;
+    protected function setUp()
+    {
+        $this->container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $this->container->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($name) use ($me) {
-                $dic = array(
-                    'test.client' => $me->client,
-                );
+            ->will($this->returnCallback(function ($name) {
+                $dic = [
+                    'test.client' => $this->client,
+                ];
 
                 return $dic[$name];
             }));
 
-        $this->kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
-
-        $this->testCase->setKernel($this->kernel);
-
+        $this->kernel = $this->createMock('Symfony\Component\HttpKernel\KernelInterface');
         $this->kernel->expects($this->any())
             ->method('getContainer')
-            ->will($this->returnValue($this->container));
+            ->willReturn($this->container);
 
-        $this->client = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Client')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->testCase = new TestTestCase();
+        $this->testCase->setKernel($this->kernel);
 
+        $this->client = $this->createMock('Symfony\Bundle\FrameworkBundle\Client');
         $this->client->expects($this->any())
             ->method('getContainer')
-            ->will($this->returnValue($this->container));
+            ->willReturn($this->container);
     }
 
     public function testGetContainer()
@@ -56,12 +54,12 @@ public function testGetContainer()
 
     public function provideTestDb()
     {
-        return array(
-            array('PHPCR', 'PHPCR'),
-            array('Phpcr', 'PHPCR'),
-            array('ORM', 'ORM'),
-            array('foobar', null),
-        );
+        return [
+            ['PHPCR', 'PHPCR'],
+            ['Phpcr', 'PHPCR'],
+            ['ORM', 'ORM'],
+            ['foobar', null],
+        ];
     }
 
     /**
diff --git a/tests/HttpKernel/TestKernelTest.php b/tests/HttpKernel/TestKernelTest.php
@@ -19,14 +19,16 @@
 
 class TestKernelTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
+    private $kernel;
+    private $mockBundle;
+
+    protected function setUp()
     {
-        $this->kernel = $this->getMockBuilder(
-            'Symfony\Cmf\Component\Testing\HttpKernel\TestKernel'
-        )->setConstructorArgs(array('test', true))->getMockForAbstractClass();
-        $this->mockBundle = $this->getMock(
-            'Symfony\Component\HttpKernel\Bundle\BundleInterface'
-        );
+        $this->kernel = $this->getMockBuilder('Symfony\Cmf\Component\Testing\HttpKernel\TestKernel')
+            ->setConstructorArgs(array('test', true))
+            ->getMockForAbstractClass();
+
+        $this->mockBundle = $this->createMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
     }
 
     /**
@@ -37,7 +39,7 @@ public function testBundleSetRequire(array $bundleSets, array $expectedBundles)
         $this->kernel->requireBundleSets($bundleSets);
         $bundles = array_keys($this->kernel->registerBundles());
 
-            $this->assertArraySubset($expectedBundles, $bundles);
+        $this->assertArraySubset($expectedBundles, $bundles);
     }
 
     public function bundleSetProvider()
diff --git a/tests/Phpunit/DatabaseTestListenerTest.php b/tests/Phpunit/DatabaseTestListenerTest.php
@@ -19,38 +19,38 @@ class DatabaseTestListenerTest extends \PHPUnit_Framework_TestCase
     private $processBuilder;
     private static $i;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->listener = new DatabaseTestListener($this->getProcessBuilder());
         self::$i = 0;
     }
 
     public function testPhpcrTestSuite()
     {
-        $suite = $this->getMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
         $suite->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue('phpcr'));
+            ->willReturn('phpcr');
 
-        $this->assertProcessExecuted(array('doctrine:phpcr:init:dbal', '--drop', '--force'));
-        $this->assertProcessExecuted(array('doctrine:phpcr:repository:init'));
+        $this->assertProcessExecuted(['doctrine:phpcr:init:dbal', '--drop', '--force']);
+        $this->assertProcessExecuted(['doctrine:phpcr:repository:init']);
 
         ob_start();
         $this->listener->startTestSuite($suite);
 
-        $this->assertEquals(PHP_EOL.PHP_EOL.'[PHPCR]'.PHP_EOL, ob_get_clean());
+        $this->assertContains('[PHPCR]', ob_get_clean());
     }
 
     public function testFallsBackToOldInitDbalCommand()
     {
-        $suite = $this->getMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
         $suite->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue('phpcr'));
+            ->willReturn('phpcr');
 
-        $this->assertProcessExecuted(array('doctrine:phpcr:init:dbal', '--drop', '--force'), false);
-        $this->assertProcessExecuted(array('doctrine:phpcr:init:dbal', '--drop'), true);
-        $this->assertProcessExecuted(array('doctrine:phpcr:repository:init'));
+        $this->assertProcessExecuted(['doctrine:phpcr:init:dbal', '--drop', '--force'], false);
+        $this->assertProcessExecuted(['doctrine:phpcr:init:dbal', '--drop'], true);
+        $this->assertProcessExecuted(['doctrine:phpcr:repository:init']);
 
         ob_start();
         $this->listener->startTestSuite($suite);
@@ -59,67 +59,64 @@ public function testFallsBackToOldInitDbalCommand()
 
     public function testOrmTestSuite()
     {
-        $suite = $this->getMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
         $suite->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue('orm'));
+            ->willReturn('orm');
 
-        $this->assertProcessExecuted(array('doctrine:schema:drop', '--env=orm', '--force'));
-        $this->assertProcessExecuted(array('doctrine:database:create', '--env=orm'));
-        $this->assertProcessExecuted(array('doctrine:schema:create', '--env=orm'));
+        $this->assertProcessExecuted(['doctrine:schema:drop', '--env=orm', '--force']);
+        $this->assertProcessExecuted(['doctrine:database:create', '--env=orm']);
+        $this->assertProcessExecuted(['doctrine:schema:create', '--env=orm']);
 
         ob_start();
         $this->listener->startTestSuite($suite);
 
-        $this->assertEquals(PHP_EOL.PHP_EOL.'[ORM]'.PHP_EOL, ob_get_clean());
+        $this->assertContains('[ORM]', ob_get_clean());
     }
 
     public function testUnknownTestSuite()
     {
-        $suite = $this->getMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
         $suite->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue('not orm or phpcr tests'));
+            ->willReturn('not orm or phpcr tests');
 
-        $this->getProcessBuilder()
-            ->expects($this->never())
-            ->method('setArguments');
+        $this->getProcessBuilder()->expects($this->never())->method('setArguments');
 
         ob_start();
         $this->listener->startTestSuite($suite);
 
-        $this->assertEquals(PHP_EOL.PHP_EOL.'[not orm or phpcr tests]'.PHP_EOL, ob_get_clean());
+        $this->assertContains('[not orm or phpcr tests]', ob_get_clean());
     }
 
     protected function assertProcessExecuted(array $arguments, $successfull = true)
     {
-        $process = $this->getMockBuilder('Symfony\Component\Process\Process')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $process = $this->createMock('Symfony\Component\Process\Process');
 
-        $process->expects($this->once())
-            ->method('run');
+        $process->expects($this->once())->method('run');
 
         $process->expects($this->any())
             ->method('isSuccessful')
-            ->will($this->returnValue($successfull));
+            ->willReturn($successfull);
 
-        $processPlaceholder = $this->getMock('ProcessPlaceholder', array('getProcess'));
+        $processPlaceholder = $this->getMockBuilder('ProcessPlaceholder')
+            ->setMethods(['getProcess'])
+            ->getMock();
         $processPlaceholder->expects($this->once())
             ->method('getProcess')
-            ->will($this->returnValue($process));
+            ->willReturn($process);
 
         $this->getProcessBuilder()
             ->expects($this->at(self::$i++))
             ->method('setArguments')
             ->with($this->equalTo($arguments))
-            ->will($this->returnValue($processPlaceholder));
+            ->willReturn($processPlaceholder);
     }
 
     protected function getProcessBuilder()
     {
         if (null === $this->processBuilder) {
-            $this->processBuilder = $this->getMock('Symfony\Component\Process\ProcessBuilder');
+            $this->processBuilder = $this->createMock('Symfony\Component\Process\ProcessBuilder');
         }
 
         return $this->processBuilder;
