1 files changed, 27 insertions, 11 deletions

diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php
index 0702a2c21e..f60d7e3ee8 100644
--- a/tests/lock/db_test.php
+++ b/tests/lock/db_test.php
@@ -25,22 +25,21 @@ class phpbb_lock_db_test extends phpbb_database_test_case
 		global $db, $config;
 
 		$db = $this->db = $this->new_dbal();
-		$config = $this->config = array('rand_seed' => '', 'rand_seed_last_update' => '0');
+		$config = $this->config = new phpbb_config(array('rand_seed' => '', 'rand_seed_last_update' => '0'));
+		set_config(null, null, null, $this->config);
 		$this->lock = new phpbb_lock_db('test_lock', $this->config, $this->db);
 	}
 
 	public function test_new_lock()
 	{
-		global $config;
-
 		$this->assertTrue($this->lock->lock());
-		$this->assertTrue(isset($config['test_lock']), 'Lock was created');
+		$this->assertTrue(isset($this->config['test_lock']), 'Lock was created');
 
-		$lock2 = new phpbb_lock_db('test_lock', $config, $this->db);
+		$lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db);
 		$this->assertFalse($lock2->lock());
 
 		$this->lock->unlock();
-		$this->assertEquals('0', $config['test_lock'], 'Lock was released');
+		$this->assertEquals('0', $this->config['test_lock'], 'Lock was released');
 	}
 
 	public function test_expire_lock()
@@ -51,17 +50,34 @@ class phpbb_lock_db_test extends phpbb_database_test_case
 
 	public function test_double_lock()
 	{
-		global $config;
+		$this->assertTrue($this->lock->lock());
+		$this->assertTrue(isset($this->config['test_lock']), 'Lock was created');
+
+		$value = $this->config['test_lock'];
 
 		$this->assertTrue($this->lock->lock());
-		$this->assertTrue(isset($config['test_lock']), 'Lock was created');
+		$this->assertEquals($value, $this->config['test_lock'], 'Second lock was ignored');
 
-		$value = $config['test_lock'];
+		$this->lock->unlock();
+		$this->assertEquals('0', $this->config['test_lock'], 'Lock was released');
+	}
 
+	public function test_double_unlock()
+	{
 		$this->assertTrue($this->lock->lock());
-		$this->assertEquals($value, $config['test_lock'], 'Second lock was ignored');
+		$this->assertFalse(empty($this->config['test_lock']), 'First lock is acquired');
 
 		$this->lock->unlock();
-		$this->assertEquals('0', $config['test_lock'], 'Lock was released');
+		$this->assertEquals('0', $this->config['test_lock'], 'First lock is released');
+
+		$lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db);
+		$this->assertTrue($lock2->lock());
+		$this->assertFalse(empty($this->config['test_lock']), 'Second lock is acquired');
+
+		$this->lock->unlock();
+		$this->assertFalse(empty($this->config['test_lock']), 'Double release of first lock is ignored');
+
+		$lock2->unlock();
+		$this->assertEquals('0', $this->config['test_lock'], 'Second lock is released');
 	}
 }