geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-10 05:47:02 +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/Collection/Iterator/HashKeyTest.php
+71 -86
View File
@@ -178,19 +178,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array())
->will($this->returnValue(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 2, array())
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array()),
array('key:hash', 2, array())
)
->willReturnOnConsecutiveCalls(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd')),
array(0, array('field:3rd' => 'value:3rd'))
));
);
$iterator = new HashKey($client, 'key:hash');
@@ -228,19 +225,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array())
->will($this->returnValue(
array(4, array())
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 4, array())
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array()),
array('key:hash', 4, array())
)
->willReturnOnConsecutiveCalls(
array(4, array()),
array(0, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash');
@@ -273,26 +267,18 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(3))
->method('hscan')
->with('key:hash', 0, array())
->will($this->returnValue(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 2, array())
->will($this->returnValue(
array(5, array())
));
$client
->expects($this->at(3))
->method('hscan')
->with('key:hash', 5, array())
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array()),
array('key:hash', 2, array()),
array('key:hash', 5, array())
)
->willReturnOnConsecutiveCalls(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd')),
array(5, array()),
array(0, array('field:3rd' => 'value:3rd'))
));
);
$iterator = new HashKey($client, 'key:hash');
@@ -330,12 +316,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array('MATCH' => 'field:*'))
->will($this->returnValue(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
->withConsecutive(
array('key:hash', 0, array('MATCH' => 'field:*')),
array('key:hash', 2, array('MATCH' => 'field:*'))
)
->willReturn(
array(2, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd')),
array(0, array())
);
$iterator = new HashKey($client, 'key:hash', 'field:*');
@@ -368,19 +358,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array('MATCH' => 'field:*'))
->will($this->returnValue(
array(1, array('field:1st' => 'value:1st'))
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 1, array('MATCH' => 'field:*'))
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array('MATCH' => 'field:*')),
array('key:hash', 1, array('MATCH' => 'field:*'))
)
->willReturn(
array(1, array('field:1st' => 'value:1st')),
array(0, array('field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash', 'field:*');
@@ -413,12 +400,14 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->once())
->method('hscan')
->with('key:hash', 0, array('COUNT' => 2))
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array('COUNT' => 2))
)
->willReturn(
array(0, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash', null, 2);
@@ -451,19 +440,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array('COUNT' => 1))
->will($this->returnValue(
array(1, array('field:1st' => 'value:1st'))
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 1, array('COUNT' => 1))
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array('COUNT' => 1)),
array('key:hash', 1, array('COUNT' => 1))
)
->willReturnOnConsecutiveCalls(
array(1, array('field:1st' => 'value:1st')),
array(0, array('field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash', null, 1);
@@ -496,12 +482,14 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->once(1))
->method('hscan')
->with('key:hash', 0, array('MATCH' => 'field:*', 'COUNT' => 2))
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array('MATCH' => 'field:*', 'COUNT' => 2))
)
->willReturnOnConsecutiveCalls(
array(0, array('field:1st' => 'value:1st', 'field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash', 'field:*', 2);
@@ -534,19 +522,16 @@ class HashKeyTest extends PredisTestCase
->method('getCommandFactory')
->willReturn($this->getCommandFactory());
$client
->expects($this->at(1))
->expects($this->exactly(2))
->method('hscan')
->with('key:hash', 0, array('MATCH' => 'field:*', 'COUNT' => 1))
->will($this->returnValue(
array(1, array('field:1st' => 'value:1st'))
));
$client
->expects($this->at(2))
->method('hscan')
->with('key:hash', 1, array('MATCH' => 'field:*', 'COUNT' => 1))
->will($this->returnValue(
->withConsecutive(
array('key:hash', 0, array('MATCH' => 'field:*', 'COUNT' => 1)),
array('key:hash', 1, array('MATCH' => 'field:*', 'COUNT' => 1))
)
->willReturnOnConsecutiveCalls(
array(1, array('field:1st' => 'value:1st')),
array(0, array('field:2nd' => 'value:2nd'))
));
);
$iterator = new HashKey($client, 'key:hash', 'field:*', 1);