Throwing assertion error if no event list is configured

cakephp · Jun 15, 2016 · 92d871e · 92d871e
1 parent 8de073a
commit 92d871e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/src/TestSuite/Constraint/EventFired.php b/src/TestSuite/Constraint/EventFired.php
@@ -2,6 +2,7 @@
 namespace Cake\TestSuite\Constraint;
 
 use Cake\Event\EventManager;
+use PHPUnit_Framework_AssertionFailedError;
 use PHPUnit_Framework_Constraint;
 
 /**
@@ -25,6 +26,10 @@ public function __construct($eventManager)
     {
         parent::__construct();
         $this->_eventManager = $eventManager;
+
+        if ($this->_eventManager->getEventList() === null) {
+            throw new PHPUnit_Framework_AssertionFailedError('The event manager you are asserting against is not configured to track events.');
+        }
     }
 
     /**

diff --git a/src/TestSuite/Constraint/EventFiredWith.php b/src/TestSuite/Constraint/EventFiredWith.php
@@ -47,6 +47,10 @@ public function __construct($eventManager, $dataKey, $dataValue)
         $this->_eventManager = $eventManager;
         $this->_dataKey = $dataKey;
         $this->_dataValue = $dataValue;
+
+        if ($this->_eventManager->getEventList() === null) {
+            throw new PHPUnit_Framework_AssertionFailedError('The event manager you are asserting against is not configured to track events.');
+        }
     }
 
     /**

diff --git a/tests/TestCase/TestSuite/TestCaseTest.php b/tests/TestCase/TestSuite/TestCaseTest.php
@@ -48,6 +48,28 @@ public static function defaultConnectionName()
 class TestCaseTest extends TestCase
 {
 
+    /**
+     * tests trying to assertEventFired without configuring an event list
+     *
+     * @expectedException \PHPUnit_Framework_AssertionFailedError
+     */
+    public function testEventFiredMisconfiguredEventList()
+    {
+        $manager = EventManager::instance();
+        $this->assertEventFired('my.event', $manager);
+    }
+
+    /**
+     * tests trying to assertEventFired without configuring an event list
+     *
+     * @expectedException \PHPUnit_Framework_AssertionFailedError
+     */
+    public function testEventFiredWithMisconfiguredEventList()
+    {
+        $manager = EventManager::instance();
+        $this->assertEventFiredWith('my.event', 'some', 'data', $manager);
+    }
+
     /**
      * tests assertEventFiredWith
      *