Tweak Events testing

Author: jim-parry

system/Events/Events.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Events;
+<?php
+namespace CodeIgniter\Events;
 
 use Config\Services;
 
@@ -112,12 +113,10 @@ public static function initialize()
 
 		foreach (static::$files as $file)
 		{
-			if (! is_file($file))
+			if (is_file($file))
 			{
-				continue;
+				include $file;
 			}
-
-			include $file;
 		}
 
 		static::$initialized = true;
@@ -183,9 +182,7 @@ public static function trigger($eventName, ...$arguments): bool
 		{
 			$start = microtime(true);
 
-			$result = static::$simulate === false
-				? $listener(...$arguments)
-				: true;
+			$result = static::$simulate === false ? $listener(...$arguments) : true;
 
 			if (CI_DEBUG)
 			{
@@ -345,5 +342,4 @@ public static function getPerformanceLogs()
 	}
 
 	//--------------------------------------------------------------------
-
 }

tests/system/Events/EventsTest.php

@@ -1,10 +1,12 @@
-<?php namespace CodeIgniter\Events;
+<?php
+namespace CodeIgniter\Events;
 
 use CodeIgniter\Config\Config;
 use Tests\Support\Events\MockEvents;
 
 class EventsTest extends \CIUnitTestCase
 {
+
 	/**
 	 * Accessible event manager instance
 	 */
@@ -16,17 +18,21 @@ protected function setUp()
 
 		$this->manager = new MockEvents();
 
-		$config                  = config('Modules');
-		$config->activeExplorers = [];
-		Config::injectMock('Modules', $config);
-
 		Events::removeAllListeners();
 	}
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @runInSeparateProcess
+	 * @preserveGlobalState  disabled
+	 */
 	public function testInitialize()
 	{
+		$config                  = config('Modules');
+		$config->activeExplorers = [];
+		Config::injectMock('Modules', $config);
+
 		// it should start out empty
 		$default = [APPPATH . 'Config/Events.php'];
 		$this->manager->setFiles([]);
@@ -40,19 +46,26 @@ public function testInitialize()
 		// but we should be able to change it through the backdoor
 		$this->manager::setFiles(['/peanuts']);
 		$this->assertEquals(['/peanuts'], $this->manager->getFiles());
+
+		// re-initializing should have no effect
+		Events::initialize();
+		$this->assertEquals(['/peanuts'], $this->manager->getFiles());
 	}
 
 	//--------------------------------------------------------------------
 
-	// Not working currently - might want to revisit at some point.
-	//  public function testPerformance()
-	//  {
-	//      $logged = Events::getPerformanceLogs();
-	//      // there should be a few event activities logged
-	//      $this->assertGreaterThan(0,count($logged));
-	//
-	//      // might want additional tests after some activity, or to inspect what has happened so far
-	//  }
+	public function testPerformance()
+	{
+		$result = null;
+		Events::on('foo', function ($arg) use (&$result) {
+			$result = $arg;
+		});
+		Events::trigger('foo', 'bar');
+
+		$logged = Events::getPerformanceLogs();
+		// there should be some event activity logged
+		$this->assertGreaterThan(0, count($logged));
+	}
 
 	//--------------------------------------------------------------------