diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-08-31 20:42:20 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-08-31 20:42:20 +0200 |
| commit | f1550a65b53fb64b438d5c15ef83bf4e63dafa5f (patch) | |
| tree | 235bcf89424a619f6345a326f26a563fe2c3f207 | |
| parent | 0245ac581e24ddc7fa2288ccd24db9671a1efe31 (diff) | |
| parent | 9edf0d64a2735eaff6dbd15487b008bf9ef9b686 (diff) | |
| download | forums-f1550a65b53fb64b438d5c15ef83bf4e63dafa5f.tar forums-f1550a65b53fb64b438d5c15ef83bf4e63dafa5f.tar.gz forums-f1550a65b53fb64b438d5c15ef83bf4e63dafa5f.tar.bz2 forums-f1550a65b53fb64b438d5c15ef83bf4e63dafa5f.tar.xz forums-f1550a65b53fb64b438d5c15ef83bf4e63dafa5f.zip | |
Merge branch 'feature/evil3/auto-loading' into develop
* feature/evil3/auto-loading:
[feature/auto-loading] Add test case for phpbb_dir2 =>
| -rw-r--r-- | tests/class_loader/class_loader_test.php | 5 | ||||
| -rw-r--r-- | tests/class_loader/includes/dir2/dir2.php | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index e53507ded3..ecfac8080d 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -44,6 +44,11 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase $class_loader->resolve_path('phpbb_dir_subdir_class_name'), 'Class in a sub-directory' ); + $this->assertEquals( + $prefix . 'dir2/dir2.php', + $class_loader->resolve_path('phpbb_dir2'), + 'Class with name of dir within dir (short class name)' + ); } public function test_resolve_cached() diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/includes/dir2/dir2.php new file mode 100644 index 0000000000..01cf4086ff --- /dev/null +++ b/tests/class_loader/includes/dir2/dir2.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_dir2 +{ +} + |