geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-17 17:25:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Replace deprecated TestCase::at().

Browse Source 
The "at" matcher will be removed in PHPUnit 10 but it is not a bad thing
after all because it was cumbersome and error-prone.

Took the opportunity to improve some tests while converting them.
This commit is contained in:
Daniele Alessandri
2020-08-29 00:20:04 +02:00
parent c6f2ce4b83
commit 6d6c970ae2
16 changed files with 760 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Predis/Connection/Replication/MasterSlaveReplicationTest.php
+84 -59
View File
@@ -1019,8 +1019,9 @@ class MasterSlaveReplicationTest extends PredisTestCase
$slave1
->expects($this->exactly(2))
->method('executeCommand')
->with(
$this->logicalOr($cmdEval, $cmdEvalSha)
->withConsecutive(
array($this->isRedisCommand($cmdEval)),
array($this->isRedisCommand($cmdEvalSha))
);
$replication = new MasterSlaveReplication();
@@ -1063,8 +1064,10 @@ class MasterSlaveReplicationTest extends PredisTestCase
$master
->expects($this->once())
->method('executeCommand')
->with($cmdInfo)
->will($this->returnValue('
->with(
$this->isRedisCommand($cmdInfo)
)
->willReturn('
# Replication
role:master
connected_slaves:2
@@ -1076,7 +1079,7 @@ repl_backlog_size:1048576
repl_backlog_first_byte_offset:2
repl_backlog_histlen:12978
'
));
);
$replication = new MasterSlaveReplication();
$replication->setConnectionFactory($connFactory);
@@ -1107,32 +1110,41 @@ repl_backlog_histlen:12978
/** @var Connection\FactoryInterface|MockObject */
$connFactory = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$connFactory
->expects($this->at(0))
->expects($this->exactly(3))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6381',
'role' => 'master',
))
->willReturn($master);
$connFactory
->expects($this->at(1))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6382',
'role' => 'slave',
))
->willReturn($slave1);
$connFactory
->expects($this->at(2))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6383',
'role' => 'slave',
))
->willReturn($slave2);
->withConsecutive(
# Connection to master node
array(
array(
'host' => '127.0.0.1',
'port' => '6381',
'role' => 'master',
)
),
# Connection to first slave
array(
array(
'host' => '127.0.0.1',
'port' => '6382',
'role' => 'slave',
)
),
# Connection to second slave
array(
array(
'host' => '127.0.0.1',
'port' => '6383',
'role' => 'slave',
)
)
)
->willReturnOnConsecutiveCalls(
$master,
$slave1,
$slave2
);
$slave1
->expects($this->once())
@@ -1206,37 +1218,48 @@ repl_backlog_histlen:12978
/** @var Connection\FactoryInterface|MockObject */
$connFactory = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$connFactory
->expects($this->at(0))
->expects($this->exactly(3))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6381',
'role' => 'master',
))
->willReturn($master);
$connFactory
->expects($this->at(1))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6382',
'role' => 'slave',
))
->willReturn($slave1);
$connFactory
->expects($this->at(2))
->method('create')
->with(array(
'host' => '127.0.0.1',
'port' => '6383',
'role' => 'slave',
))
->willReturn($slave2);
->withConsecutive(
# Connection to master node
array(
array(
'host' => '127.0.0.1',
'port' => '6381',
'role' => 'master',
)
),
# Connection to first slave
array(
array(
'host' => '127.0.0.1',
'port' => '6382',
'role' => 'slave',
)
),
# Connection to second slave
array(
array(
'host' => '127.0.0.1',
'port' => '6383',
'role' => 'slave',
)
)
)
->willReturnOnConsecutiveCalls(
$master,
$slave1,
$slave2
);
$masterKO
->expects($this->once())
->method('executeCommand')
->with($cmdInfo)
->with(
$this->isRedisCommand($cmdInfo)
)
->willThrowException(
new Connection\ConnectionException($masterKO)
);
@@ -1268,8 +1291,10 @@ repl_backlog_histlen:0
$master
->expects($this->once())
->method('executeCommand')
->with($cmdInfo)
->will($this->returnValue('
->with(
$this->isRedisCommand($cmdInfo)
)
->willReturn('
# Replication
role:master
connected_slaves:2
@@ -1281,7 +1306,7 @@ repl_backlog_size:1048576
repl_backlog_first_byte_offset:2
repl_backlog_histlen:12978
'
));
);
$replication = new MasterSlaveReplication();
$replication->setConnectionFactory($connFactory);