aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-09-10 14:44:22 +0200
committerNils Adermann <naderman@naderman.de>2013-09-16 00:39:08 +0200
commit1a6202d517a1cef817d2cedafdf36b0d95bb69a0 (patch)
treeb278136f2e5748822105910e4b9a95d53f008749
parent43c5ed570fca18c5a41a6b9b2b60de4dd4235d2c (diff)
downloadforums-1a6202d517a1cef817d2cedafdf36b0d95bb69a0.tar
forums-1a6202d517a1cef817d2cedafdf36b0d95bb69a0.tar.gz
forums-1a6202d517a1cef817d2cedafdf36b0d95bb69a0.tar.bz2
forums-1a6202d517a1cef817d2cedafdf36b0d95bb69a0.tar.xz
forums-1a6202d517a1cef817d2cedafdf36b0d95bb69a0.zip
[ticket/11700] Fix config db tests after namespace mishap
PHPBB3-11700
-rw-r--r--tests/config/db_test.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/config/db_test.php b/tests/config/db_test.php
index a014c72c65..dd1c88f707 100644
--- a/tests/config/db_test.php
+++ b/tests/config/db_test.php
@@ -24,7 +24,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->cache = new phpbb_mock_cache;
$this->db = $this->new_dbal();
- $this->config = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $this->config = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
}
public function test_load_config()
@@ -36,7 +36,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
public function test_load_cached()
{
$cache = new phpbb_mock_cache(array('config' => array('x' => 'y')));
- $this->config = new \phpbb\config\db($this->db, $cache, '\phpbb\config\config');
+ $this->config = new \phpbb\config\db($this->db, $cache, 'phpbb_config');
$this->assertTrue(!isset($this->config['foo']));
$this->assertEquals('42', $this->config['bar']);
@@ -49,7 +49,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->config['foo'] = 'x'; // temporary set
$this->assertEquals('x', $this->config['foo']);
- $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->assertEquals('23', $config2['foo']);
}
@@ -59,7 +59,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->assertEquals('17', $this->config['foo']);
// re-read config and populate cache
- $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->cache->checkVar($this, 'config', array('foo' => '17'));
}
@@ -68,7 +68,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->config->set('bar', '17', false);
// re-read config and populate cache
- $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->cache->checkVar($this, 'config', array('foo' => '23'));
}
@@ -78,7 +78,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->assertEquals('5', $this->config['foobar']);
// re-read config and populate cache
- $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->cache->checkVar($this, 'config', array('foo' => '23', 'foobar' => '5'));
}
@@ -88,7 +88,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->assertEquals('5', $this->config['foobar']);
// re-read config and populate cache
- $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->cache->checkVar($this, 'config', array('foo' => '23'));
}
@@ -133,7 +133,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
// re-read config and populate cache
$cache2 = new phpbb_mock_cache;
- $config2 = new \phpbb\config\db($this->db, $cache2, '\phpbb\config\config');
+ $config2 = new \phpbb\config\db($this->db, $cache2, 'phpbb_config');
$cache2->checkVarUnset($this, 'foo');
$this->assertFalse(isset($config2['foo']));
}
@@ -145,7 +145,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->config->delete('bar');
$this->cache->checkVarUnset($this, 'bar');
$this->assertFalse(isset($this->config['bar']));
-
+
$this->config->set('bar', 'new bar', false);
$this->assertEquals('new bar', $this->config['bar']);
}
@@ -157,7 +157,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
$this->config->delete('foo');
$this->cache->checkVarUnset($this, 'foo');
$this->assertFalse(isset($this->config['foo']));
-
+
$this->config->set('foo', 'new foo', true);
$this->assertEquals('new foo', $this->config['foo']);
}