7 files changed, 28 insertions, 9 deletions
diff --git a/tests/unit/Data/DataGateway/TSqlCriteriaTest.php b/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
index ce22ef1d..58796947 100644
--- a/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
+++ b/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
@@ -1,7 +1,8 @@
 <?php
 
 
-Prado::using('System.Data.DataGateway.TSqlCriteria');
+use Prado\Data\DataGateway\TSqlCriteria;
+
 
 /**
  * @package System.Data.DataGateway
diff --git a/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php b/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
index 3f5493c7..99118927 100644
--- a/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
+++ b/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
@@ -1,8 +1,8 @@
 <?php
 
 
-Prado::using('System.Data.SqlMap.DataMapper.TSqlMapException');
-Prado::using('System.Data.SqlMap.DataMapper.TPropertyAccess');
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+
 
 /**
  * @package System.Data.SqlMap.DataMapper
diff --git a/tests/unit/Data/SqlMap/DynamicParameterTest.php b/tests/unit/Data/SqlMap/DynamicParameterTest.php
index 136111db..414f819f 100644
--- a/tests/unit/Data/SqlMap/DynamicParameterTest.php
+++ b/tests/unit/Data/SqlMap/DynamicParameterTest.php
@@ -1,8 +1,11 @@
 <?php
 
 
-Prado::using('System.Data.*');
-Prado::using('System.Data.SqlMap.*');
+use Prado\Data\SqlMap\TSqlMapManager;
+use Prado\Data\TDbConnection;
+use Prado\Prado;
+use Prado\TApplication;
+
 
 /**
  * @package System.Data.SqlMap
diff --git a/tests/unit/Data/TDbCommandTest.php b/tests/unit/Data/TDbCommandTest.php
index 87bbbf05..f9ae25b7 100644
--- a/tests/unit/Data/TDbCommandTest.php
+++ b/tests/unit/Data/TDbCommandTest.php
@@ -1,6 +1,10 @@
 <?php
 
-Prado::using('System.Data.*');
+use Prado\Data\TDbConnection;
+use Prado\Data\TDbDataReader;
+use Prado\Exceptions\TDbException;
+use Prado\TApplication;
+
 
 if(!defined('TEST_DB_FILE'))
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
diff --git a/tests/unit/Data/TDbConnectionTest.php b/tests/unit/Data/TDbConnectionTest.php
index 4b32300c..e6d47f39 100644
--- a/tests/unit/Data/TDbConnectionTest.php
+++ b/tests/unit/Data/TDbConnectionTest.php
@@ -1,6 +1,12 @@
 <?php
 
-Prado::using('System.Data.*');
+use Prado\Data\TDbColumnCaseMode;
+use Prado\Data\TDbCommand;
+use Prado\Data\TDbConnection;
+use Prado\Data\TDbNullConversionMode;
+use Prado\Exceptions\TDbException;
+use Prado\TApplication;
+
 
 if(!defined('TEST_DB_FILE'))
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
diff --git a/tests/unit/Data/TDbDataReaderTest.php b/tests/unit/Data/TDbDataReaderTest.php
index 2e31245e..67fc6f29 100644
--- a/tests/unit/Data/TDbDataReaderTest.php
+++ b/tests/unit/Data/TDbDataReaderTest.php
@@ -1,6 +1,9 @@
 <?php
 
-Prado::using('System.Data.*');
+use Prado\Data\TDbConnection;
+use Prado\Exceptions\TDbException;
+use Prado\TApplication;
+
 
 if(!defined('TEST_DB_FILE'))
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
diff --git a/tests/unit/Data/TDbTransactionTest.php b/tests/unit/Data/TDbTransactionTest.php
index b51fda04..ee8f7c4c 100644
--- a/tests/unit/Data/TDbTransactionTest.php
+++ b/tests/unit/Data/TDbTransactionTest.php
@@ -1,6 +1,8 @@
 <?php
 
-Prado::using('System.Data.*');
+use Prado\Data\TDbConnection;
+use Prado\TApplication;
+
 
 if(!defined('TEST_DB_FILE'))
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');