correct tests

gpslab · Apr 26, 2017 · 1405d1a · 1405d1a
1 parent 66da5b8
commit 1405d1a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/tests/Queue/MemoryEventQueueTest.php b/tests/Queue/MemoryEventQueueTest.php
@@ -32,8 +32,8 @@ public function testQueue()
 
         $this->assertTrue($this->queue->push($event1));
         $this->assertTrue($this->queue->push($event2));
-        $this->assertEquals($event2, $this->queue->pop());
         $this->assertEquals($event1, $this->queue->pop());
+        $this->assertEquals($event2, $this->queue->pop());
         $this->assertNull($this->queue->pop());
     }
 }
diff --git a/tests/Queue/MemoryUniqueEventQueueTest.php b/tests/Queue/MemoryUniqueEventQueueTest.php
@@ -31,11 +31,11 @@ public function testQueue()
         $event2 = new PurchaseOrderCreatedEvent();
 
         $this->assertTrue($this->queue->push($event1));
-        $this->assertFalse($this->queue->push($event1));
+        $this->assertTrue($this->queue->push($event1));
+        $this->assertTrue($this->queue->push($event2));
         $this->assertTrue($this->queue->push($event2));
-        $this->assertFalse($this->queue->push($event2));
-        $this->assertEquals($event2, $this->queue->pop());
         $this->assertEquals($event1, $this->queue->pop());
+        $this->assertEquals($event2, $this->queue->pop());
         $this->assertNull($this->queue->pop());
     }
 }
diff --git a/tests/Queue/PredisEventQueueTest.php b/tests/Queue/PredisEventQueueTest.php
@@ -68,7 +68,7 @@ public function testPush()
         $this->client
             ->expects($this->once())
             ->method('__call')
-            ->with('lpush', [self::SET_KEY, [$normalize]])
+            ->with('rpush', [self::SET_KEY, [$normalize]])
             ->will($this->returnValue(1))
         ;
 

diff --git a/tests/Queue/PredisUniqueEventQueueTest.php b/tests/Queue/PredisUniqueEventQueueTest.php
@@ -17,7 +17,7 @@
 
 class PredisUniqueEventQueueTest extends \PHPUnit_Framework_TestCase
 {
-    const SET_KEY = 'unique_events';
+    const LIST_KEY = 'unique_events';
     const FORMAT = 'predis';
 
     /**
@@ -66,9 +66,14 @@ public function testPush()
         ;
 
         $this->client
-            ->expects($this->once())
+            ->expects($this->at(0))
+            ->method('__call')
+            ->with('lrem', [self::LIST_KEY, 0, $normalize])
+        ;
+        $this->client
+            ->expects($this->at(1))
             ->method('__call')
-            ->with('sadd', [self::SET_KEY, [$normalize]])
+            ->with('rpush', [self::LIST_KEY, [$normalize]])
             ->will($this->returnValue(1))
         ;
 
@@ -80,7 +85,7 @@ public function testPopIsEmptyQueue()
         $this->client
             ->expects($this->once())
             ->method('__call')
-            ->with('spop', [self::SET_KEY])
+            ->with('lpop', [self::LIST_KEY])
             ->will($this->returnValue(null))
         ;
 
@@ -107,7 +112,7 @@ public function testPop()
         $this->client
             ->expects($this->once())
             ->method('__call')
-            ->with('spop', [self::SET_KEY])
+            ->with('lpop', [self::LIST_KEY])
             ->will($this->returnValue($normalize))
         ;
 
@@ -134,13 +139,13 @@ public function testPopFailedDenormalize()
         $this->client
             ->expects($this->at(0))
             ->method('__call')
-            ->with('spop', [self::SET_KEY])
+            ->with('lpop', [self::LIST_KEY])
             ->will($this->returnValue($normalize))
         ;
         $this->client
             ->expects($this->at(1))
             ->method('__call')
-            ->with('sadd', [self::SET_KEY, [$normalize]])
+            ->with('rpush', [self::LIST_KEY, [$normalize]])
         ;
 
         $this->serializer