Skip to content

Commit a4ae481

Browse files
stloydstloyd
authored
Merge pull request #488 from carusogabriel/phpunit
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
2 parents 8d715e9 + 732d47f commit a4ae481

19 files changed

+55
-43
lines changed

‎Tests/Command/BaseCommandTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace OldSound\RabbitMqBundle\Tests\Command;
44

5-
abstract class BaseCommandTest extends \PHPUnit_Framework_TestCase
5+
use PHPUnit\Framework\TestCase;
6+
7+
abstract class BaseCommandTest extends TestCase
68
{
79
protected $application;
810
protected $definition;

‎Tests/Command/ConsumerCommandTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace OldSound\RabbitMqBundle\Tests\Command;
44

55
use OldSound\RabbitMqBundle\Command\ConsumerCommand;
6-
76
use Symfony\Component\Console\Input\InputOption;
87

98
class ConsumerCommandTest extends BaseCommandTest

‎Tests/Command/DynamicConsumerCommandTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace OldSound\RabbitMqBundle\Tests\Command;
44

55
use OldSound\RabbitMqBundle\Command\DynamicConsumerCommand;
6-
76
use Symfony\Component\Console\Input\InputOption;
87

9-
class DynamicConsumerCommandTest extends BaseCommandTest{
10-
8+
class DynamicConsumerCommandTest extends BaseCommandTest
9+
{
10+
1111
protected function setUp()
1212
{
1313
parent::setUp();
@@ -25,7 +25,7 @@ protected function setUp()
2525
$this->command = new DynamicConsumerCommand();
2626
$this->command->setApplication($this->application);
2727
}
28-
28+
2929
/**
3030
* testInputsDefinitionCommand
3131
*/
@@ -35,7 +35,7 @@ public function testInputsDefinitionCommand()
3535
$definition = $this->command->getDefinition();
3636
$this->assertTrue($definition->hasArgument('name'));
3737
$this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
38-
38+
3939
$this->assertTrue($definition->hasArgument('context'));
4040
$this->assertTrue($definition->getArgument('context')->isRequired()); // Context is required for the queue options provider
4141

‎Tests/Command/MultipleConsumerCommandTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace OldSound\RabbitMqBundle\Tests\Command;
44

55
use OldSound\RabbitMqBundle\Command\MultipleConsumerCommand;
6-
76
use Symfony\Component\Console\Input\InputOption;
87

9-
class MultipleConsumerCommandTest extends BaseCommandTest{
10-
8+
class MultipleConsumerCommandTest extends BaseCommandTest
9+
{
10+
1111
protected function setUp()
1212
{
1313
parent::setUp();
@@ -25,7 +25,7 @@ protected function setUp()
2525
$this->command = new MultipleConsumerCommand();
2626
$this->command->setApplication($this->application);
2727
}
28-
28+
2929
/**
3030
* testInputsDefinitionCommand
3131
*/
@@ -35,7 +35,7 @@ public function testInputsDefinitionCommand()
3535
$definition = $this->command->getDefinition();
3636
$this->assertTrue($definition->hasArgument('name'));
3737
$this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
38-
38+
3939
$this->assertTrue($definition->hasArgument('context'));
4040
$this->assertFalse($definition->getArgument('context')->isRequired()); // Context is required for the queue options provider
4141

‎Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
1010
use OldSound\RabbitMqBundle\DependencyInjection\OldSoundRabbitMqExtension;
1111
use Symfony\Component\DependencyInjection\Reference;
12+
use PHPUnit\Framework\TestCase;
1213

13-
class OldSoundRabbitMqExtensionTest extends \PHPUnit_Framework_TestCase
14+
class OldSoundRabbitMqExtensionTest extends TestCase
1415
{
1516
public function testFooConnectionDefinition()
1617
{

‎Tests/Event/AfterProcessingMessageEventTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
use OldSound\RabbitMqBundle\Event\AfterProcessingMessageEvent;
66
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
77
use PhpAmqpLib\Message\AMQPMessage;
8+
use PHPUnit\Framework\TestCase;
89

910
/**
1011
* Class AfterProcessingMessageEventTest
1112
*
1213
* @package OldSound\RabbitMqBundle\Tests\Event
1314
*/
14-
class AfterProcessingMessageEventTest extends \PHPUnit_Framework_TestCase
15+
class AfterProcessingMessageEventTest extends TestCase
1516
{
1617
protected function getConsumer()
1718
{
@@ -33,4 +34,4 @@ public function testEvent()
3334
$this->assertSame($AMQPMessage, $event->getAMQPMessage());
3435
$this->assertSame($consumer, $event->getConsumer());
3536
}
36-
}
37+
}

‎Tests/Event/BeforeProcessingMessageEventTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
use OldSound\RabbitMqBundle\Event\BeforeProcessingMessageEvent;
66
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
77
use PhpAmqpLib\Message\AMQPMessage;
8+
use PHPUnit\Framework\TestCase;
89

910
/**
1011
* Class BeforeProcessingMessageEventTest
1112
*
1213
* @package OldSound\RabbitMqBundle\Tests\Event
1314
*/
14-
class BeforeProcessingMessageEventTest extends \PHPUnit_Framework_TestCase
15+
class BeforeProcessingMessageEventTest extends TestCase
1516
{
1617
protected function getConsumer()
1718
{

‎Tests/Event/OnIdleEventTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44

55
use OldSound\RabbitMqBundle\Event\OnIdleEvent;
66
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
7+
use PHPUnit\Framework\TestCase;
78

89
/**
910
* Class OnIdleEventTest
1011
*
1112
* @package OldSound\RabbitMqBundle\Tests\Event
1213
*/
13-
class OnIdleEventTest extends \PHPUnit_Framework_TestCase
14+
class OnIdleEventTest extends TestCase
1415
{
1516
protected function getConsumer()
1617
{

‎Tests/Manager/MemoryCheckerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44

55
use OldSound\RabbitMqBundle\MemoryChecker\MemoryConsumptionChecker;
66
use OldSound\RabbitMqBundle\MemoryChecker\NativeMemoryUsageProvider;
7+
use PHPUnit\Framework\TestCase;
78

89
/**
910
* Class MemoryManagerTest
1011
*
1112
* @package OldSound\RabbitMqBundle\Tests\Manager
1213
*/
13-
class MemoryConsumptionCheckerTest extends \PHPUnit_Framework_TestCase
14+
class MemoryConsumptionCheckerTest extends TestCase
1415
{
1516
public function testMemoryIsNotAlmostOverloaded()
1617
{

‎Tests/RabbitMq/AMQPConnectionFactoryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
use OldSound\RabbitMqBundle\Provider\ConnectionParametersProviderInterface;
66
use OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory;
77
use OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures\AMQPConnection;
8+
use PHPUnit\Framework\TestCase;
89

9-
class AMQPConnectionFactoryTest extends \PHPUnit_Framework_TestCase
10+
class AMQPConnectionFactoryTest extends TestCase
1011
{
1112
public function testDefaultValues()
1213
{

‎Tests/RabbitMq/BaseAmqpTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
use OldSound\RabbitMqBundle\Event\AMQPEvent;
66
use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
77
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
8+
use PHPUnit\Framework\TestCase;
89

9-
class BaseAmqpTest extends \PHPUnit_Framework_TestCase
10+
class BaseAmqpTest extends TestCase
1011
{
1112

1213
public function testLazyConnection()

‎Tests/RabbitMq/BaseConsumerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
44

55
use OldSound\RabbitMqBundle\RabbitMq\BaseConsumer;
6+
use PHPUnit\Framework\TestCase;
67

7-
class BaseConsumerTest extends \PHPUnit_Framework_TestCase
8+
class BaseConsumerTest extends TestCase
89
{
910
/** @var BaseConsumer */
1011
protected $consumer;

‎Tests/RabbitMq/BindingTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
44

5-
65
use OldSound\RabbitMqBundle\RabbitMq\Binding;
6+
use PHPUnit\Framework\TestCase;
77

8-
class BindingTest extends \PHPUnit_Framework_TestCase
8+
class BindingTest extends TestCase
99
{
1010

1111
protected function getBinding($amqpConnection, $amqpChannel)

‎Tests/RabbitMq/ConsumerTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
use PhpAmqpLib\Exception\AMQPTimeoutException;
1111
use PhpAmqpLib\Message\AMQPMessage;
1212
use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
13+
use PHPUnit\Framework\TestCase;
1314

14-
class ConsumerTest extends \PHPUnit_Framework_TestCase
15-
{
15+
class ConsumerTest extends TestCase
16+
{
1617
protected function getConsumer($amqpConnection, $amqpChannel)
1718
{
1819
return new Consumer($amqpConnection, $amqpChannel);

‎Tests/RabbitMq/DynamicConsumerTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
use OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer;
66

77
class DynamicConsumerTest extends ConsumerTest
8-
{
8+
{
99
public function getConsumer($amqpConnection, $amqpChannel)
1010
{
1111
return new DynamicConsumer($amqpConnection, $amqpChannel);
1212
}
13-
13+
1414
/**
1515
* Preparing QueueOptionsProviderInterface instance
1616
*
@@ -21,14 +21,14 @@ private function prepareQueueOptionsProvider()
2121
return $this->getMockBuilder('\OldSound\RabbitMqBundle\Provider\QueueOptionsProviderInterface')
2222
->getMock();
2323
}
24-
24+
2525
public function testQueueOptionsPrivider()
2626
{
2727
$amqpConnection = $this->prepareAMQPConnection();
2828
$amqpChannel = $this->prepareAMQPChannel();
2929
$consumer = $this->getConsumer($amqpConnection, $amqpChannel);
3030
$consumer->setContext('foo');
31-
31+
3232
$queueOptionsProvider = $this->prepareQueueOptionsProvider();
3333
$queueOptionsProvider->expects($this->once())
3434
->method('getQueueOptions')
@@ -40,12 +40,12 @@ public function testQueueOptionsPrivider()
4040
)
4141
)
4242
));
43-
43+
4444
$consumer->setQueueOptionsProvider($queueOptionsProvider);
45-
45+
4646
$reflectionClass = new \ReflectionClass(get_class($consumer));
4747
$reflectionMethod = $reflectionClass->getMethod('mergeQueueOptions');
4848
$reflectionMethod->setAccessible(true);
49-
$reflectionMethod->invoke($consumer);
49+
$reflectionMethod->invoke($consumer);
5050
}
5151
}

‎Tests/RabbitMq/MultipleConsumerTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
use PhpAmqpLib\Channel\AMQPChannel;
99
use PhpAmqpLib\Connection\AMQPConnection;
1010
use PhpAmqpLib\Message\AMQPMessage;
11+
use PHPUnit\Framework\TestCase;
1112

12-
class MultipleConsumerTest extends \PHPUnit_Framework_TestCase
13+
class MultipleConsumerTest extends TestCase
1314
{
1415
/**
1516
* Multiple consumer
@@ -111,13 +112,13 @@ public function testQueuesProvider($processFlag, $expectedMethod, $expectedReque
111112
$this->multipleConsumer->processQueueMessage('test-1', $amqpMessage);
112113
$this->multipleConsumer->processQueueMessage('test-2', $amqpMessage);
113114
}
114-
115+
115116
public function testQueuesPrivider()
116117
{
117118
$amqpConnection = $this->prepareAMQPConnection();
118119
$amqpChannel = $this->prepareAMQPChannel();
119120
$this->multipleConsumer->setContext('foo');
120-
121+
121122
$queuesProvider = $this->prepareQueuesProvider();
122123
$queuesProvider->expects($this->once())
123124
->method('getQueues')
@@ -126,13 +127,13 @@ public function testQueuesPrivider()
126127
'queue_foo' => array()
127128
)
128129
));
129-
130+
130131
$this->multipleConsumer->setQueuesProvider($queuesProvider);
131-
132+
132133
$reflectionClass = new \ReflectionClass(get_class($this->multipleConsumer));
133134
$reflectionMethod = $reflectionClass->getMethod('mergeQueues');
134135
$reflectionMethod->setAccessible(true);
135-
$reflectionMethod->invoke($this->multipleConsumer);
136+
$reflectionMethod->invoke($this->multipleConsumer);
136137
}
137138

138139
/**
@@ -268,4 +269,4 @@ private function prepareCallback($processFlag)
268269
return $processFlag;
269270
};
270271
}
271-
}
272+
}

‎Tests/RabbitMq/RpcClientTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use OldSound\RabbitMqBundle\RabbitMq\RpcClient;
66
use PhpAmqpLib\Message\AMQPMessage;
7+
use PHPUnit\Framework\TestCase;
78

8-
class RpcClientTest extends \PHPUnit_Framework_TestCase
9+
class RpcClientTest extends TestCase
910
{
1011
public function testProcessMessageWithCustomUnserializer()
1112
{

‎Tests/RabbitMq/RpcServerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use OldSound\RabbitMqBundle\RabbitMq\RpcServer;
66
use PhpAmqpLib\Message\AMQPMessage;
7+
use PHPUnit\Framework\TestCase;
78

8-
class RpcServerTest extends \PHPUnit_Framework_TestCase
9+
class RpcServerTest extends TestCase
910
{
1011
public function testProcessMessageWithCustomSerializer()
1112
{
@@ -38,4 +39,3 @@ public function testProcessMessageWithCustomSerializer()
3839
$server->processMessage($message);
3940
}
4041
}
41-

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require-dev": {
2222
"symfony/serializer": "^2.7|^3.0|^4.0",
2323
"symfony/debug": "^2.7|^3.0|^4.0",
24-
"phpunit/phpunit": "^4.8|^5.0"
24+
"phpunit/phpunit": "^4.8.35|^5.4.3"
2525
},
2626
"replace": {
2727
"oldsound/rabbitmq-bundle": "self.version"

0 commit comments

Comments
 (0)