12 files changed, 1315 insertions, 325 deletions
diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php
new file mode 100644
index 0000000000..0b701a4d70
--- /dev/null
+++ b/tests/avatar/driver/barfoo.php
@@ -0,0 +1,19 @@
+<?php
+
+class phpbb_avatar_driver_barfoo extends phpbb_avatar_driver
+{
+	public function get_data($row)
+	{
+		return array();
+	}
+
+	public function prepare_form($request, $template, $user, $row, &$error)
+	{
+		return false;
+	}
+
+	public function process_form($request, $template, $user, $row, &$error)
+	{
+		return false;
+	}
+}
diff --git a/tests/avatar/driver/foobar.php b/tests/avatar/driver/foobar.php
new file mode 100644
index 0000000000..995f35818b
--- /dev/null
+++ b/tests/avatar/driver/foobar.php
@@ -0,0 +1,19 @@
+<?php
+
+class phpbb_avatar_driver_foobar extends phpbb_avatar_driver
+{
+	public function get_data($row)
+	{
+		return array();
+	}
+
+	public function prepare_form($request, $template, $user, $row, &$error)
+	{
+		return false;
+	}
+
+	public function process_form($request, $template, $user, $row, &$error)
+	{
+		return false;
+	}
+}
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
new file mode 100644
index 0000000000..f01ea47c25
--- /dev/null
+++ b/tests/avatar/manager_test.php
@@ -0,0 +1,90 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/driver/foobar.php';
+
+class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		// Mock phpbb_container
+		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$this->phpbb_container->expects($this->any())
+			->method('get')
+			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
+
+		// Prepare dependencies for avatar manager and driver
+		$config = new phpbb_config(array());
+		$request = $this->getMock('phpbb_request');
+		$cache = $this->getMock('phpbb_cache_driver_interface');
+
+		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.foobar'));
+		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.barfoo'));
+
+		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
+
+		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
+		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
+
+		// Set up avatar manager
+		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
+	}
+
+	public function test_get_driver()
+	{
+		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
+		$this->assertNull($driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foobar');
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
+		$this->assertNull($driver);
+	}
+
+	public function test_get_all_drivers()
+	{
+		$drivers = $this->manager->get_all_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
+	}
+
+	public function test_get_enabled_drivers()
+	{
+		$drivers = $this->manager->get_enabled_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+	}
+
+	public function test_get_avatar_settings()
+	{
+		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
+
+		$expected_settings = array(
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+		);
+
+		$this->assertEquals($expected_settings, $avatar_settings);
+	}
+}
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index b447a81cda..89669b85ec 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -45,15 +45,6 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			new phpbb_db_migration_tool_config($this->config),
 		);
 
-		$this->extension_manager = new phpbb_extension_manager(
-			new phpbb_mock_container_builder(),
-			$this->db,
-			$this->config,
-			'phpbb_ext',
-			dirname(__FILE__) . '/../../phpBB/',
-			'.php',
-			null
-		);
 		$this->migrator = new phpbb_db_migrator(
 			$this->config,
 			$this->db,
@@ -64,7 +55,16 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			'phpbb_',
 			$tools
 		);
-		$this->migrator->set_extension_manager($this->extension_manager);
+		$this->extension_manager = new phpbb_extension_manager(
+			new phpbb_mock_container_builder(),
+			$this->db,
+			$this->config,
+			$this->migrator,
+			'phpbb_ext',
+			dirname(__FILE__) . '/../../phpBB/',
+			'.php',
+			null
+		);
 	}
 
 	public function test_update()
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 3b81afc456..1f311116f4 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -97,15 +97,6 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$php_ext = 'php';
 		$table_prefix = 'phpbb_';
 
-		$manager = new phpbb_extension_manager(
-			new phpbb_mock_container_builder(),
-			$db,
-			$config,
-			'phpbb_ext',
-			dirname(__FILE__) . '/',
-			'.' . $php_ext,
-			($with_cache) ? new phpbb_mock_cache() : null
-		);
 		$migrator = new phpbb_db_migrator(
 			$config,
 			$db,
@@ -116,9 +107,15 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$table_prefix,
 			array()
 		);
-		$manager->set_migrator($migrator);
-		$migrator->set_extension_manager($manager);
-
-		return $manager;
+		return new phpbb_extension_manager(
+			new phpbb_mock_container_builder(),
+			$db,
+			$config,
+			$migrator,
+			'phpbb_ext',
+			dirname(__FILE__) . '/',
+			'.' . $php_ext,
+			($with_cache) ? new phpbb_mock_cache() : null
+		);
 	}
 }
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 7fb19b67e3..081a32e277 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -49,10 +49,21 @@ class metadata_manager_test extends phpbb_database_test_case
 			new phpbb_template_context()
 		);
 
