fix unit tests

27 files changed, 64 insertions, 31 deletions

diff --git a/tests/unit/Web/TAssetManagerTest.php b/tests/unit/Web/TAssetManagerTest.php
index 13d2d6c1..31837ca7 100644
--- a/tests/unit/Web/TAssetManagerTest.php
+++ b/tests/unit/Web/TAssetManagerTest.php
@@ -1,6 +1,12 @@
 <?php
 
-Prado::using('System.Web.TAssetManager');
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+use Prado\TApplication;
+use Prado\Web\TAssetManager;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/TCacheHttpSessionTest.php b/tests/unit/Web/TCacheHttpSessionTest.php
index 8475cd37..4bfd3b1a 100644
--- a/tests/unit/Web/TCacheHttpSessionTest.php
+++ b/tests/unit/Web/TCacheHttpSessionTest.php
@@ -1,7 +1,10 @@
 <?php
 
-Prado::using('System.Web.TCacheHttpSession');
-Prado::using('System.Caching.TMemCache');
+use Prado\Caching\TMemCache;
+use Prado\Exceptions\TConfigurationException;
+use Prado\TApplication;
+use Prado\Web\TCacheHttpSession;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/THttpCookieCollectionTest.php b/tests/unit/Web/THttpCookieCollectionTest.php
index aa091788..14b3f923 100644
--- a/tests/unit/Web/THttpCookieCollectionTest.php
+++ b/tests/unit/Web/THttpCookieCollectionTest.php
@@ -1,6 +1,10 @@
 <?php
 
-Prado::using('System.Web.THttpRequest');
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\THttpCookie;
+use Prado\Web\THttpCookieCollection;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/THttpCookieTest.php b/tests/unit/Web/THttpCookieTest.php
index 206ef105..5eb3496d 100644
--- a/tests/unit/Web/THttpCookieTest.php
+++ b/tests/unit/Web/THttpCookieTest.php
@@ -1,6 +1,7 @@
 <?php
 
-Prado::using('System.Web.THttpRequest');
+use Prado\Web\THttpCookie;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php
index 7f5da17d..9b8168c3 100644
--- a/tests/unit/Web/THttpRequestTest.php
+++ b/tests/unit/Web/THttpRequestTest.php
@@ -1,7 +1,17 @@
 <?php
 
-Prado::using('System.Web.THttpRequest');
-Prado::using('System.Security.TSecurityManager');
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Prado;
+use Prado\Security\TSecurityManager;
+use Prado\TApplication;
+use Prado\Web\TAssetManager;
+use Prado\Web\THttpRequest;
+use Prado\Web\THttpRequestUrlFormat;
+use Prado\Web\TUrlManager;
+use Prado\Web\TUrlMapping;
+use Prado\Xml\TXmlDocument;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/THttpResponseTest.php b/tests/unit/Web/THttpResponseTest.php
index 0855bf4d..9af89900 100644
--- a/tests/unit/Web/THttpResponseTest.php
+++ b/tests/unit/Web/THttpResponseTest.php
@@ -1,6 +1,10 @@
 <?php
 
