From 2db160ff87fa42ca6c47e580de9bc9d7e5cced49 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 29 Jun 2014 00:33:31 +0200 Subject: [ticket/12775] Rename config_php to config_php_file PHPBB3-12775 --- tests/config_php_file_test.php | 30 ++++++++++++++++++++++++++++++ tests/config_php_test.php | 30 ------------------------------ tests/di/create_container_test.php | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 tests/config_php_file_test.php delete mode 100644 tests/config_php_test.php (limited to 'tests') diff --git a/tests/config_php_file_test.php b/tests/config_php_file_test.php new file mode 100644 index 0000000000..c2e4eb21c7 --- /dev/null +++ b/tests/config_php_file_test.php @@ -0,0 +1,30 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_config_php_file_test extends phpbb_test_case +{ + public function test_default() + { + $config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php'); + $this->assertSame('bar', $config_php->get('foo')); + $this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all()); + } + + public function test_set_config_file() + { + $config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php'); + $config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php'); + $this->assertSame('foo', $config_php->get('bar')); + $this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all()); + } +} diff --git a/tests/config_php_test.php b/tests/config_php_test.php deleted file mode 100644 index 6e2b4c2ac1..0000000000 --- a/tests/config_php_test.php +++ /dev/null @@ -1,30 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class phpbb_config_php_test extends phpbb_test_case -{ - public function test_default() - { - $config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php'); - $this->assertSame('bar', $config_php->get('foo')); - $this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all()); - } - - public function test_set_config_file() - { - $config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php'); - $config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php'); - $this->assertSame('foo', $config_php->get('bar')); - $this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all()); - } -} diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 57500c2ad2..221db9e13c 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -29,7 +29,7 @@ namespace public function setUp() { $this->phpbb_root_path = dirname(__FILE__) . '/'; - $this->config_php = new \phpbb\config_php($this->phpbb_root_path . 'fixtures/', 'php'); + $this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php'); $this->builder = new phpbb_mock_phpbb_di_container_builder($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php'); $this->filename = $this->phpbb_root_path . '../tmp/container.php'; -- cgit v1.2.1