7 files changed, 133 insertions, 0 deletions
diff --git a/tests/class_loader/cache_mock.php b/tests/class_loader/cache_mock.php
new file mode 100644
index 0000000000..b254978fcc
--- /dev/null
+++ b/tests/class_loader/cache_mock.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_cache_mock
+{
+	private $variables = array();
+
+	function get($var_name)
+	{
+		if (isset($this->variables[$var_name]))
+		{
+			return $this->variables[$var_name];
+		}
+
+		return false;
+	}
+
+	function put($var_name, $value)
+	{
+		$this->variables[$var_name] = $value;
+	}
+}
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
new file mode 100644
index 0000000000..aef4f1de07
--- /dev/null
+++ b/tests/class_loader/class_loader_test.php
@@ -0,0 +1,74 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/cache_mock.php';
+
+require_once __DIR__ . '/../../phpBB/includes/class_loader.php';
+
+class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
+{
+	public function test_resolve_path()
+	{
+		$prefix = __DIR__ . '/';
+		$class_loader = new phpbb_class_loader($prefix);
+
+		$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'
+		);
+		$this->assertEquals(
+			$prefix . 'dir/class_name.php',
+			$class_loader->resolve_path('phpbb_dir_class_name'),
+			'Class in a directory'
+		);
+		$this->assertEquals(
+			$prefix . 'dir/subdir/class_name.php',
+			$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()
+	{
+		$cache = new phpbb_cache_mock;
+		$cache->put('class_loader', array('phpbb_a_cached_name' => 'a/cached_name'));
+
+		$prefix = __DIR__ . '/';
+		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);
+
+		$prefix .= 'includes/';
+
+		$this->assertEquals(
+			$prefix . 'dir/class_name.php',
+			$class_loader->resolve_path('phpbb_dir_class_name'),
+			'Class in a directory'
+		);
+
+		$this->assertEquals(
+			$prefix . 'a/cached_name.php',
+			$class_loader->resolve_path('phpbb_a_cached_name'),
+			'Class in a directory'
+		);
+	}
+}
diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/includes/class_name.php
new file mode 100644
index 0000000000..e941173cdd
--- /dev/null
+++ b/tests/class_loader/includes/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_class_name
+{
+}
+
diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/includes/dir.php
new file mode 100644
index 0000000000..1c8930d8e7
--- /dev/null
+++ b/tests/class_loader/includes/dir.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir
+{
+}
+
diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/includes/dir/class_name.php
new file mode 100644
index 0000000000..0675aa8fc5
--- /dev/null
+++ b/tests/class_loader/includes/dir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_class_name
+{
+}
+
diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/includes/dir/subdir/class_name.php
new file mode 100644
index 0000000000..7321a609cc
--- /dev/null
+++ b/tests/class_loader/includes/dir/subdir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_subdir_class_name
+{
+}
+
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
+{
+}
+