From de34e243257864e390bc46cdf62dd57ba1a61fbb Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Wed, 11 Apr 2012 11:48:56 -0400
Subject: [PATCH] rearranged tests

---
 .../databases/{ => firebird}/firebird-qb.php  |   2 +-
 tests/databases/{ => firebird}/firebird.php   |   2 +-
 tests/databases/{ => mysql}/mysql-qb.php      |   0
 tests/databases/{ => mysql}/mysql.php         |   0
 tests/databases/{ => odbc}/odbc-qb.php        |   0
 tests/databases/{ => odbc}/odbc.php           |   0
 tests/databases/{ => pgsql}/pgsql-qb.php      |   0
 tests/databases/{ => pgsql}/pgsql.php         |   0
 tests/databases/{ => sqlite}/sqlite-qb.php    |   2 +-
 tests/databases/{ => sqlite}/sqlite.php       |   2 +-
 tests/{test_dbs => db_files}/FB_TEST_DB.FDB   | Bin 802816 -> 802816 bytes
 tests/{test_dbs => db_files}/test_sqlite.db   | Bin 3072 -> 3072 bytes
 tests/index.php                               |   6 ++----
 13 files changed, 6 insertions(+), 8 deletions(-)
 rename tests/databases/{ => firebird}/firebird-qb.php (98%)
 rename tests/databases/{ => firebird}/firebird.php (98%)
 rename tests/databases/{ => mysql}/mysql-qb.php (100%)
 rename tests/databases/{ => mysql}/mysql.php (100%)
 rename tests/databases/{ => odbc}/odbc-qb.php (100%)
 rename tests/databases/{ => odbc}/odbc.php (100%)
 rename tests/databases/{ => pgsql}/pgsql-qb.php (100%)
 rename tests/databases/{ => pgsql}/pgsql.php (100%)
 rename tests/databases/{ => sqlite}/sqlite-qb.php (92%)
 rename tests/databases/{ => sqlite}/sqlite.php (98%)
 rename tests/{test_dbs => db_files}/FB_TEST_DB.FDB (99%)
 rename tests/{test_dbs => db_files}/test_sqlite.db (95%)

