Ensure SwaggerViewStrategy tests correctly against v2 and v3 eventman…

…ager

src/SwaggerViewStrategy.php

@@ -6,13 +6,16 @@
 
 namespace ZF\Apigility\Documentation\Swagger;
 
-use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
+use Zend\EventManager\ListenerAggregateInterface;
+use Zend\EventManager\ListenerAggregateTrait;
 use Zend\View\Renderer\JsonRenderer;
 use Zend\View\ViewEvent;
 
-class SwaggerViewStrategy extends AbstractListenerAggregate
+class SwaggerViewStrategy implements ListenerAggregateInterface
 {
+    use ListenerAggregateTrait;
+
     /**
      * @var ViewModel
      */
@@ -32,8 +35,7 @@ public function __construct(JsonRenderer $renderer)
     }
 
     /**
-     * @param EventManagerInterface $events
-     * @param int $priority
+     * {@inheritDoc}
      */
     public function attach(EventManagerInterface $events, $priority = 200)
     {

test/SwaggerViewStrategyTest.php

@@ -8,6 +8,7 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\EventManager\EventManager;
+use Zend\EventManager\Test\EventListenerIntrospectionTrait;
 use Zend\Http\Response as HttpResponse;
 use Zend\Stdlib\Response as StdlibResponse;
 use Zend\View\Renderer\JsonRenderer;
@@ -17,6 +18,8 @@
 
 class SwaggerViewStrategyTest extends TestCase
 {
+    use EventListenerIntrospectionTrait;
+
     public function setUp()
     {
         $this->events   = new EventManager();
@@ -27,17 +30,19 @@ public function setUp()
 
     public function testStrategyAttachesToViewEventsAtPriority200()
     {
-        $listeners = $this->events->getListeners(ViewEvent::EVENT_RENDERER);
-        $this->assertEquals(1, count($listeners));
-        $listener = $listeners->top();
-        $this->assertEquals([$this->strategy, 'selectRenderer'], $listener->getCallback());
-        $this->assertEquals(200, $listener->getMetadatum('priority'));
+        $this->assertListenerAtPriority(
+            [$this->strategy, 'selectRenderer'],
+            200,
+            ViewEvent::EVENT_RENDERER,
+            $this->events
+        );
 
-        $listeners = $this->events->getListeners(ViewEvent::EVENT_RESPONSE);
-        $this->assertEquals(1, count($listeners));
-        $listener = $listeners->top();
-        $this->assertEquals([$this->strategy, 'injectResponse'], $listener->getCallback());
-        $this->assertEquals(200, $listener->getMetadatum('priority'));
+        $this->assertListenerAtPriority(
+            [$this->strategy, 'injectResponse'],
+            200,
+            ViewEvent::EVENT_RESPONSE,
+            $this->events
+        );
     }
 
     public function testSelectRendererReturnsJsonRendererWhenSwaggerViewModelIsPresentInEvent()