6 files changed, 92 insertions, 7 deletions
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index f3c6888c8d..6cc2f8ec0f 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -46,6 +46,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 				'c_bool'				=> array('BOOL', 1),
 				'c_vchar'				=> array('VCHAR', 'foo'),
 				'c_vchar_size'		=> array('VCHAR:4', 'foo'),
+				'c_vchar_null'		=> array('VCHAR', null),
 				'c_char_size'			=> array('CHAR:4', 'foo'),
 				'c_xstext'			=> array('XSTEXT', 'foo'),
 				'c_stext'				=> array('STEXT', 'foo'),
@@ -111,6 +112,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			'c_bool' => 0,
 			'c_vchar' => '',
 			'c_vchar_size' => '',
+			'c_vchar_null' => null,
 			'c_char_size' => 'abcd',
 			'c_xstext' => '',
 			'c_stext' => '',
@@ -144,6 +146,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			array('c_bool', 0),
 			array('c_vchar', str_repeat('a', 255)),
 			array('c_vchar_size', str_repeat('a', 4)),
+			array('c_vchar_null', str_repeat('a', 4)),
 			array('c_char_size', str_repeat('a', 4)),
 			array('c_xstext', str_repeat('a', 1000)),
 			array('c_stext', str_repeat('a', 3000)),
diff --git a/tests/dbal/fixtures/migrator_config_text.xml b/tests/dbal/fixtures/migrator_config_text.xml
new file mode 100644
index 0000000000..ba8e1fcfcc
--- /dev/null
+++ b/tests/dbal/fixtures/migrator_config_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_config_text">
+		<column>config_name</column>
+		<column>config_value</column>
+	</table>
+</dataset>
diff --git a/tests/dbal/migrator_tool_config_text_test.php b/tests/dbal/migrator_tool_config_text_test.php
new file mode 100644
index 0000000000..b271c2d62e
--- /dev/null
+++ b/tests/dbal/migrator_tool_config_text_test.php
@@ -0,0 +1,75 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_dbal_migrator_tool_config_text_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_config_text.xml');
+	}
+
+	public function setup()
+	{
+		parent::setup();
+
+		$this->db = $this->new_dbal();
+		$this->config_text = new \phpbb\config\db_text($this->db, 'phpbb_config_text');
+
+		$this->tool = new \phpbb\db\migration\tool\config_text($this->config_text);
+	}
+
+	public function test_add()
+	{
+		$this->tool->add('foo', 'bar');
+		$this->assertEquals('bar', $this->config_text->get('foo'));
+	}
+
+	public function test_add_twice()
+	{
+		$this->tool->add('foo', 'bar');
+		$this->assertEquals('bar', $this->config_text->get('foo'));
+
+		$this->tool->add('foo', 'bar2');
+		$this->assertEquals('bar', $this->config_text->get('foo'));
+	}
+
+	public function test_update()
+	{
+		$this->config_text->set('foo', 'bar');
+
+		$this->tool->update('foo', 'bar2');
+		$this->assertEquals('bar2', $this->config_text->get('foo'));
+	}
+
+	public function test_remove()
+	{
+		$this->config_text->set('foo', 'bar');
+
+		$this->tool->remove('foo');
+		$this->assertNull($this->config_text->get('foo'));
+	}
+
+	public function test_reverse_add()
+	{
+		$this->config_text->set('foo', 'bar');
+
+		$this->tool->reverse('add', 'foo');
+		$this->assertNull($this->config_text->get('foo'));
+	}
+
+	public function test_reverse_remove()
+	{
+		$this->tool->reverse('remove', 'foo');
+		$this->assertSame('', $this->config_text->get('foo'));
+	}
+}
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
index b7a69c7c5d..b101d28c7d 100644
--- a/tests/dbal/order_lower_test.php
+++ b/tests/dbal/order_lower_test.php
@@ -22,7 +22,7 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case
 	{
 		$db = $this->new_dbal();
 
-		if (strpos($db->sql_layer, 'mysql') === 0 && version_compare($db->sql_server_info(true, false), '5.6', '>='))
+		if (strpos($db->get_sql_layer(), 'mysql') === 0 && version_compare($db->sql_server_info(true, false), '5.6', '>='))
 		{
 			$this->markTestSkipped('MySQL 5.6 fails to order things correctly. See also: http://tracker.phpbb.com/browse/PHPBB3-11571 http://bugs.mysql.com/bug.php?id=69005');
 		}
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 7cac4d6a3b..e480716a49 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -219,8 +219,8 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 	{
 		$db = $this->new_dbal();
 
-		$like_expression = str_replace('*', $db->any_char, $like_expression);
-		$like_expression = str_replace('#', $db->one_char, $like_expression);
+		$like_expression = str_replace('*', $db->get_any_char(), $like_expression);
+		$like_expression = str_replace('#', $db->get_one_char(), $like_expression);
 		$where = ($like_expression) ? 'username_clean ' . $db->sql_like_expression($like_expression) : '';
 
 		$result = $db->sql_query('SELECT username_clean
diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php
index 2f9ed0008f..eae0abceba 100644
--- a/tests/dbal/sql_insert_buffer_test.php
+++ b/tests/dbal/sql_insert_buffer_test.php
@@ -32,7 +32,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
 
 	public function test_multi_insert_disabled_insert_and_flush()
 	{
-		$this->db->multi_insert = false;
+		$this->db->set_multi_insert(false);
 		$this->assertTrue($this->buffer->insert($this->get_row(1)));
 		$this->assert_config_count(3);
 		$this->assertFalse($this->buffer->flush());
@@ -50,7 +50,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
 
 	public function test_multi_insert_disabled_insert_with_flush()
 	{
-		$this->db->multi_insert = false;
+		$this->db->set_multi_insert(false);
 		$this->assertTrue($this->buffer->insert($this->get_row(1)));
 		$this->assert_config_count(3);
 		$this->assertTrue($this->buffer->insert($this->get_row(2)));
@@ -68,7 +68,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
 
 	public function test_multi_insert_disabled_insert_all_and_flush()
 	{
-		$this->db->multi_insert = false;
+		$this->db->set_multi_insert(false);
 		$this->assertTrue($this->buffer->insert_all($this->get_rows(3)));
 		$this->assert_config_count(5);
 	}
@@ -93,7 +93,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
 
 	protected function check_multi_insert_support()
 	{
-		if (!$this->db->multi_insert)
+		if (!$this->db->get_multi_insert())
 		{
 			$this->markTestSkipped('Database does not support multi_insert');
 		}