diff --git a/tests/databases/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
similarity index 98%
rename from tests/databases/firebird-qb.php
rename to tests/databases/firebird/firebird-qb.php
index b7f7eb8..615dfe2 100644
--- a/tests/databases/firebird-qb.php
+++ b/tests/databases/firebird/firebird-qb.php
@@ -21,7 +21,7 @@ class FirebirdQBTest extends QBTest {
 	{
 		parent::__construct();
 		
-		$dbpath = TEST_DIR.DS.'test_dbs'.DS.'FB_TEST_DB.FDB';
+		$dbpath = TEST_DIR.DS.'db_files'.DS.'FB_TEST_DB.FDB';
 
 		// Test the query builder
 		$params = new Stdclass();
diff --git a/tests/databases/firebird.php b/tests/databases/firebird/firebird.php
similarity index 98%
rename from tests/databases/firebird.php
rename to tests/databases/firebird/firebird.php
index 29c7abc..abb48f6 100644
--- a/tests/databases/firebird.php
+++ b/tests/databases/firebird/firebird.php
@@ -21,7 +21,7 @@ class FirebirdTest extends DBTest {
 	
 	function setUp()
 	{
-		$dbpath = TEST_DIR.DS.'test_dbs'.DS.'FB_TEST_DB.FDB';
+		$dbpath = TEST_DIR.DS.'db_files'.DS.'FB_TEST_DB.FDB';
 		
 		// Test the db driver directly
 		$this->db = new Firebird('localhost:'.$dbpath);
diff --git a/tests/databases/mysql-qb.php b/tests/databases/mysql/mysql-qb.php
similarity index 100%
rename from tests/databases/mysql-qb.php
rename to tests/databases/mysql/mysql-qb.php
diff --git a/tests/databases/mysql.php b/tests/databases/mysql/mysql.php
similarity index 100%
rename from tests/databases/mysql.php
rename to tests/databases/mysql/mysql.php
diff --git a/tests/databases/odbc-qb.php b/tests/databases/odbc/odbc-qb.php
similarity index 100%
rename from tests/databases/odbc-qb.php
rename to tests/databases/odbc/odbc-qb.php
diff --git a/tests/databases/odbc.php b/tests/databases/odbc/odbc.php
similarity index 100%
rename from tests/databases/odbc.php
rename to tests/databases/odbc/odbc.php
diff --git a/tests/databases/pgsql-qb.php b/tests/databases/pgsql/pgsql-qb.php
similarity index 100%
rename from tests/databases/pgsql-qb.php
rename to tests/databases/pgsql/pgsql-qb.php
diff --git a/tests/databases/pgsql.php b/tests/databases/pgsql/pgsql.php
similarity index 100%
rename from tests/databases/pgsql.php
rename to tests/databases/pgsql/pgsql.php
diff --git a/tests/databases/sqlite-qb.php b/tests/databases/sqlite/sqlite-qb.php
similarity index 92%
rename from tests/databases/sqlite-qb.php
rename to tests/databases/sqlite/sqlite-qb.php
index f262666..ad62c12 100644
--- a/tests/databases/sqlite-qb.php
+++ b/tests/databases/sqlite/sqlite-qb.php
@@ -21,7 +21,7 @@
  	{
  		parent::__construct();
  	
- 		$path = TEST_DIR.DS.'test_dbs'.DS.'test_sqlite.db';
+ 		$path = TEST_DIR.DS.'db_files'.DS.'test_sqlite.db';
 		$params = new Stdclass();
 		$params->type = 'sqlite';
 		$params->file = $path;
diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite/sqlite.php
similarity index 98%
rename from tests/databases/sqlite.php
rename to tests/databases/sqlite/sqlite.php
index 132d1e2..e2ffdfa 100644
--- a/tests/databases/sqlite.php
+++ b/tests/databases/sqlite/sqlite.php
@@ -26,7 +26,7 @@ class SQLiteTest extends UnitTestCase {
 
 	function setUp()
 	{
-		$path = TEST_DIR.DS.'test_dbs'.DS.'test_sqlite.db';
+		$path = TEST_DIR.DS.'db_files'.DS.'test_sqlite.db';
 		$this->db = new SQLite($path);
 	}
 
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
similarity index 99%
rename from tests/test_dbs/FB_TEST_DB.FDB
rename to tests/db_files/FB_TEST_DB.FDB
index 03123627d4d33978b12cc1ea04f92520399cdeff..5e7cf0fa87b50e820e7887a331977dcdf3a266d2 100755
GIT binary patch
delta 870
zcmZ9K!D|yi6vp3d6StX1=|d|X8p>{BOcaEyRK()JqY#jaq97<a6!hT5{sDDq!<>tv
za}WfjsCW`v66`@QA_YY+UbIDbliI62Dp+u4H!m*PVdu?ncjo)vV_p~rVHlhjaJpWb
zg8vU;IMOE@w~7GU<^^!X!*2kWPJOOEI+Si8aLi~XAk4f~T=ko;#urJEP~<2YQIu1Z
zSF}%&t7ueFp-nPJ;%6uC$>Z+5vozT`QI)HssxI4g%)Pwg=2LB+FN<-wg(dK?247?a
zmeGTEatzL48P-f}Ne`N`1b<~2Rt%ppaYEK$w@`+SLWO1YjTn8WRn*rbJgnEdNCNcR
z7!Nv2Mg1be8BO+EsQoTZ=|&GL!Gfv!jXCdtFykaJTN2{;9y6r>#k_vp!-lx6<F2vz
z6JwyS?%+&ku8VW7^CPkL#F)Ml;Zf&%;##)bs$$c+mP|skJ@kUFS>H(j=EN6*Y39B!
ze6+s4UWo9R_+ZT&VnbipF=cH2!u|SM4-W+Ihcua4lbJQwt!70pMtDTL9u!m+Z7V#;
zbZtnLnN^ut^?4@KXKAJ@!<jxA(qv{$X4ZU=$@G3E)4NvKzv%992RJ}xN#?TbmD=Mr
t2Gh$~L$hX14D-1Gr-tCR(jq=><3zuO#8O&InAT#ON8gOmd%BCW{{TE|$szy%

delta 930
zcmZXSF=!M)6o%iM+x0g0kPKRg>;?7`&501b(+i@FO{#!mAt|)E;v^t)2T7q8>S8h2
zT1{cCg@qiR<eCtOU=xIhSV$nUNe<B@MvEXO7;tuWpPrXpX5RiYZ@&HC%!FY%49k}h
z&X;Bf;NK%D%%m!gjXb~|(*OiMSpv9vZm~FaBuS7U%v-erP2b433e}hW52cc*q);-W
zq@$#(<N+nKN_tB6&B&Z1@ow7<awFOHrDCq-J+Atyl$$A$)4aCqBxvp@uphSJxRo6^
z2zealDI3Q`0D&0%JN6rg-~*n3riqU*Sr<>f^7Z|Qj_KWX8Wt^IFGO_VL0s3IU5bFy
z(`S=9;{gGPzxJTd0T(74leccX0e8ZbnAx-GY3G5oUvcf8X(m=Ys5j~(w;NM6O!qBG
zwmjD{IhFZ@g|2~(f{wmZfK&QjL<RkPg(~`eM84ixp|ZZYPDl0i4i(z9RjOqNMQYgC
zwFX(ozeX6vU0=WGP!MBIiXC5Xt<kvn>FZN#G@vi8(jooyD;++w?I(4cD&u9qnz5`I
zyJ@lGV#5-L^tXtL;)}(ePKcj-h^(2&nu(vfjV`A~m-ZR`*n?%wSk{bvml|E{Hu|>P
z=t2*XH4|Ag@pZS+`PAs#KBKe$VIj+!v8)+uuH)9GIU92m%^9UT+VpjOgOVM6_Jgkc
E0fbc9y8r+H

diff --git a/tests/test_dbs/test_sqlite.db b/tests/db_files/test_sqlite.db
similarity index 95%
rename from tests/test_dbs/test_sqlite.db
rename to tests/db_files/test_sqlite.db
index ee1a11bf3f3f33bb40e90790db1e1515fe1bbc00..0f0f59bbcf56b4cfff0f22cd708f9d9bda8f0b18 100755
GIT binary patch
delta 17
YcmZpWXpop7&A4`=j5FifjR_050Wziq<NyEw

delta 17
YcmZpWXpop7&DcCq#+k8sW5NP%05C8GkN^Mx

diff --git a/tests/index.php b/tests/index.php
index e07bb77..be02f10 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -47,14 +47,12 @@ foreach(pdo_drivers() as $d)
 	
 	if(is_dir($src_dir))
 	{
-		require_once("{$test_path}{$d}.php");
-		require_once("{$test_path}{$d}-qb.php");
+		array_map('do_include', glob("{$test_path}{$d}/{$d}*.php"));
 	}
 }
 
 // Load Firebird if there is support
 if(function_exists('fbird_connect'))
 {
-	require_once("{$test_path}firebird.php");
-	require_once("{$test_path}firebird-qb.php");
+	array_map('do_include', glob("{$test_path}/firebird/firebird*.php"));
 }
\ No newline at end of file