Browse Source

fix tests on inserting with negative index and CS

antograssiot 9 years ago
parent
commit
9c7623b9cd

+ 12 - 6
tests/TestCase/Http/MiddlewareQueueTest.php

@@ -240,8 +240,8 @@ class MiddlewareQueueTest extends TestCase
         $queue->add($one)->insertAt(-1, $two)->insertAt(-1, $three);
 
         $this->assertCount(3, $queue);
-        $this->assertSame($three, $queue->get(0));
-        $this->assertSame($two, $queue->get(1));
+        $this->assertSame($two, $queue->get(0));
+        $this->assertSame($three, $queue->get(1));
         $this->assertSame($one, $queue->get(2));
     }
 
@@ -311,13 +311,19 @@ class MiddlewareQueueTest extends TestCase
         };
         $three = function () {
         };
+        $four = new DumbMiddleware();
         $queue = new MiddlewareQueue();
-        $queue->add($one)->add($two)->insertAfter(SampleMiddleware::class, $three);
+        $queue
+            ->add($one)
+            ->add($two)
+            ->insertAfter(SampleMiddleware::class, $three)
+            ->insertAfter(SampleMiddleware::class, $four);
 
-        $this->assertCount(3, $queue);
+        $this->assertCount(4, $queue);
         $this->assertSame($one, $queue->get(0));
-        $this->assertSame($three, $queue->get(1));
-        $this->assertSame($two, $queue->get(2));
+        $this->assertSame($four, $queue->get(1));
+        $this->assertSame($three, $queue->get(2));
+        $this->assertSame($two, $queue->get(3));
 
         $one = 'Sample';
         $queue = new MiddlewareQueue();

+ 4 - 3
tests/test_app/TestApp/Middleware/DumbMiddleware.php

@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.3.0
+ * @since         3.3.1
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace TestApp\Middleware;
@@ -17,8 +17,9 @@ namespace TestApp\Middleware;
 /**
  * Testing stub for middleware tests.
  */
-class DumbMiddleWare {
-    function __invoke($request, $response, $next)
+class DumbMiddleWare
+{
+    public function __invoke($request, $response, $next)
     {
         return $next($request, $response);
     }