backported all related changes up to 3229 to branch/3.2

1 files changed, 5 insertions, 5 deletions

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;