diff options
| author | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:29:36 -0700 |
|---|---|---|
| committer | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:29:36 -0700 |
| commit | e2a769ac79ad408e94935c97a5fc1325fb838c4f (patch) | |
| tree | 5f56bbc9d9290f49a6c88987561f345df49f8a3c /tests/class_loader | |
| parent | cc1aef47fb4f5d37415436c62067ad2dcde768bb (diff) | |
| parent | b71038486e067daf0c608d73aabeb60a56e86840 (diff) | |
| download | forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.gz forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.bz2 forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.xz forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.zip | |
Merge branch 'develop' into ticket/11620
Diffstat (limited to 'tests/class_loader')
| -rw-r--r-- | tests/class_loader/class_loader_test.php | 10 | ||||
| -rw-r--r-- | tests/class_loader/phpbb/class_name.php (renamed from tests/class_loader/includes/class_name.php) | 0 | ||||
| -rw-r--r-- | tests/class_loader/phpbb/dir.php (renamed from tests/class_loader/includes/dir.php) | 0 | ||||
| -rw-r--r-- | tests/class_loader/phpbb/dir/class_name.php (renamed from tests/class_loader/includes/dir/class_name.php) | 0 | ||||
| -rw-r--r-- | tests/class_loader/phpbb/dir/subdir/class_name.php (renamed from tests/class_loader/includes/dir/subdir/class_name.php) | 0 | ||||
| -rw-r--r-- | tests/class_loader/phpbb/dir2/dir2.php (renamed from tests/class_loader/includes/dir2/dir2.php) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index bf27c7c217..2b55c1ff8d 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -30,9 +30,9 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase public function test_resolve_path() { $prefix = dirname(__FILE__) . '/'; - $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/'); + $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/'); - $prefix .= 'includes/'; + $prefix .= 'phpbb/'; $this->assertEquals( '', @@ -71,10 +71,10 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase $cache = new phpbb_mock_cache($cache_map); $prefix = dirname(__FILE__) . '/'; - $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache); - $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', 'php', $cache); + $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/', 'php', $cache); + $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'phpbb/', 'php', $cache); - $prefix .= 'includes/'; + $prefix .= 'phpbb/'; $this->assertEquals( $prefix . 'dir/class_name.php', diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/phpbb/class_name.php index e941173cdd..e941173cdd 100644 --- a/tests/class_loader/includes/class_name.php +++ b/tests/class_loader/phpbb/class_name.php diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/phpbb/dir.php index 1c8930d8e7..1c8930d8e7 100644 --- a/tests/class_loader/includes/dir.php +++ b/tests/class_loader/phpbb/dir.php diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php index 0675aa8fc5..0675aa8fc5 100644 --- a/tests/class_loader/includes/dir/class_name.php +++ b/tests/class_loader/phpbb/dir/class_name.php diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php index 7321a609cc..7321a609cc 100644 --- a/tests/class_loader/includes/dir/subdir/class_name.php +++ b/tests/class_loader/phpbb/dir/subdir/class_name.php diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php index 01cf4086ff..01cf4086ff 100644 --- a/tests/class_loader/includes/dir2/dir2.php +++ b/tests/class_loader/phpbb/dir2/dir2.php |