+		$this->migrator = new phpbb_db_migrator(
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			'phpbb_migrations',
+			$this->phpbb_root_path,
+			'php',
+			$this->table_prefix,
+			array()
+		);
 		$this->extension_manager = new phpbb_extension_manager(
 			new phpbb_mock_container_builder(),
 			$this->db,
 			$this->config,
+			$this->migrator,
 			'phpbb_ext',
 			$this->phpbb_root_path,
 			$this->phpEx,
diff --git a/tests/group_positions/group_positions_test.php b/tests/group_positions/group_positions_test.php
deleted file mode 100644
index c17e25511b..0000000000
--- a/tests/group_positions/group_positions_test.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-
-class phpbb_group_positions_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/group_positions.xml');
-	}
-
-	public function get_group_value_data()
-	{
-		return array(
-			array('teampage', 1, 0),
-			array('teampage', 2, 1),
-			array('legend', 1, 0),
-			array('legend', 3, 1),
-		);
-	}
-
-	/**
-	* @dataProvider get_group_value_data
-	*/
-	public function test_get_group_value($field, $group_id, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-
-		$test_class = new phpbb_group_positions($db, $field);
-		$this->assertEquals($expected, $test_class->get_group_value($group_id));
-	}
-
-	public function get_group_count_data()
-	{
-		return array(
-			array('teampage', 2),
-			array('legend', 1),
-		);
-	}
-
-	/**
-	* @dataProvider get_group_count_data
-	*/
-	public function test_get_group_count($field, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-
-		$test_class = new phpbb_group_positions($db, $field);
-		$this->assertEquals($expected, $test_class->get_group_count());
-	}
-
-	public function add_group_data()
-	{
-		return array(
-			array('teampage', 1, array(
-				array('group_id' => 1, 'group_teampage' => 3, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider add_group_data
-	*/
-	public function test_add_group($field, $group_id, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-		$test_class = new phpbb_group_positions($db, $field);
-		$test_class->add_group($group_id);
-
-		$result = $db->sql_query('SELECT group_id, group_teampage, group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-
-	public function delete_group_data()
-	{
-		return array(
-			array('teampage', 1, false, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, false, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 3, false, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 0, 'group_legend' => 1),
-			)),
-			array('teampage', 1, true, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, true, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 3, true, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider delete_group_data
-	*/
-	public function test_delete_group($field, $group_id, $skip_group, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-		$test_class = new phpbb_group_positions($db, $field);
-		$test_class->delete_group($group_id, $skip_group);
-
-		$result = $db->sql_query('SELECT group_id, group_teampage, group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-
-	public function move_up_data()
-	{
-		return array(
-			array('teampage', 1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 3, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 2, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider move_up_data
-	*/
-	public function test_move_up($field, $group_id, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-		$test_class = new phpbb_group_positions($db, $field);
-		$test_class->move_up($group_id);
-
-		$result = $db->sql_query('SELECT group_id, group_teampage, group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-
-	public function move_down_data()
-	{
-		return array(
-			array('teampage', 1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 2, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 3, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider move_down_data
-	*/
-	public function test_move_down($field, $group_id, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-		$test_class = new phpbb_group_positions($db, $field);
-		$test_class->move_down($group_id);
-
-		$result = $db->sql_query('SELECT group_id, group_teampage, group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-
-	public function move_data()
-	{
-		return array(
-			array('teampage', 1, 1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 1, -1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 3, 3, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 2, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 2, 0, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-			array('teampage', 2, -1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 2, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 2, -3, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 2, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 1, 'group_legend' => 1),
-			)),
-			array('teampage', 3, -1, array(
-				array('group_id' => 1, 'group_teampage' => 0, 'group_legend' => 0),
-				array('group_id' => 2, 'group_teampage' => 1, 'group_legend' => 0),
-				array('group_id' => 3, 'group_teampage' => 2, 'group_legend' => 1),
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider move_data
-	*/
-	public function test_move($field, $group_id, $increment, $expected)
-	{
-		global $db;
-
-		$db = $this->new_dbal();
-		$test_class = new phpbb_group_positions($db, $field);
-		$test_class->move($group_id, $increment);
-
-		$result = $db->sql_query('SELECT group_id, group_teampage, group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-}
-
diff --git a/tests/group_positions/fixtures/group_positions.xml b/tests/groupposition/fixtures/legend.xml
index 00ea18fe4f..a9209309bd 100644
--- a/tests/group_positions/fixtures/group_positions.xml
+++ b/tests/groupposition/fixtures/legend.xml
@@ -2,25 +2,21 @@
 <dataset>
 	<table name="phpbb_groups">
 		<column>group_id</column>
-		<column>group_teampage</column>
 		<column>group_legend</column>
 		<column>group_desc</column>
 		<row>
 			<value>1</value>
 			<value>0</value>
-			<value>0</value>
 			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>1</value>
-			<value>0</value>
 			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>2</value>
-			<value>1</value>
 			<value></value>
 		</row>
 	</table>
diff --git a/tests/groupposition/fixtures/teampage.xml b/tests/groupposition/fixtures/teampage.xml
new file mode 100644
index 0000000000..b6c39045e3
--- /dev/null
+++ b/tests/groupposition/fixtures/teampage.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_groups">
+		<column>group_id</column>
+		<column>group_desc</column>
+		<row>
+			<value>1</value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value></value>
+		</row>
+		<row>
+			<value>7</value>
+			<value></value>
+		</row>
+		<row>
+			<value>8</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_teampage">
+		<column>teampage_id</column>
+		<column>group_id</column>
+		<column>teampage_name</column>
+		<column>teampage_position</column>
+		<column>teampage_parent</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>0</value>
+			<value>category - 2 children</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>2</value>
+			<value></value>
+			<value>3</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>3</value>
+			<value></value>
+			<value>4</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>0</value>
+			<value>category2 - 2 children</value>
+			<value>5</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>4</value>
+			<value></value>
+			<value>6</value>
+			<value>5</value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>5</value>
+			<value></value>
+			<value>7</value>
+			<value>5</value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>6</value>
+			<value></value>
+			<value>8</value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php
new file mode 100644
index 0000000000..16e33b390c
--- /dev/null
+++ b/tests/groupposition/legend_test.php
@@ -0,0 +1,403 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+
+class phpbb_groupposition_legend_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/legend.xml');
+	}
+
+	public function get_group_value_data()
+	{
+		return array(
+			array(1, 0, ''),
+			array(3, 2, ''),
+			array(4, 0, 'phpbb_groupposition_exception'),
+		);
+	}
+
+	/**
+	* @dataProvider get_group_value_data
+	*/
+	public function test_get_group_value($group_id, $expected, $throws_exception)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		if ($throws_exception)
+		{
+			$this->setExpectedException($throws_exception);
+		}
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($expected, $test_class->get_group_value($group_id));
+	}
+
+	public function test_get_group_count()
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals(2, $test_class->get_group_count());
+	}
+
+	public function add_group_data()
+	{
+		return array(
+			array(
+				1,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 3),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider add_group_data
+	*/
+	public function test_add_group($group_id, $expected_added, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($expected_added, $test_class->add_group($group_id));
+
+		$result = $db->sql_query('SELECT group_id, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function delete_group_data()
+	{
+		return array(
+			array(
+				1,
+				false,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				false,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 0),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				3,
+				false,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 0),
+				),
+			),
+			array(
+				1,
+				true,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				true,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				3,
+				true,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider delete_group_data
+	*/
+	public function test_delete_group($group_id, $skip_group, $expected_deleted, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, $skip_group));
+
+		$result = $db->sql_query('SELECT group_id, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function move_up_data()
+	{
+		return array(
+			array(
+				1,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				3,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 2),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider move_up_data
+	*/
+	public function test_move_up($group_id, $excepted_moved, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($excepted_moved, $test_class->move_up($group_id));
+
+		$result = $db->sql_query('SELECT group_id, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function move_down_data()
+	{
+		return array(
+			array(
+				1,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 2),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				3,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider move_down_data
+	*/
+	public function test_move_down($group_id, $excepted_moved, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($excepted_moved, $test_class->move_down($group_id));
+
+		$result = $db->sql_query('SELECT group_id, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function move_data()
+	{
+		return array(
+			array(
+				1,
+				1,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				1,
+				-1,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				3,
+				3,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 2),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				2,
+				0,
+					false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+			array(
+				2,
+				-1,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 2),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				2,
+				-3,
+				true,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 2),
+					array('group_id' => 3, 'group_legend' => 1),
+				),
+			),
+			array(
+				3,
+				-1,
+				false,
+				array(
+					array('group_id' => 1, 'group_legend' => 0),
+					array('group_id' => 2, 'group_legend' => 1),
+					array('group_id' => 3, 'group_legend' => 2),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider move_data
+	*/
+	public function test_move($group_id, $increment, $excepted_moved, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_legend($db, $user);
+		$this->assertEquals($excepted_moved, $test_class->move($group_id, $increment));
+
+		$result = $db->sql_query('SELECT group_id, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+}
+
diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php
new file mode 100644
index 0000000000..db26cd09d5
--- /dev/null
+++ b/tests/groupposition/teampage_test.php
@@ -0,0 +1,641 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_groupposition_teampage_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/teampage.xml');
+	}
+
+	public function get_group_value_data()
+	{
+		return array(
+			array(2, 3, ''),
+			array(6, 8, ''),
+			array(10, 0, 'phpbb_groupposition_exception'),
+		);
+	}
+
+	/**
+	* @dataProvider get_group_value_data
+	*/
+	public function test_get_group_value($group_id, $expected, $throws_exception)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		if ($throws_exception)
+		{
+			$this->setExpectedException($throws_exception);
+		}
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($expected, $test_class->get_group_value($group_id));
+	}
+
+	public function test_get_group_count()
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals(8, $test_class->get_group_count());
+	}
+
+	public function add_group_teampage_data()
+	{
+		return array(
+			array(
+				1,
+				2,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				2,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				7,
+				2,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 7, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 9, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				7,
+				0,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 9, 'group_id' => 7, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider add_group_teampage_data
+	*/
+	public function test_add_group_teampage($group_id, $parent_id, $expected_added, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($expected_added, $test_class->add_group_teampage($group_id, $parent_id));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function add_category_teampage_data()
+	{
+		return array(
+			array(
+				'new',
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 9, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'new'),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider add_category_teampage_data
+	*/
+	public function test_add_category_teampage($group_name, $expected_added, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($expected_added, $test_class->add_category_teampage($group_name));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function delete_group_data()
+	{
+		return array(
+			array(
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider delete_group_data
+	*/
+	public function test_delete_group($group_id, $expected_deleted, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, false));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function delete_teampage_data()
+	{
+		return array(
+			array(
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider delete_teampage_data
+	*/
+	public function test_delete_teampage($teampage_id, $expected_deleted, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($expected_deleted, $test_class->delete_teampage($teampage_id, false));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function move_data()
+	{
+		return array(
+			array(
+				1,
+				1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				5,
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+				),
+			),
+			array(
+				1,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				5,
+				-1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				-1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				3,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider move_data
+	*/
+	public function test_move($group_id, $move_delta, $excepted_moved, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($excepted_moved, $test_class->move($group_id, $move_delta));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public function move_teampage_data()
+	{
+		return array(
+			array(
+				1,
+				1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				5,
+				1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				1,
+				false,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				1,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				2,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				5,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+				),
+			),
+			array(
+				6,
+				-1,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+				),
+			),
+			array(
+				8,
+				3,
+				true,
+				array(
+					array('teampage_position' => 1, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 2, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
+					array('teampage_position' => 3, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
+					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 5, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
+					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
+					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
+					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider move_teampage_data
+	*/
+	public function test_move_teampage($teampage_id, $move_delta, $excepted_moved, $expected)
+	{
+		global $cache;
+
+		$cache = new phpbb_mock_cache;
+		$db = $this->new_dbal();
+		$user = new phpbb_user;
+		$user->lang = array();
+
+		$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
+		$this->assertEquals($excepted_moved, $test_class->move_teampage($teampage_id, $move_delta));
+
+		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+}
+
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 3b9629b9f8..887dfea3b5 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -138,15 +138,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db = $this->get_db();
 		$db_tools = new phpbb_db_tools($db);
 
-		$extension_manager = new phpbb_extension_manager(
-			new phpbb_mock_container_builder(),
-			$db,
-			$config,
-			self::$config['table_prefix'] . 'ext',
-			dirname(__FILE__) . '/',
-			'.' . $php_ext,
-			$this->get_cache_driver()
-		);
 		$migrator = new phpbb_db_migrator(
 			$config,
 			$db,
@@ -157,8 +148,16 @@ class phpbb_functional_test_case extends phpbb_test_case
 			self::$config['table_prefix'],
 			array()
 		);
-		$extension_manager->set_migrator($migrator);
-		$migrator->set_extension_manager($extension_manager);
+		$extension_manager = new phpbb_extension_manager(
+			new phpbb_mock_container_builder(),
+			$db,
+			$config,
+			$migrator,
+			self::$config['table_prefix'] . 'ext',
+			dirname(__FILE__) . '/',
+			'.' . $php_ext,
+			$this->get_cache_driver()
+		);
 
 		return $extension_manager;
 	}