geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-30 12:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Fix execution order of iterator methods.

Browse Source 
We were testing iterators following a broken assumption about the
order in which the Zend engine executes the various methods during
the iteration.
This commit is contained in:
Daniele Alessandri
2013-11-04 17:39:27 +01:00
parent 85c978fdad
commit 0ab0aa14fb
5 changed files with 136 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Iterator/Scan/AbstractScanIterator.php
+1
View File
@@ -137,6 +137,7 @@ abstract class AbstractScanIterator implements Iterator
public function rewind()
{
$this->reset();
$this->next();
}
/**
tests/Predis/Iterator/Scan/HashIteratorTest.php
+34 -36
View File
@@ -56,20 +56,20 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:3rd', $iterator->key());
$this->assertSame('value:3rd', $iterator->current());
$this->assertSame('field:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -100,20 +100,20 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:3rd', $iterator->key());
$this->assertSame('value:3rd', $iterator->current());
$this->assertSame('field:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -148,20 +148,20 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:3rd', $iterator->key());
$this->assertSame('value:3rd', $iterator->current());
$this->assertSame('field:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -186,15 +186,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', 'field:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -225,15 +225,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', 'field:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -258,15 +258,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', null, 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -297,15 +297,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', null, 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -330,15 +330,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', 'field:*', 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -369,15 +369,15 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash', 'field:*', 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -402,22 +402,20 @@ class HashIteratorTest extends StandardTestCase
$iterator = new HashIterator($client, 'key:hash');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->rewind();
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:1st', $iterator->key());
$this->assertSame('value:1st', $iterator->current());
$this->assertSame('field:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('field:2nd', $iterator->key());
$this->assertSame('value:2nd', $iterator->current());
$this->assertSame('field:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
tests/Predis/Iterator/Scan/KeyspaceIteratorTest.php
+33 -35
View File
@@ -54,20 +54,20 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('key:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -94,20 +94,20 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('key:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -138,20 +138,20 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('key:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -174,15 +174,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, 'key:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -209,15 +209,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, 'key:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -240,15 +240,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, null, 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -275,15 +275,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, null, 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -306,15 +306,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, 'key:*', 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -341,15 +341,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client, 'key:*', 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('key:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -372,17 +372,15 @@ class KeyspaceIteratorTest extends StandardTestCase
$iterator = new KeyspaceIterator($client);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->rewind();
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('key:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
tests/Predis/Iterator/Scan/SetIteratorTest.php
+34 -36
View File
@@ -54,20 +54,20 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('member:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -94,20 +94,20 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('member:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -138,20 +138,20 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(2, $iterator->key());
$this->assertSame('member:3rd', $iterator->current());
$this->assertSame(2, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -174,15 +174,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', 'member:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -209,15 +209,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', 'member:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -240,15 +240,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', null, 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -275,15 +275,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', null, 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -306,15 +306,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', 'member:*', 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -341,15 +341,15 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set', 'member:*', 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -372,22 +372,20 @@ class SetIteratorTest extends StandardTestCase
$iterator = new SetIterator($client, 'key:set');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->rewind();
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(0, $iterator->key());
$this->assertSame('member:1st', $iterator->current());
$this->assertSame(0, $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame(1, $iterator->key());
$this->assertSame('member:2nd', $iterator->current());
$this->assertSame(1, $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
tests/Predis/Iterator/Scan/SortedSetIteratorTest.php
+34 -36
View File
@@ -56,20 +56,20 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:3rd', $iterator->key());
$this->assertSame(3.0, $iterator->current());
$this->assertSame('member:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -100,20 +100,20 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:3rd', $iterator->key());
$this->assertSame(3.0, $iterator->current());
$this->assertSame('member:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -148,20 +148,20 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:3rd', $iterator->key());
$this->assertSame(3.0, $iterator->current());
$this->assertSame('member:3rd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -186,15 +186,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', 'member:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -225,15 +225,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', 'member:*');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -258,15 +258,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', null, 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -297,15 +297,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', null, 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -330,15 +330,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', 'member:*', 2);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -369,15 +369,15 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset', 'member:*', 1);
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());
@@ -402,22 +402,20 @@ class SortedSetIteratorTest extends StandardTestCase
$iterator = new SortedSetIterator($client, 'key:zset');
$iterator->next();
$iterator->rewind();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->rewind();
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:1st', $iterator->key());
$this->assertSame(1.0, $iterator->current());
$this->assertSame('member:1st', $iterator->key());
$iterator->next();
$this->assertTrue($iterator->valid());
$this->assertSame('member:2nd', $iterator->key());
$this->assertSame(2.0, $iterator->current());
$this->assertSame('member:2nd', $iterator->key());
$iterator->next();
$this->assertFalse($iterator->valid());