From 92019f99a40c322fe7911f074f9630b11bb5c06e Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Fri, 7 Sep 2012 14:08:23 +0000
Subject: [PATCH] Created separate mysql config file for tests

---
 .../webim/classes/DatabaseTest.php            | 32 +++++++++----------
 .../webim/classes/SettingsTest.php            | 15 ++++++++-
 .../server_side/webim/database_config.php     | 13 ++++++++
 3 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 src/messenger/tests/server_side/webim/database_config.php

diff --git a/src/messenger/tests/server_side/webim/classes/DatabaseTest.php b/src/messenger/tests/server_side/webim/classes/DatabaseTest.php
index ad05dfde..5d880c36 100644
--- a/src/messenger/tests/server_side/webim/classes/DatabaseTest.php
+++ b/src/messenger/tests/server_side/webim/classes/DatabaseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/config.php';
+require_once dirname(__FILE__) . '/../database_config.php';
 
 /**
  * Test class for Database.
@@ -23,22 +23,22 @@ class DatabaseTest extends PHPUnit_Framework_TestCase {
 	}
 
 	public static function setUpBeforeClass() {
-		global $mysqlhost, $mysqllogin, $mysqlpass, $mysqldb, $dbencoding,
-			$mysqlprefix, $use_persistent_connection, $force_charset_in_connection;
+		global $db_host, $db_name, $db_user, $db_pass, $tables_prefix,
+			$db_encoding, $force_charset_in_connection, $use_persistent_connection;
 		Database::initialize(
-			$mysqlhost,
-			$mysqllogin,
-			$mysqlpass,
+			$db_host,
+			$db_user,
+			$db_pass,
 			$use_persistent_connection,
-			$mysqldb,
-			$mysqlprefix,
+			$db_name,
+			$tables_prefix,
 			$force_charset_in_connection,
-			$dbencoding
+			$db_encoding
 		);
 		$dbh = new PDO(
-			"mysql:host={$mysqlhost};dbname={$mysqldb}",
-			$mysqllogin,
-			$mysqlpass
+			"mysql:host={$db_host};dbname={$db_name}",
+			$db_user,
+			$db_pass
 		);
 		$dbh->exec(
 			"CREATE TABLE phpunit_test_only " .
@@ -48,11 +48,11 @@ class DatabaseTest extends PHPUnit_Framework_TestCase {
 	}
 
 	public static function tearDownAfterClass() {
-		global $mysqlhost, $mysqllogin, $mysqlpass, $mysqldb;
+		global $db_host, $db_user, $db_pass, $db_name;
 		$dbh = new PDO(
-			"mysql:host={$mysqlhost};dbname={$mysqldb}",
-			$mysqllogin,
-			$mysqlpass
+			"mysql:host={$db_host};dbname={$db_name}",
+			$db_user,
+			$db_pass
 		);
 		$dbh->exec("DROP TABLE phpunit_test_only");
 		$dbh = NULL;
diff --git a/src/messenger/tests/server_side/webim/classes/SettingsTest.php b/src/messenger/tests/server_side/webim/classes/SettingsTest.php
index 8a21db9e..805d4f75 100644
--- a/src/messenger/tests/server_side/webim/classes/SettingsTest.php
+++ b/src/messenger/tests/server_side/webim/classes/SettingsTest.php
@@ -1,8 +1,8 @@
 <?php
 
 require_once dirname(__FILE__) . '/../../../../webim/libs/classes/settings.php';
-require_once dirname(__FILE__) . '/../../../../webim/libs/config.php';
 require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
+require_once dirname(__FILE__) . '/../database_config.php';
 
 /**
  * Test class for Settings.
@@ -11,6 +11,18 @@ require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php';
 class SettingsTest extends PHPUnit_Framework_TestCase {
 
 	public static function setUpBeforeClass() {
+		global $db_host, $db_name, $db_user, $db_pass, $tables_prefix,
+			$db_encoding, $force_charset_in_connection, $use_persistent_connection;
+		Database::initialize(
+			$db_host,
+			$db_user,
+			$db_pass,
+			$use_persistent_connection,
+			$db_name,
+			$tables_prefix,
+			$force_charset_in_connection,
+			$db_encoding
+		);
 		$db = Database::getInstance();
 		$db->query(
 			"INSERT INTO {chatconfig} (vckey, vcvalue) " .
@@ -25,6 +37,7 @@ class SettingsTest extends PHPUnit_Framework_TestCase {
 			"DELETE FROM {chatconfig} WHERE vckey = ? OR vckey = ?",
 			array('some_test_key', 'some_another_test_key')
 		);
+		Database::destroy();
 	}
 
 	public function testGet() {
diff --git a/src/messenger/tests/server_side/webim/database_config.php b/src/messenger/tests/server_side/webim/database_config.php
new file mode 100644
index 00000000..9f96231e
--- /dev/null
+++ b/src/messenger/tests/server_side/webim/database_config.php
@@ -0,0 +1,13 @@
+<?php
+
+$db_host = "";
+$db_user = "";
+$db_pass = "";
+$db_name = "";
+$tables_prefix = "";
+
+$db_encoding = "utf8";
+$force_charset_in_connection = true;
+$use_persistent_connection = false;
+
+?>
\ No newline at end of file