Add test to prove the fix made in pull/2899

Ensure that event listeners are not lost when merging the global and
local listeners.

Fixes #2897
Fixes #2899

lib/Cake/Test/Case/Event/CakeEventManagerTest.php

@@ -1,9 +1,5 @@
 <?php
 /**
- * ControllerTestCaseTest file
- *
- * Test Case for ControllerTestCase class
- *
  * CakePHP : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -504,4 +500,22 @@ public function testDispatchLocalHandledByGlobal() {
 		$this->assertEquals('ok', $event->data['callback']);
 	}
 
+/**
+ * Test that events are dispatched properly when there are global and local 
+ * listeners at the same priority.
+ *
+ * @return void
+ */
+	public function testDispatchWithGlobalAndLocalEvents() {
+		$listener = new CustomTestEventListener();
+		CakeEventManager::instance()->attach($listener);
+		$listener2 = new CakeEventTestListener();
+		$manager = new CakeEventManager();
+		$manager->attach([$listener2, 'listenerFunction'], 'fake.event');
+
+		$manager->dispatch(new CakeEvent('fake.event', $this));
+		$this->assertEquals(array('listenerFunction'), $listener->callStack);
+		$this->assertEquals(array('listenerFunction'), $listener2->callStack);
+	}
+
 }