aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

rearranged tests

This commit is contained in:
Timothy Warren 2012-04-11 11:48:56 -04:00
parent ab34a7c0fc
commit de34e24325
13 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/databases/firebird-qb.php → tests/databases/firebird/firebird-qb.php
View File

@ -21,7 +21,7 @@ class FirebirdQBTest extends QBTest {
{ {
parent::__construct(); 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 // Test the query builder
$params = new Stdclass(); $params = new Stdclass();

2
tests/databases/firebird.php → tests/databases/firebird/firebird.php
View File

@ -21,7 +21,7 @@ class FirebirdTest extends DBTest {
function setUp() 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 // Test the db driver directly
$this->db = new Firebird('localhost:'.$dbpath); $this->db = new Firebird('localhost:'.$dbpath);

0
tests/databases/mysql-qb.php → tests/databases/mysql/mysql-qb.php
View File

0
tests/databases/mysql.php → tests/databases/mysql/mysql.php
View File

0
tests/databases/odbc-qb.php → tests/databases/odbc/odbc-qb.php
View File

0
tests/databases/odbc.php → tests/databases/odbc/odbc.php
View File

0
tests/databases/pgsql-qb.php → tests/databases/pgsql/pgsql-qb.php
View File

0
tests/databases/pgsql.php → tests/databases/pgsql/pgsql.php
View File

2
tests/databases/sqlite-qb.php → tests/databases/sqlite/sqlite-qb.php
View File

@ -21,7 +21,7 @@
{ {
parent::__construct(); 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 = new Stdclass();
$params->type = 'sqlite'; $params->type = 'sqlite';
$params->file = $path; $params->file = $path;

2
tests/databases/sqlite.php → tests/databases/sqlite/sqlite.php
View File

@ -26,7 +26,7 @@ class SQLiteTest extends UnitTestCase {
function setUp() 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); $this->db = new SQLite($path);
} }

BIN
tests/test_dbs/FB_TEST_DB.FDB → tests/db_files/FB_TEST_DB.FDB
View File

Binary file not shown.

BIN
tests/test_dbs/test_sqlite.db → tests/db_files/test_sqlite.db
View File

Binary file not shown.

6
tests/index.php
View File

@ -47,14 +47,12 @@ foreach(pdo_drivers() as $d)
if(is_dir($src_dir)) if(is_dir($src_dir))
{ {
require_once("{$test_path}{$d}.php"); array_map('do_include', glob("{$test_path}{$d}/{$d}*.php"));
require_once("{$test_path}{$d}-qb.php");
} }
} }
// Load Firebird if there is support // Load Firebird if there is support
if(function_exists('fbird_connect')) if(function_exists('fbird_connect'))
{ {
require_once("{$test_path}firebird.php"); array_map('do_include', glob("{$test_path}/firebird/firebird*.php"));
require_once("{$test_path}firebird-qb.php");
} }