From f3c043a5696610ed1312a734b3f3ed1b613fc4f4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 16:29:37 -0500
Subject: [ticket/10205] Test failed connection attempts.

PHPBB3-10205
---
 tests/dbal/connect_test.php | 44 ++++++++++++++++++++++++++++++++++++++++++++
 tests/fixtures/empty.xml    |  5 +++++
 2 files changed, 49 insertions(+)
 create mode 100644 tests/dbal/connect_test.php
 create mode 100644 tests/fixtures/empty.xml

(limited to 'tests')

diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php
new file mode 100644
index 0000000000..4964f24ba2
--- /dev/null
+++ b/tests/dbal/connect_test.php
@@ -0,0 +1,44 @@
+<?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/functions.php';
+
+class phpbb_dbal_connect_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
+	}
+
+	public function test_failing_connect()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$config = $this->get_database_config();
+
+		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
+		$dbal = 'dbal_' . $config['dbms'];
+		$db = new $dbal();
+
+		// Failure to connect results in a trigger_error call in dbal.
+		// phpunit converts triggered errors to exceptions.
+		// In particular there should be no fatals here.
+		try
+		{
+			$db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
+			$this->assertFalse(true);
+		} catch (Exception $e)
+		{
+			// should have a legitimate message
+			$this->assertNotEmpty($e->getMessage());
+		}
+
+		return $db;
+	}
+}
diff --git a/tests/fixtures/empty.xml b/tests/fixtures/empty.xml
new file mode 100644
index 0000000000..96eb1ab483
--- /dev/null
+++ b/tests/fixtures/empty.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_posts">
+	</table>
+</dataset>
-- 
cgit v1.2.1


From 2d3882c4124e928dccd050da3d3ccafa54b9ff20 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 16:32:57 -0500
Subject: [ticket/10205] Delete stray return.

PHPBB3-10205
---
 tests/dbal/connect_test.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'tests')

diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php
index 4964f24ba2..cefd76aa16 100644
--- a/tests/dbal/connect_test.php
+++ b/tests/dbal/connect_test.php
@@ -38,7 +38,5 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case
 			// should have a legitimate message
 			$this->assertNotEmpty($e->getMessage());
 		}
-
-		return $db;
 	}
 }
-- 
cgit v1.2.1


From 29c4da6162902d3c0d766a8acb17e5a2cf02f901 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 19:00:42 -0500
Subject: [ticket/10205] Add some columns to the empty fixture file for
 mssqlnative.

Supposedly it choked on the version without any columns thusly:

phpbb_dbal_connect_test::test_failing_connect
PDOException: SQLSTATE[HY090]: [Microsoft][ODBC Driver Manager] Invalid string or buffer length

PHPBB3-10205
---
 tests/fixtures/empty.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/fixtures/empty.xml b/tests/fixtures/empty.xml
index 96eb1ab483..195e30e38d 100644
--- a/tests/fixtures/empty.xml
+++ b/tests/fixtures/empty.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
-	<table name="phpbb_posts">
+	<table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_ip</column>
+		<column>session_browser</column>
 	</table>
 </dataset>
-- 
cgit v1.2.1


From 89c9c9d4b0daa7308fd015e8a6fca6386a8b8016 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:22:33 -0500
Subject: [ticket/10205] Cosmetic changes.

PHPBB3-10205
---
 tests/dbal/connect_test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php
index cefd76aa16..505ce28fa1 100644
--- a/tests/dbal/connect_test.php
+++ b/tests/dbal/connect_test.php
@@ -33,7 +33,8 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case
 		{
 			$db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
 			$this->assertFalse(true);
-		} catch (Exception $e)
+		}
+		catch (Exception $e)
 		{
 			// should have a legitimate message
 			$this->assertNotEmpty($e->getMessage());
-- 
cgit v1.2.1