silex2 (#5)

silex2 fix some unit tests for phpunit 6
alchemy-fr · Apr 11, 2018 · d1c3f2f · d1c3f2f
1 parent 6185ab4
commit d1c3f2f
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": "~7.0",
         "ext-zmq": "*",
 
         "neutron/process-manager": "2.0.x-dev@dev",
@@ -33,7 +33,7 @@
     ],
     "require-dev": {
         "monolog/monolog": "~1.0",
-        "phpunit/phpunit": "~3.7|^4.0|^5.0",
+        "phpunit/phpunit": "~6.0",
         "symfony/console": "~2.3",
         "symfony/finder": "~2.1"
     },

diff --git a/src/Alchemy/TaskManager/Test/TaskTestCase.php b/src/Alchemy/TaskManager/Test/TaskTestCase.php
@@ -4,7 +4,7 @@
 
 use Alchemy\TaskManager\TaskInterface;
 
-abstract class TaskTestCase extends \PHPUnit_Framework_TestCase
+abstract class TaskTestCase extends \PHPUnit\Framework\TestCase
 {
     public function testThatCreateProcessReturnsAProcessableInterface()
     {

diff --git a/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/DurationLimitSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/DurationLimitSubscriberTest.php
@@ -39,7 +39,7 @@ public function testWithLogger()
         $job->expects($this->once())->method('stop');
         $job->expects($this->any())->method('isStarted')->will($this->returnValue(true));
 
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
         $logger->expects($this->once())->method('notice')->with('Max duration reached for romain (0.1 s.), stopping.');
 
         $subscriber = new DurationLimitSubscriber(0.1, $logger);

diff --git a/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/LockFileSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/LockFileSubscriberTest.php
@@ -13,7 +13,8 @@ class LockFileSubscriberTest extends SubscriberTestCase
      */
     public function testWithInvalidParams($id, $directory, $message)
     {
-        $this->setExpectedException('Alchemy\TaskManager\Exception\InvalidArgumentException', $message);
+        $this->expectException('Alchemy\TaskManager\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage($message);
         new LockFileSubscriber($id, null, $directory);
     }
 

diff --git a/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/MemoryLimitSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/MemoryLimitSubscriberTest.php
@@ -29,7 +29,7 @@ public function testOnJobTickWithLogger()
         $job->expects($this->once())->method('stop');
         $job->expects($this->any())->method('isStarted')->will($this->returnValue(true));
 
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
         $logger->expects($this->once())->method('notice')->with('Max memory reached for romain (1 o.), stopping.');
 
         $subscriber = new MemoryLimitSubscriber(1, $logger);

diff --git a/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/SignalControlledSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/SignalControlledSubscriberTest.php
@@ -40,7 +40,7 @@ public function testWithLogger()
         $job->expects($this->once())->method('stop');
         $job->expects($this->any())->method('isStarted')->will($this->returnValue(true));
 
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
         $logger->expects($this->once())->method('notice')->with('No signal received for romain since start-time (max period is 0.15 s.), stopping.');
 
         $subscriber = new SignalControlledSubscriber(SignalHandler::getInstance(), 0.15, $logger);

diff --git a/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/StopSignalSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/JobSubscriber/StopSignalSubscriberTest.php
@@ -17,7 +17,7 @@ public function testSignalWithLogger($signal)
         $job->expects($this->once())->method('stop');
         $job->expects($this->any())->method('isStarted')->will($this->returnValue(true));
 
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
         $logger->expects($this->once())->method('notice');
 
         $subscriber = new StopSignalSubscriber(SignalHandler::getInstance(), $logger);

diff --git a/tests/Alchemy/Test/TaskManager/Event/TaskManagerSubscriber/LockFileSubscriberTest.php b/tests/Alchemy/Test/TaskManager/Event/TaskManagerSubscriber/LockFileSubscriberTest.php
@@ -13,7 +13,8 @@ class LockFileSubscriberTest extends SubscriberTestCase
      */
     public function testWithInvalidParams($directory, $message)
     {
-        $this->setExpectedException('Alchemy\TaskManager\Exception\InvalidArgumentException', $message);
+        $this->expectException('Alchemy\TaskManager\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage($message);
         new LockFileSubscriber(null, $directory);
     }
 

diff --git a/tests/Alchemy/Test/TaskManager/Job/AbstractJobTest.php b/tests/Alchemy/Test/TaskManager/Job/AbstractJobTest.php
@@ -143,7 +143,7 @@ public function testEventsWithException()
 
     public function testLoggerGettersAndSetters()
     {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
 
         $job = new JobTest();
         $this->assertSame(null, $job->getLogger());
@@ -176,7 +176,7 @@ public function testSingleRunRunsAndStop()
 
     public function testAddAListener()
     {
-        $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $listener = array($this, 'testAddAListener');
         $name = 'event-name';
 
@@ -190,8 +190,8 @@ public function testAddAListener()
 
     public function testAddASubscriber()
     {
-        $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
-        $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
+        $dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $subscriber = $this->createMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
 
         $dispatcher->expects($this->once())
                 ->method('addSubscriber')
@@ -270,7 +270,8 @@ public function testJobCanBeRestartedAfterAFailure()
 
         }
         $job = new JobFailureTest();
-        $this->setExpectedException('Alchemy\Test\TaskManager\Job\JobFailureException', 'Total failure.');
+        $this->expectException('Alchemy\Test\TaskManager\Job\JobFailureException');
+        $this->expectExceptionMessage('Total failure.');
         $job->run();
     }
 

diff --git a/tests/Alchemy/Test/TaskManager/LockFileTest.php b/tests/Alchemy/Test/TaskManager/LockFileTest.php
@@ -29,7 +29,10 @@ public function testLockALockedFileShouldThrowAnException()
         $this->assertFileExists($this->lockfile);
 
         $lock2 = new LockFile($this->lockfile);
-        $this->setExpectedException('Alchemy\TaskManager\Exception\LockFailureException', sprintf('Unable to lock %s.', $this->lockfile));
+
+        $this->expectException('Alchemy\TaskManager\Exception\LockFailureException');
+        $this->expectExceptionMessage(sprintf('Unable to lock %s.', $this->lockfile));
+
         $lock2->lock();
     }
 

diff --git a/tests/Alchemy/Test/TaskManager/TaskManagerTest.php b/tests/Alchemy/Test/TaskManager/TaskManagerTest.php
@@ -13,7 +13,7 @@ class TaskManagerTest extends TestCase
 {
     public function testThatItRunsWithoutAnyProcesses()
     {
-        $taskList = $this->getMock('Alchemy\TaskManager\TaskListInterface');
+        $taskList = $this->createMock('Alchemy\TaskManager\TaskListInterface');
         $taskList->expects($this->once())
             ->method('refresh')
             ->will($this->returnValue(array()));
@@ -166,9 +166,10 @@ public function testThatTwoTaskManagerCanNotRunOnSamePortAndHostAtTheSameTime()
         $socket = new ZMQSocket(new \ZMQContext(), \ZMQ::SOCKET_REP, 'tcp', '127.0.0.1', 6660);
         $socket->bind();
 
-        $taskList = $this->getMock('Alchemy\TaskManager\TaskListInterface');
+        $taskList = $this->createMock('Alchemy\TaskManager\TaskListInterface');
         $manager = TaskManager::create(new EventDispatcher(), $this->createLoggerMock(), $taskList);
-        $this->setExpectedException('Alchemy\TaskManager\Exception\RuntimeException', 'Unable to bind socket to tcp://127.0.0.1:6660. Is another one already bound ?');
+        $this->expectException('Alchemy\TaskManager\Exception\RuntimeException');
+        $this->expectExceptionMessage('Unable to bind socket to tcp://127.0.0.1:6660. Is another one already bound ?');
         $manager->start();
     }
 
@@ -207,7 +208,7 @@ public function testASIGCONTIsRegularlyReceivedByPrograms()
 
     public function testThatCallingStopTriggersAStopRequestEvent()
     {
-        $taskList = $this->getMock('Alchemy\TaskManager\TaskListInterface');
+        $taskList = $this->createMock('Alchemy\TaskManager\TaskListInterface');
         $taskList->expects($this->any())
             ->method('refresh')
             ->will($this->returnValue(array()));
@@ -228,7 +229,7 @@ public function testThatCallingStopTriggersAStopRequestEvent()
 
     public function testThatRefreshIsCalledAsManyTimestheUpdateIsRequested()
     {
-        $taskList = $this->getMock('Alchemy\TaskManager\TaskListInterface');
+        $taskList = $this->createMock('Alchemy\TaskManager\TaskListInterface');
         $taskList->expects($this->exactly(7))
             ->method('refresh')
             ->will($this->returnValue(array()));
@@ -265,7 +266,7 @@ public function testThatRefreshIsCalledAsManyTimestheUpdateIsRequested()
 
     private function createLoggerMock()
     {
-        return $this->getMock('Psr\Log\LoggerInterface');
+        return $this->createMock('Psr\Log\LoggerInterface');
     }
 
     private function getTaskListImplementation()

diff --git a/tests/Alchemy/Test/TaskManager/TestCase.php b/tests/Alchemy/Test/TaskManager/TestCase.php
@@ -2,15 +2,15 @@
 
 namespace Alchemy\Test\TaskManager;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     public function createJobMock()
     {
-        return $this->getMock('Alchemy\TaskManager\Job\JobInterface');
+        return $this->createMock('Alchemy\TaskManager\Job\JobInterface');
     }
 
     public function createDataMock()
     {
-        return $this->getMock('Alchemy\TaskManager\Job\JobDataInterface');
+        return $this->createMock('Alchemy\TaskManager\Job\JobDataInterface');
     }
 }