diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2012-03-28 15:48:45 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-21 12:12:41 +0200 |
commit | 3170845a5011ea76af7f4f8359acafb43ad7e19e (patch) | |
tree | 3f9b3aed307b3160158e3492aea06082d7c26481 /tests/log/add_test.php | |
parent | 2c7f498c1b43cfb96f868e9b0f9b80ad5ec626a8 (diff) | |
download | forums-3170845a5011ea76af7f4f8359acafb43ad7e19e.tar forums-3170845a5011ea76af7f4f8359acafb43ad7e19e.tar.gz forums-3170845a5011ea76af7f4f8359acafb43ad7e19e.tar.bz2 forums-3170845a5011ea76af7f4f8359acafb43ad7e19e.tar.xz forums-3170845a5011ea76af7f4f8359acafb43ad7e19e.zip |
[ticket/10714] Refactor disable mechanism to only disable certain types
Only disable admin log when adding multiple users, so critical errors are still
logged.
PHPBB3-10714
Diffstat (limited to 'tests/log/add_test.php')
-rw-r--r-- | tests/log/add_test.php | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/tests/log/add_test.php b/tests/log/add_test.php index a2b763f2b7..faf5953836 100644 --- a/tests/log/add_test.php +++ b/tests/log/add_test.php @@ -19,13 +19,21 @@ class phpbb_log_add_test extends phpbb_database_test_case public function test_log_enabled() { $log = new phpbb_log(LOG_TABLE); - $this->assertTrue($log->is_enabled()); + $this->assertTrue($log->is_enabled(), 'Initialise failed'); $log->disable(); - $this->assertFalse($log->is_enabled()); + $this->assertFalse($log->is_enabled(), 'Disable all failed'); $log->enable(); - $this->assertTrue($log->is_enabled()); + $this->assertTrue($log->is_enabled(), 'Enable all failed'); + + $log->disable('admin'); + $this->assertFalse($log->is_enabled('admin'), 'Disable admin failed'); + $this->assertTrue($log->is_enabled('user'), 'User should be enabled, is disabled'); + $this->assertTrue($log->is_enabled(), 'Disable admin disabled all'); + + $log->enable('admin'); + $this->assertTrue($log->is_enabled('admin'), 'Enable admin failed'); } public function test_log_add() @@ -45,9 +53,19 @@ class phpbb_log_add_test extends phpbb_database_test_case $log = new phpbb_log(LOG_TABLE); $this->assertEquals(1, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time)); - // Disable logging + // Disable logging for all types $log->disable(); - $this->assertFalse($log->add($mode, $user_id, $log_ip, $log_operation, $log_time)); + $this->assertFalse($log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for all types failed'); + $log->enable(); + + // Disable logging for same type + $log->disable('critical'); + $this->assertFalse($log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for same type failed'); + $log->enable(); + + // Disable logging for different type + $log->disable('admin'); + $this->assertEquals(2, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for different types failed'); $log->enable(); // Invalid mode specified |