diff options
| author | ctrlaltca <> | 2013-01-02 14:42:24 +0000 |
|---|---|---|
| committer | ctrlaltca <> | 2013-01-02 14:42:24 +0000 |
| commit | edf2251aca60a970e822079d23933e5b70b26571 (patch) | |
| tree | 366b6688efbb03f20f47268bea57859cea673c70 /tests/unit/Data | |
| parent | 8e5f2510bd577e15095e46afc7d0ba6808549bf8 (diff) | |
backported all related changes up to 3229 to branch/3.2
Diffstat (limited to 'tests/unit/Data')
| -rw-r--r-- | tests/unit/Data/TDbCommandTest.php | 7 | ||||
| -rw-r--r-- | tests/unit/Data/TDbConnectionTest.php | 10 | ||||
| -rw-r--r-- | tests/unit/Data/TDbDataReaderTest.php | 7 | ||||
| -rw-r--r-- | tests/unit/Data/TDbTransactionTest.php | 5 |
4 files changed, 13 insertions, 16 deletions
diff --git a/tests/unit/Data/TDbCommandTest.php b/tests/unit/Data/TDbCommandTest.php index 9023e6b6..a75674bf 100644 --- a/tests/unit/Data/TDbCommandTest.php +++ b/tests/unit/Data/TDbCommandTest.php @@ -1,15 +1,14 @@ <?php -require_once(dirname(__FILE__).'/../phpunit2.php'); - Prado::using('System.Data.*'); -define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); +if(!defined('TEST_DB_FILE')) + define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); /** * @package System.Data.PDO */ -class TDbCommandTest extends PHPUnit2_Framework_TestCase +class TDbCommandTest extends PHPUnit_Framework_TestCase { private $_connection; diff --git a/tests/unit/Data/TDbConnectionTest.php b/tests/unit/Data/TDbConnectionTest.php index 6c1e71aa..8f6ff34f 100644 --- a/tests/unit/Data/TDbConnectionTest.php +++ b/tests/unit/Data/TDbConnectionTest.php @@ -1,16 +1,16 @@ <?php -require_once(dirname(__FILE__).'/../phpunit2.php'); - Prado::using('System.Data.*'); -define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); -define('TEST_DB_FILE2',dirname(__FILE__).'/db/test2.db'); +if(!defined('TEST_DB_FILE')) + define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); +if(!defined('TEST_DB_FILE2')) + define('TEST_DB_FILE2',dirname(__FILE__).'/db/test2.db'); /** * @package System.Data.PDO */ -class TDbConnectionTest extends PHPUnit2_Framework_TestCase +class TDbConnectionTest extends PHPUnit_Framework_TestCase { private $_connection1; private $_connection2; diff --git a/tests/unit/Data/TDbDataReaderTest.php b/tests/unit/Data/TDbDataReaderTest.php index 9d61a330..98aa0385 100644 --- a/tests/unit/Data/TDbDataReaderTest.php +++ b/tests/unit/Data/TDbDataReaderTest.php @@ -1,10 +1,9 @@ <?php -require_once(dirname(__FILE__).'/../phpunit2.php'); - Prado::using('System.Data.*'); -define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); +if(!defined('TEST_DB_FILE')) + define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); class FooRecord extends TComponent { @@ -31,7 +30,7 @@ class FooRecord extends TComponent /** * @package System.Data.PDO */ -class TDbDataReaderTest extends PHPUnit2_Framework_TestCase +class TDbDataReaderTest extends PHPUnit_Framework_TestCase { private $_connection; diff --git a/tests/unit/Data/TDbTransactionTest.php b/tests/unit/Data/TDbTransactionTest.php index 4cfd2943..c608bce1 100644 --- a/tests/unit/Data/TDbTransactionTest.php +++ b/tests/unit/Data/TDbTransactionTest.php @@ -1,10 +1,9 @@ <?php -require_once(dirname(__FILE__).'/../phpunit.php'); - Prado::using('System.Data.*'); -define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); +if(!defined('TEST_DB_FILE')) + define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db'); /** * @package System.Data.PDO |