test cleanup

Author: Nyholm

tests/Plugin/AddPathPluginTest.php

@@ -27,17 +27,22 @@ protected function setUp()
         $this->plugin = new AddPathPlugin(new Uri('/api'));
     }
 
-    public function testRewriteSameObject()
+    public function testRewriteSameUrl()
     {
-        $request = new Request('GET', 'https://example.com/foo');
-        $this->plugin->handleRequest($request, function (RequestInterface $request) {
+        $verify = function (RequestInterface $request) {
             $this->assertEquals('https://example.com/api/foo', $request->getUri()->__toString());
-        }, $this->callable);
+        };
+
+
+        $request = new Request('GET', 'https://example.com/foo');
+        $this->plugin->handleRequest($request, $verify, $this->callable);
 
         // Make a second call with the same $request object
-        $this->plugin->handleRequest($request, function (RequestInterface $request) {
-            $this->assertEquals('https://example.com/api/foo', $request->getUri()->__toString());
-        }, $this->callable);
+        $this->plugin->handleRequest($request, $verify, $this->callable);
+
+        // Make a new call with a new object but same URL
+        $request = new Request('GET', 'https://example.com/foo');
+        $this->plugin->handleRequest($request, $verify, $this->callable);
     }
 
     public function testRewriteOnRestart()
@@ -68,14 +73,14 @@ public function testRewriteWithDifferentUrl()
 
     public function testRewriteWithDifferentUrlWhenSecondUrlIncludesAddedPath()
     {
-        $request = new Request('GET', 'https://example.com/foo');
-        $this->plugin->handleRequest($request, function (RequestInterface $request) {
+        $verify = function (RequestInterface $request) {
             $this->assertEquals('https://example.com/api/foo', $request->getUri()->__toString());
-        }, $this->callable);
+        };
+
+        $request = new Request('GET', 'https://example.com/foo');
+        $this->plugin->handleRequest($request, $verify, $this->callable);
 
         $request = new Request('GET', 'https://example.com/api/foo');
-        $this->plugin->handleRequest($request, function (RequestInterface $request) {
-            $this->assertEquals('https://example.com/api/foo', $request->getUri()->__toString());
-        }, $this->callable);
+        $this->plugin->handleRequest($request, $verify, $this->callable);
     }
 }