From 4b5ba2a7dc7542b1a93c2d38afe3d7d34b2daa3f Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 10 Apr 2012 08:52:51 -0400
Subject: [PATCH] Rearrange tests

---
 tests/{ => core}/core.php     |   0
 tests/{ => core}/parent.php   |   0
 tests/{ => core}/settings.php |   0
 tests/index.php               |   9 +++------
 tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 5 files changed, 3 insertions(+), 6 deletions(-)
 rename tests/{ => core}/core.php (100%)
 rename tests/{ => core}/parent.php (100%)
 rename tests/{ => core}/settings.php (100%)

diff --git a/tests/core.php b/tests/core/core.php
similarity index 100%
rename from tests/core.php
rename to tests/core/core.php
diff --git a/tests/parent.php b/tests/core/parent.php
similarity index 100%
rename from tests/parent.php
rename to tests/core/parent.php
diff --git a/tests/settings.php b/tests/core/settings.php
similarity index 100%
rename from tests/settings.php
rename to tests/core/settings.php
diff --git a/tests/index.php b/tests/index.php
index 8580849..f339cbc 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -15,7 +15,7 @@
 /**
  * Unit test bootstrap - Using php simpletest
  */
-define('TEST_DIR', dirname(__FILE__));
+define('TEST_DIR', dirname(__FILE__).'/');
 define('BASE_DIR', str_replace(basename(TEST_DIR), '', TEST_DIR).'/sys/');
 define('DS', DIRECTORY_SEPARATOR);
 
@@ -25,9 +25,6 @@ define('DS', DIRECTORY_SEPARATOR);
 // it has to be set in your php path, or put in the tests folder
 require_once('simpletest/autorun.php');
 
-// Require base testing classes
-require_once(TEST_DIR.'/parent.php');
-
 // Bulk loading wrapper workaround for PHP < 5.4
 function do_include($path)
 {
@@ -35,7 +32,7 @@ function do_include($path)
 }
 
 // Include core tests
-require_once("core.php");
+array_map('do_include', glob(TEST_DIR . 'core/*.php'));
 
 // Include required methods
 array_map('do_include', glob(BASE_DIR . 'common/*.php'));
@@ -45,7 +42,7 @@ array_map('do_include', glob(BASE_DIR . 'db/*.php'));
 // Include db tests
 // Load db classes based on capability
 $src_path = BASE_DIR.'db/drivers/';
-$test_path = TEST_DIR.'/databases/';
+$test_path = TEST_DIR.'databases/';
 
 foreach(pdo_drivers() as $d)
 {
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 6956ea4884729e66b987e857b02a0a7b4ba90a1d..af187fb7d7c2653ee68eb8365ad6c6b16b0ffa97 100755
GIT binary patch
delta 440
zcmZ9GJxc>Y5Qb+j_mSLSGJb+eaAVK}LA)f0o|TZwgdmCpL5uu{U@06HTZ%z(5eq9D
zE2~^*WgUA#iNqp_+S>@;ojC<}*qMD8-iLLZoa5vw3~cK#1%HRoi44e}76-7s3!t#e
zM}VD`hfI0OX8;1lt6K18Ubozr6Ky8ZsGS{=ASOr=6cMBf(gf*(3_(#ru_l=+u{BrY
z=2-M}onr1})_gXEWi~BTZ_{-(F#fhGOMs=%1<ds!*wyD7TjLXs!C~K+g;gUBWMtu8
zPs6?LZnv?e4f|id3la=iy<V{8Mi)1kEibxQWCi)u#j=v;@}`X?wj>XFSj;aDG75MZ
zScZ^&V(jxPWcb;$6qm=Z$feoG1%-3j>R?GpavASnQeO3OL|*rBG(Y`M8*-=(In*XR
X!-r>z2gbCl^e`vS-!S8Py1nW**#%e)

delta 441
zcmZ9IOH0E*5P)aX#3q?)r(i00Xw#=f5gMvi&p{{@@qrXPD7|<W>RD0`d$u5~;Ggi+
zcoO^rdR9dGfEGRZ6Wj!&;0`;pAIy9V>v@jnIXeutsz*8aJA_{Bhk}~00W5g|6n6Ux
za9Dp{T3rknfIyMa4&O}Xgg?B}vdLci`jR*?P70?OCzX@NX@*mrlg`QLlc^F*`<iXe
z>wdmszQ=oQgICRd71g`KsTvA@Q;Q{`p_fA5)Mw#LFZcGX^o?P|xsiuGqW~470;;TU
zx_>ahCrx|}k=V9iBXk`%3-BPP6=1+J01-=);jBdrA+JMSbjO$z7Xw^o8{%<<O;!s`
z8L=|PlH>f-MI7lOj&!9!*JQ=OR1_~mTu24~8Eh1`bUHOlI1}7umgr8<Rg$(i8OYYp
V36|NMNKNH5isLD|{{06wTHirFRQ&(|