From af654814f63e05be5236075f06943062be007072 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 26 Mar 2010 16:41:19 +0100
Subject: [PATCH] [feature/dbal-tests] Added tests for dbal fetchrow and
 fetchfield.

---
 tests/all_tests.php               |  2 ++
 tests/dbal/all_tests.php          | 40 ++++++++++++++++++++++++++++
 tests/dbal/dbal.php               | 43 +++++++++++++++++++++++++++++++
 tests/dbal/fixtures/two_users.xml | 15 +++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 tests/dbal/all_tests.php
 create mode 100644 tests/dbal/dbal.php
 create mode 100644 tests/dbal/fixtures/two_users.xml

diff --git a/tests/all_tests.php b/tests/all_tests.php
index 1ed6126e80..e693427809 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -22,6 +22,7 @@ require_once 'request/all_tests.php';
 require_once 'security/all_tests.php';
 require_once 'template/all_tests.php';
 require_once 'text_processing/all_tests.php';
+require_once 'dbal/all_tests.php';
 
 // exclude the test directory from code coverage reports
 PHPUnit_Util_Filter::addDirectoryToFilter('./');
@@ -42,6 +43,7 @@ class phpbb_all_tests
 		$suite->addTest(phpbb_security_all_tests::suite());
 		$suite->addTest(phpbb_template_all_tests::suite());
 		$suite->addTest(phpbb_text_processing_all_tests::suite());
+		$suite->addTest(phpbb_dbal_all_tests::suite());
 
 		return $suite;
 	}
diff --git a/tests/dbal/all_tests.php b/tests/dbal/all_tests.php
new file mode 100644
index 0000000000..7aee0f6b16
--- /dev/null
+++ b/tests/dbal/all_tests.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_dbal_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'dbal/dbal.php';
+
+class phpbb_dbal_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer');
+
+		$suite->addTestSuite('phpbb_dbal_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_dbal_all_tests::main')
+{
+	phpbb_dbal_all_tests::main();
+}
diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php
new file mode 100644
index 0000000000..a77279105f
--- /dev/null
+++ b/tests/dbal/dbal.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/functions.php';
+
+class phpbb_dbal_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/two_users.xml');
+	}
+
+	public function test_select_row()
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			WHERE user_id = 2');
+		$row = $db->sql_fetchrow($result);
+
+		$this->assertEquals(array('username_clean' => 'foobar'), $row);
+	}
+
+	public function test_select_field()
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			WHERE user_id = 2');
+
+		$this->assertEquals('foobar', $db->sql_fetchfield('username_clean'));
+	}
+}
+
diff --git a/tests/dbal/fixtures/two_users.xml b/tests/dbal/fixtures/two_users.xml
new file mode 100644
index 0000000000..255f061bd4
--- /dev/null
+++ b/tests/dbal/fixtures/two_users.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>barfoo</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>foobar</value>
+		</row>
+	</table>
+</dataset>