diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/extension/finder_test.php | 12 | ||||
| -rw-r--r-- | tests/mock/cache.php | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 2b025433b7..26dd50ed12 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -154,12 +154,10 @@ class phpbb_extension_finder_test extends phpbb_test_case $finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/', $cache, '.php', '_custom_cache_name'); $files = $finder->suffix('_class.php')->get_files(); - sort($files); - $expected_files = array( - 'ext/bar/my/hidden_class.php', - 'ext/foo/a_class.php', - 'ext/foo/b_class.php', + 'ext/bar/my/hidden_class.php' => 'bar', + 'ext/foo/a_class.php' => 'foo', + 'ext/foo/b_class.php' => 'foo', ); $query = array( @@ -175,7 +173,7 @@ class phpbb_extension_finder_test extends phpbb_test_case $cache->checkAssociativeVar($this, '_custom_cache_name', array( md5(serialize($query)) => $expected_files, - )); + ), false); } public function test_cached_get_files() @@ -193,7 +191,7 @@ class phpbb_extension_finder_test extends phpbb_test_case $finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/', new phpbb_mock_cache(array( '_ext_finder' => array( - md5(serialize($query)) => array('file_name'), + md5(serialize($query)) => array('file_name' => 'extension'), ), ))); diff --git a/tests/mock/cache.php b/tests/mock/cache.php index b745123801..0f174ea449 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -59,13 +59,16 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface $test->assertEquals($data, $this->data[$var_name]); } - public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data) + public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true) { $test->assertTrue(isset($this->data[$var_name])); - foreach ($this->data[$var_name] as &$content) + if ($sort) { - sort($content); + foreach ($this->data[$var_name] as &$content) + { + sort($content); + } } $test->assertEquals($data, $this->data[$var_name]); |