-Prado::using('System.Web.THttpResponse');
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\TApplication;
+use Prado\Web\THttpResponse;
+
 
 
 /**
diff --git a/tests/unit/Web/THttpSessionTest.php b/tests/unit/Web/THttpSessionTest.php
index eb1ec4df..f0988fd6 100644
--- a/tests/unit/Web/THttpSessionTest.php
+++ b/tests/unit/Web/THttpSessionTest.php
@@ -1,6 +1,8 @@
 <?php
 
-Prado::using('System.Web.THttpSession');
+use Prado\Web\THttpSession;
+use Prado\Web\THttpSessionCookieMode;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/THttpUtilityTest.php b/tests/unit/Web/THttpUtilityTest.php
index 7f4e6705..0f001ad8 100644
--- a/tests/unit/Web/THttpUtilityTest.php
+++ b/tests/unit/Web/THttpUtilityTest.php
@@ -1,6 +1,7 @@
 <?php
 
-Prado::using('System.Web.THttpUtility');
+use Prado\Web\THttpUtility;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/TUriTest.php b/tests/unit/Web/TUriTest.php
index b610cd1b..29489842 100644
--- a/tests/unit/Web/TUriTest.php
+++ b/tests/unit/Web/TUriTest.php
@@ -1,6 +1,8 @@
 <?php
 
-Prado::using('System.Web.THttpRequest');
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\TUri;
+
 
 /**
  * @package System.Web
diff --git a/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php b/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
index 6e80bd12..5a8e12c9 100644
--- a/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
+++ b/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
@@ -1,7 +1,8 @@
 <?php
 
 
-Prado::using('System.Web.UI.ActiveControls.TActiveHiddenField');
+use Prado\Web\UI\ActiveControls\TActiveHiddenField;
+
 
 /**
  * @package System.Web.UI.ActiveControls
diff --git a/tests/unit/Web/UI/TClientScriptManagerTest.php b/tests/unit/Web/UI/TClientScriptManagerTest.php
index efce0009..b3b02b7c 100644
--- a/tests/unit/Web/UI/TClientScriptManagerTest.php
+++ b/tests/unit/Web/UI/TClientScriptManagerTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TClientScriptManager');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TControlAdapterTest.php b/tests/unit/Web/UI/TControlAdapterTest.php
index ff687cc8..be8ac797 100644
--- a/tests/unit/Web/UI/TControlAdapterTest.php
+++ b/tests/unit/Web/UI/TControlAdapterTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TControlAdapter');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TControlTest.php b/tests/unit/Web/UI/TControlTest.php
index b6741167..5fe4a33a 100644
--- a/tests/unit/Web/UI/TControlTest.php
+++ b/tests/unit/Web/UI/TControlTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TControl');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TFormTest.php b/tests/unit/Web/UI/TFormTest.php
index 7fb6d2b7..c90cec76 100644
--- a/tests/unit/Web/UI/TFormTest.php
+++ b/tests/unit/Web/UI/TFormTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TForm');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/THtmlWriterTest.php b/tests/unit/Web/UI/THtmlWriterTest.php
index cf3b27e3..e99238ad 100644
--- a/tests/unit/Web/UI/THtmlWriterTest.php
+++ b/tests/unit/Web/UI/THtmlWriterTest.php
@@ -1,7 +1,11 @@
 <?php
 
 
-Prado::using('System.Web.UI.THtmlWriter');
+use Prado\IO\ITextWriter;
+use Prado\TComponent;
+use Prado\Web\THttpUtility;
+use Prado\Web\UI\THtmlWriter;
+
 
 /**
  * Implement a writer that flush the content to a variable, to simulate a real flush
diff --git a/tests/unit/Web/UI/TPageStatePersisterTest.php b/tests/unit/Web/UI/TPageStatePersisterTest.php
index 8ee1cfc9..f70dd0cc 100644
--- a/tests/unit/Web/UI/TPageStatePersisterTest.php
+++ b/tests/unit/Web/UI/TPageStatePersisterTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TPageStatePersister');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TPageTest.php b/tests/unit/Web/UI/TPageTest.php
index c1593816..b30a7762 100644
--- a/tests/unit/Web/UI/TPageTest.php
+++ b/tests/unit/Web/UI/TPageTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TPage');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TSessionPageStatePersisterTest.php b/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
index 9153ad42..6e5d0ab0 100644
--- a/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
+++ b/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TSessionPageStatePersister');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TTemplateControlTest.php b/tests/unit/Web/UI/TTemplateControlTest.php
index 7276a2b0..6d377882 100644
--- a/tests/unit/Web/UI/TTemplateControlTest.php
+++ b/tests/unit/Web/UI/TTemplateControlTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TTemplateControl');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TTemplateManagerTest.php b/tests/unit/Web/UI/TTemplateManagerTest.php
index dfe452bf..46edbb56 100644
--- a/tests/unit/Web/UI/TTemplateManagerTest.php
+++ b/tests/unit/Web/UI/TTemplateManagerTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TTemplateManager');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TTemplateTest.php b/tests/unit/Web/UI/TTemplateTest.php
index 2d802094..600ecebc 100644
--- a/tests/unit/Web/UI/TTemplateTest.php
+++ b/tests/unit/Web/UI/TTemplateTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TTemplateManager');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TThemeManagerTest.php b/tests/unit/Web/UI/TThemeManagerTest.php
index 028b222a..ccba749c 100644
--- a/tests/unit/Web/UI/TThemeManagerTest.php
+++ b/tests/unit/Web/UI/TThemeManagerTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TThemeManager');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/TThemeTest.php b/tests/unit/Web/UI/TThemeTest.php
index aeeeee65..4cf7d202 100644
--- a/tests/unit/Web/UI/TThemeTest.php
+++ b/tests/unit/Web/UI/TThemeTest.php
@@ -1,7 +1,6 @@
 <?php
 
 
-Prado::using('System.Web.UI.TThemeManager');
 
 /**
  * @package System.Web.UI
diff --git a/tests/unit/Web/UI/WebControls/TDropDownListTest.php b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
index d27ebb9c..3331aee6 100644
--- a/tests/unit/Web/UI/WebControls/TDropDownListTest.php
+++ b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
@@ -1,7 +1,9 @@
 <?php
 
 
-Prado::using('System.Web.UI.WebControls.TDropDownList');
+use Prado\Collections\TListItemCollection;
+use Prado\Web\UI\WebControls\TDropDownList;
+
 
 /**
  * @package System.Web.UI.WebControls
diff --git a/tests/unit/Web/UI/WebControls/TLabelTest.php b/tests/unit/Web/UI/WebControls/TLabelTest.php
index 88d8aec8..b0e8e7a6 100644
--- a/tests/unit/Web/UI/WebControls/TLabelTest.php
+++ b/tests/unit/Web/UI/WebControls/TLabelTest.php
@@ -1,8 +1,8 @@
 <?php
 
 
-Prado::using('System.Web.UI.WebControls.TLabel');
-Prado::using('System.Web.UI.THtmlWriter');
+use Prado\Web\UI\WebControls\TLabel;
+
 
 /**
  * @package System.Web.UI.WebControls
diff --git a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
index 43ed2c9d..86516d90 100644
--- a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
+++ b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
@@ -1,7 +1,9 @@
 <?php
 
 
-Prado::using('System.Web.UI.WebControls.TRequiredFieldValidator');
+use Prado\Exceptions\TConfigurationException;
+use Prado\Web\UI\WebControls\TRequiredFieldValidator;
+
 
 /**
  * @package System.Web.UI.WebControls
diff --git a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
index f93e9897..c8b8264c 100644
--- a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
+++ b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
@@ -1,8 +1,11 @@
 <?php
 
 
-Prado::using('System.Web.UI.WebControls.TXmlTransform');
-Prado::using('System.Web.UI.THtmlWriter');
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use Prado\Web\UI\THtmlWriter;
+use Prado\Web\UI\WebControls\TXmlTransform;
+
 
 /**
  * @package System.Web.UI.WebControls