aboutsummaryrefslogtreecommitdiffstats
path: root/tests/class_loader/class_loader_test.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-08-20 22:05:05 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-08-20 22:05:05 +0200
commitdf111373a6b6614857c6729b5fcc23985e0b0278 (patch)
treea9ab5fb95c24787d6c6421a643165ea9f39c81a7 /tests/class_loader/class_loader_test.php
parent3f0c02533aad96ead9597b96351c0fd6b0cf5178 (diff)
parentf870434222b209f705b902168cad179b7ef8bd12 (diff)
downloadforums-df111373a6b6614857c6729b5fcc23985e0b0278.tar
forums-df111373a6b6614857c6729b5fcc23985e0b0278.tar.gz
forums-df111373a6b6614857c6729b5fcc23985e0b0278.tar.bz2
forums-df111373a6b6614857c6729b5fcc23985e0b0278.tar.xz
forums-df111373a6b6614857c6729b5fcc23985e0b0278.zip
Merge branch 'feature/naderman/auto-loading' into develop
* feature/naderman/auto-loading: [feature/auto-loading] Only check subdir if there is another name part.
Diffstat (limited to 'tests/class_loader/class_loader_test.php')
-rw-r--r--tests/class_loader/class_loader_test.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index 37c11657c4..e53507ded3 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -24,6 +24,12 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$prefix .= 'includes/';
$this->assertEquals(
+ '',
+ $class_loader->resolve_path('phpbb_dir'),
+ 'Class with same name as a directory is unloadable'
+ );
+
+ $this->assertEquals(
$prefix . 'class_name.php',
$class_loader->resolve_path('phpbb_class_name'),
'Top level class'