1 files changed, 36 insertions, 5 deletions
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index d67dea3719..b92c4fa6bb 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -1,20 +1,23 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
 require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
 
 class phpbb_error_collector_test extends phpbb_test_case
 {
 	public function test_collection()
 	{
-		$collector = new phpbb_error_collector;
+		$collector = new \phpbb\error_collector(E_ALL | E_STRICT); // php set_error_handler() default
 		$collector->install();
 
 		// Cause a warning
@@ -32,4 +35,32 @@ class phpbb_error_collector_test extends phpbb_test_case
 		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
 		$this->assertStringEndsWith(" line $line", $error_contents);
 	}
+
+	public function test_collection_with_mask()
+	{
+		$collector = new \phpbb\error_collector(E_ALL & ~E_NOTICE); // not collecting notices
+		$collector->install();
+
+		// Cause a warning
+		1/0; $line = __LINE__;
+
+		// Cause a notice
+		$array = array('ITEM' => 'value');
+		$value = $array[ITEM]; $line2 = __LINE__;
+
+		$collector->uninstall();
+
+		// The notice should not be collected
+		$this->assertEmpty($collector->errors[1]);
+
+		list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
+		$error_contents = $collector->format_errors();
+
+		$this->assertEquals($errno, 2);
+
+		// Unfortunately $error_contents will contain the full path here,
+		// because the tests directory is outside of phpbb root path.
+		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
+		$this->assertStringEndsWith(" line $line", $error_contents);
+	}
 }