6 files changed, 443 insertions, 3 deletions
diff --git a/tests/dbal/fixtures/migrator_module.xml b/tests/dbal/fixtures/migrator_module.xml
new file mode 100644
index 0000000000..32afe7e6f3
--- /dev/null
+++ b/tests/dbal/fixtures/migrator_module.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_modules">
+		<column>module_id</column>
+		<column>module_enabled</column>
+		<column>module_display</column>
+		<column>module_basename</column>
+		<column>module_class</column>
+		<column>parent_id</column>
+		<column>left_id</column>
+		<column>right_id</column>
+		<column>module_langname</column>
+		<column>module_mode</column>
+		<column>module_auth</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>0</value>
+			<value>1</value>
+			<value>4</value>
+			<value>ACP_CAT</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+			<value>1</value>
+			<value>acp_test</value>
+			<value>acp</value>
+			<value>1</value>
+			<value>2</value>
+			<value>3</value>
+			<value>ACP_MODULE</value>
+			<value>test</value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/fixtures/migrator_permission.xml b/tests/dbal/fixtures/migrator_permission.xml
new file mode 100644
index 0000000000..08cec42a42
--- /dev/null
+++ b/tests/dbal/fixtures/migrator_permission.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_acl_options">
+		<column>auth_option_id</column>
+		<column>auth_option</column>
+		<column>is_global</column>
+		<column>is_local</column>
+		<column>founder_only</column>
+		<row>
+			<value>1</value>
+			<value>global</value>
+			<value>1</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>local</value>
+			<value>0</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>both</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 898a197dfd..463cf9fcec 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/db/migrator.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/migration.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 require_once dirname(__FILE__) . '/migration/dummy.php';
@@ -28,11 +28,17 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 
 	public function setUp()
 	{
-		parent::setup();
+		parent::setUp();
 
 		$this->db = $this->new_dbal();
 		$this->db_tools = new phpbb_db_tools($this->db);
-		$this->migrator = new phpbb_db_migrator($this->db, $this->db_tools, 'phpbb_', MIGRATIONS_TABLE, 'phpBB/', '.php');
+
+		$this->config = new phpbb_config_db($this->db, new phpbb_mock_cache, 'phpbb_config');
+
+		$tools = array(
+			new phpbb_db_migration_tool_config($this->config),
+		);
+		$this->migrator = new phpbb_db_migrator($this->config, $this->db, $this->db_tools, 'phpbb_migrations', dirname(__FILE__) . '/../../phpBB/', 'php', 'phpbb_', $tools);
 	}
 
 	public function tearDown()
diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php
new file mode 100644
index 0000000000..27511519ca
--- /dev/null
+++ b/tests/dbal/migrator_tool_config_test.php
@@ -0,0 +1,97 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/config.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
+
+class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case
+{
+	public function setup()
+	{
+		$this->config = new phpbb_config(array());
+
+		$this->tool = new phpbb_db_migration_tool_config($this->config);
+
+		parent::setup();
+	}
+
+	public function test_add()
+	{
+		try
+		{
+			$this->tool->add('foo', 'bar');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals('bar', $this->config['foo']);
+
+		try
+		{
+			$this->tool->add('foo', 'bar');
+			$this->fail('Exception not thrown');
+		}
+		catch (Exception $e) {}
+	}
+
+	public function test_update()
+	{
+		$this->config->set('foo', 'bar');
+		try
+		{
+			$this->tool->update('foo', 'bar2');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals('bar2', $this->config['foo']);
+	}
+
+	public function test_update_if_equals()
+	{
+		$this->config->set('foo', 'bar');
+
+		try
+		{
+			$this->tool->update_if_equals('', 'foo', 'bar2');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals('bar', $this->config['foo']);
+
+		try
+		{
+			$this->tool->update_if_equals('bar', 'foo', 'bar2');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals('bar2', $this->config['foo']);
+	}
+
+	public function test_remove()
+	{
+		$this->config->set('foo', 'bar');
+
+		try
+		{
+			$this->tool->remove('foo');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertFalse(isset($this->config['foo']));
+	}
+}
diff --git a/tests/dbal/migrator_tool_module.php b/tests/dbal/migrator_tool_module.php
new file mode 100644
index 0000000000..0b57cbfbcb
--- /dev/null
+++ b/tests/dbal/migrator_tool_module.php
@@ -0,0 +1,128 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/module.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
+
+class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_module.xml');
+	}
+
+	public function setup()
+	{
+		// Need global $db, $user for delete_module function in acp_modules
+		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user;
+
+		parent::setup();
+
+		// Force add_log function to not be used
+		$skip_add_log = true;
+
+		$db = $this->db = $this->new_dbal();
+		$this->cache = new phpbb_cache_service(new phpbb_cache_driver_null());
+		$user = $this->user = new phpbb_user();
+
+		$this->tool = new phpbb_db_migration_tool_module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx);
+	}
+
+	public function exists_data()
+	{
+		return array(
+			// Test the category
+			array(
+				'',
+				'ACP_CAT',
+				true,
+			),
+			array(
+				0,
+				'ACP_CAT',
+				true,
+			),
+
+			// Test the module
+			array(
+				'',
+				'ACP_MODULE',
+				false,
+			),
+			array(
+				false,
+				'ACP_MODULE',
+				true,
+			),
+			array(
+				'ACP_CAT',
+				'ACP_MODULE',
+				true,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider exists_data
+	*/
+	public function test_exists($parent, $module, $expected)
+	{
+		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module));
+	}
+
+	public function test_add()
+	{
+		try
+		{
+			$this->tool->add('acp', 0, 'ACP_NEW_CAT');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('acp', 0, 'ACP_NEW_CAT'));
+
+		// Should throw an exception when trying to add a module that already exists
+		try
+		{
+			$this->tool->add('acp', 0, 'ACP_NEW_CAT');
+			$this->fail('Exception not thrown');
+		}
+		catch (Exception $e) {}
+
+		try
+		{
+			$this->tool->add('acp', ACP_NEW_CAT, array(
+				'module_basename'	=> 'acp_new_module',
+				'module_langname'	=> 'ACP_NEW_MODULE',
+				'module_mode'		=> 'test',
+				'module_auth'		=> '',
+			));
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE'));
+	}
+
+	public function test_remove()
+	{
+		try
+		{
+			$this->tool->remove('acp', 'ACP_CAT', 'ACP_MODULE');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(false, $this->tool->exists('acp', 'ACP_CAT', 'ACP_MODULE'));
+	}
+}
diff --git a/tests/dbal/migrator_tool_permission.php b/tests/dbal/migrator_tool_permission.php
new file mode 100644
index 0000000000..2229576cd9
--- /dev/null
+++ b/tests/dbal/migrator_tool_permission.php
@@ -0,0 +1,136 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/permission.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
+
+class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_permission.xml');
+	}
+
+	public function setup()
+	{
+		// Global $db and $cache are needed in acp/auth.php constructor
+		global $phpbb_root_path, $phpEx, $db, $cache;
+
+		parent::setup();
+
+		$db = $this->db = $this->new_dbal();
+		$cache = $this->cache = new phpbb_cache_service(new phpbb_cache_driver_null());
+		$this->auth = new phpbb_auth();
+
+		$this->tool = new phpbb_db_migration_tool_permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx);
+	}
+
+	public function exists_data()
+	{
+		return array(
+			array(
+				'global',
+				true,
+				true,
+			),
+			array(
+				'local',
+				false,
+				true,
+			),
+			array(
+				'both',
+				true,
+				true,
+			),
+			array(
+				'both',
+				false,
+				true,
+			),
+			array(
+				'does_not_exist',
+				true,
+				false,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider exists_data
+	*/
+	public function test_exists($auth_option, $global, $expected)
+	{
+		$this->assertEquals($expected, $this->tool->exists($auth_option, $global));
+	}
+
+	public function test_add()
+	{
+		try
+		{
+			$this->tool->add('new', true);
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('new', true));
+		$this->assertEquals(false, $this->tool->exists('new', false));
+
+		try
+		{
+			$this->tool->add('new', false);
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('new', false));
+
+		// Should fail (duplicate)
+		try
+		{
+			$this->tool->add('new', true);
+			$this->fail('Did not throw exception on duplicate');
+		}
+		catch (Exception $e) {}
+	}
+
+	public function test_remove()
+	{
+		try
+		{
+			$this->tool->remove('global', true);
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(false, $this->tool->exists('global', true));
+
+		try
+		{
+			$this->tool->remove('both', false);
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(false, $this->tool->exists('both', false));
+
+		// Should fail (does not exist)
+		try
+		{
+			$this->tool->remove('new', true);
+			$this->fail('Did not throw exception on duplicate');
+		}
+		catch (Exception $e) {}
+	}
+}