14 files changed, 217 insertions, 143 deletions

diff --git a/tests/unit/Web/AllTests.php b/tests/unit/Web/AllTests.php
new file mode 100644
index 00000000..c9666be9
--- /dev/null
+++ b/tests/unit/Web/AllTests.php
@@ -0,0 +1,41 @@
+<?php
+require_once dirname(__FILE__).'/../phpunit.php';
+
+if(!defined('PHPUnit_MAIN_METHOD')) {
+  define('PHPUnit_MAIN_METHOD', 'Web_AllTests::main');
+}
+
+require_once 'TAssetManagerTest.php';
+require_once 'THttpCookieCollectionTest.php';
+require_once 'THttpCookieTest.php';
+require_once 'THttpRequestTest.php';
+require_once 'THttpResponseTest.php';
+require_once 'THttpSessionTest.php';
+require_once 'THttpUtilityTest.php';
+require_once 'TUriTest.php';
+
+class Web_AllTests {
+  public static function main() {
+    PHPUnit_TextUI_TestRunner::run(self::suite());
+  }
+  
+  public static function suite() {
+    $suite = new PHPUnit_Framework_TestSuite('System.Web');
+    
+	$suite->addTestSuite('TAssetManagerTest');
+	$suite->addTestSuite('THttpCookieCollectionTest');
+	$suite->addTestSuite('THttpCookieTest');
+    $suite->addTestSuite('THttpRequestTest');
+	$suite->addTestSuite('THttpResponseTest');
+	$suite->addTestSuite('THttpSessionTest');
+	$suite->addTestSuite('THttpUtilityTest');
+	$suite->addTestSuite('TUriTest');
+	
+    return $suite;
+  }
+}
+
+if(PHPUnit_MAIN_METHOD == 'Web_AllTests::main') {
+  Web_AllTests::main();
+}
+?>
diff --git a/tests/unit/Web/TAssetManagerTest.php b/tests/unit/Web/TAssetManagerTest.php
index 1821f28b..49d42165 100644
--- a/tests/unit/Web/TAssetManagerTest.php
+++ b/tests/unit/Web/TAssetManagerTest.php
@@ -1,31 +1,31 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.TAssetManager');
 
 /**
  * @package System.Web
  */
-class TAssetManagerTest extends PHPUnit2_Framework_TestCase {
+class TAssetManagerTest extends PHPUnit_Framework_TestCase {
 
   public function testInit() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetBasePath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetBaseUrl() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testPublishFilePath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testPublishTarFile() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpCookieCollectionTest.php b/tests/unit/Web/THttpCookieCollectionTest.php
index 28b32a6e..9c648e2b 100644
--- a/tests/unit/Web/THttpCookieCollectionTest.php
+++ b/tests/unit/Web/THttpCookieCollectionTest.php
@@ -1,31 +1,31 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpRequest');
 
 /**
  * @package System.Web
  */
-class THttpCookieCollectionTest extends PHPUnit2_Framework_TestCase {
+class THttpCookieCollectionTest extends PHPUnit_Framework_TestCase {
 
   public function testConstruct() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testInsertAt() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRemoveAt() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testItemAt() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testFindCookieByName() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpCookieTest.php b/tests/unit/Web/THttpCookieTest.php
index ab7d4928..8a96e35e 100644
--- a/tests/unit/Web/THttpCookieTest.php
+++ b/tests/unit/Web/THttpCookieTest.php
@@ -1,39 +1,39 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpRequest');
 
 /**
  * @package System.Web
  */
-class THttpCookieTest extends PHPUnit2_Framework_TestCase {
+class THttpCookieTest extends PHPUnit_Framework_TestCase {
 
   public function testConstruct() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetDomain() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetExpire() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetName() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetValue() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetPath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetSecure() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php
index a27eb711..0933fb05 100644
--- a/tests/unit/Web/THttpRequestTest.php
+++ b/tests/unit/Web/THttpRequestTest.php
@@ -1,175 +1,175 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpRequest');
 
 /**
  * @package System.Web
  */
-class THttpRequestTest extends PHPUnit2_Framework_TestCase {
+class THttpRequestTest extends PHPUnit_Framework_TestCase {
 
   public function testInit() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testStripSlashes() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetUrlFormat() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUrl() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetRequestMethod() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetIsSecureConnection() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetPathInfo() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetQueryString() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetRequestUri() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetApplicationUrl() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetApplicationFilePath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetServerName() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetServerPort() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUrlReferrer() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetBrowser() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUserAgent() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUserHostAddress() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUserHost() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetAcceptTypes() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUserLanguages() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetEnableCookieValidation() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetCookies() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUploadedFiles() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetServerVariables() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetEnvironmentVariables() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testConstructUrl() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetAvailableServices() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetAvailableServices() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetServiceID() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetIterator() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetCount() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetKeys() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testItemAt() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testAdd() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRemove() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testContains() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testToArray() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetExists() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetGet() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetSet() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetUnset() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpResponseTest.php b/tests/unit/Web/THttpResponseTest.php
index 9812c3a6..54d25830 100644
--- a/tests/unit/Web/THttpResponseTest.php
+++ b/tests/unit/Web/THttpResponseTest.php
@@ -1,95 +1,95 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpResponse');
 
 /**
  * @package System.Web
  */
-class THttpResponseTest extends PHPUnit2_Framework_TestCase {
+class THttpResponseTest extends PHPUnit_Framework_TestCase {
 
   public function testInit() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetCacheExpire() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetCacheControl() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetContentType() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetCharset() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetBufferOutput() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetStatusCode() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetCookies() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testWrite() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testWriteFile() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRedirect() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testReload() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testFlush() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSendContentTypeHeader() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testClear() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testAppendHeader() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testAppendLog() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testAddCookie() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRemoveCookie() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetHtmlWriterType() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testCreateHtmlWriter() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpSessionTest.php b/tests/unit/Web/THttpSessionTest.php
index 8f30cfa6..179d2903 100644
--- a/tests/unit/Web/THttpSessionTest.php
+++ b/tests/unit/Web/THttpSessionTest.php
@@ -1,115 +1,115 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpSession');
 
 /**
  * @package System.Web
  */
-class THttpSessionTest extends PHPUnit2_Framework_TestCase {
+class THttpSessionTest extends PHPUnit_Framework_TestCase {
 
   public function testInit() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOpen() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testClose() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testDestroy() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetIsStarted() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetSessionID() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetSessionName() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetSavePath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetUseCustomStorage() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetCookieMode() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetAutoStart() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetGProbability() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetUseTransparentSessionID() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetTimeout() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetIterator() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetCount() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetKeys() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testItemAt() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testAdd() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRemove() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testContains() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testToArray() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetExists() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetGet() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetSet() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testOffsetUnset() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/THttpUtilityTest.php b/tests/unit/Web/THttpUtilityTest.php
index 790bc9f6..4dfc46bd 100644
--- a/tests/unit/Web/THttpUtilityTest.php
+++ b/tests/unit/Web/THttpUtilityTest.php
@@ -1,19 +1,19 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpUtility');
 
 /**
  * @package System.Web
  */
-class THttpUtilityTest extends PHPUnit2_Framework_TestCase {
+class THttpUtilityTest extends PHPUnit_Framework_TestCase {
 
   public function testHtmlEncode() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testHtmlDecode() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/TUriTest.php b/tests/unit/Web/TUriTest.php
index b606bdc3..fb803d8b 100644
--- a/tests/unit/Web/TUriTest.php
+++ b/tests/unit/Web/TUriTest.php
@@ -1,51 +1,51 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 Prado::using('System.Web.THttpRequest');
 
 /**
  * @package System.Web
  */
-class TUriTest extends PHPUnit2_Framework_TestCase {
+class TUriTest extends PHPUnit_Framework_TestCase {
 
   public function testConstruct() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUri() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetScheme() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetHost() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetPort() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetUser() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetPassword() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetPath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetQuery() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testGetFragment() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }
 ?>
\ No newline at end of file
diff --git a/tests/unit/Web/UI/WebControls/AllTests.php b/tests/unit/Web/UI/WebControls/AllTests.php
new file mode 100644
index 00000000..f9b188c2
--- /dev/null
+++ b/tests/unit/Web/UI/WebControls/AllTests.php
@@ -0,0 +1,33 @@
+<?php
+require_once dirname(__FILE__).'/../../../phpunit.php';
+
+if(!defined('PHPUnit_MAIN_METHOD')) {
+  define('PHPUnit_MAIN_METHOD', 'Web_UI_WebControls_AllTests::main');
+}
+
+require_once 'TDropDownListTest.php';
+require_once 'TLabelTest.php';
+require_once 'TRequiredFieldValidatorTest.php';
+require_once 'TXmlTransformTest.php';
+
+class Web_UI_WebControls_AllTests {
+  public static function main() {
+    PHPUnit_TextUI_TestRunner::run(self::suite());
+  }
+  
+  public static function suite() {
+    $suite = new PHPUnit_Framework_TestSuite('System.Web.UI.WebControls');
+    
+	$suite->addTestSuite('TDropDownListTest');
+	$suite->addTestSuite('TLabelTest');
+	$suite->addTestSuite('TRequiredFieldValidatorTest');
+    $suite->addTestSuite('TXmlTransformTest');
+	
+    return $suite;
+  }
+}
+
+if(PHPUnit_MAIN_METHOD == 'Web_UI_WebControls_AllTests::main') {
+  Web_UI_WebControls_AllTests::main();
+}
+?>
diff --git a/tests/unit/Web/UI/WebControls/TDropDownListTest.php b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
index b93d32cf..3db425b9 100644
--- a/tests/unit/Web/UI/WebControls/TDropDownListTest.php
+++ b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
@@ -1,12 +1,12 @@
 <?php
-require_once dirname(__FILE__).'/../../../phpunit2.php';
+require_once dirname(__FILE__).'/../../../phpunit.php';
 
 Prado::using('System.Web.UI.WebControls.TDropDownList');
 
 /**
  * @package System.Web.UI.WebControls
  */
-class TDropDownListTest extends PHPUnit2_Framework_TestCase {
+class TDropDownListTest extends PHPUnit_Framework_TestCase {
 
   public function testSetDataSource() {
     $list = new TDropDownList();
diff --git a/tests/unit/Web/UI/WebControls/TLabelTest.php b/tests/unit/Web/UI/WebControls/TLabelTest.php
index 726137d4..214d497c 100644
--- a/tests/unit/Web/UI/WebControls/TLabelTest.php
+++ b/tests/unit/Web/UI/WebControls/TLabelTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../../../phpunit2.php';
+require_once dirname(__FILE__).'/../../../phpunit.php';
 
 Prado::using('System.Web.UI.WebControls.TLabel');
 Prado::using('System.Web.UI.THtmlWriter');
@@ -7,7 +7,7 @@ Prado::using('System.Web.UI.THtmlWriter');
 /**
  * @package System.Web.UI.WebControls
  */
-class TLabelTest extends PHPUnit2_Framework_TestCase {
+class TLabelTest extends PHPUnit_Framework_TestCase {
 
   public function testSetText() {
     $label = new TLabel();
diff --git a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
index 3146cb06..ae8ac1f5 100644
--- a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
+++ b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
@@ -1,12 +1,12 @@
 <?php
-require_once dirname(__FILE__).'/../../../phpunit2.php';
+require_once dirname(__FILE__).'/../../../phpunit.php';
 
 Prado::using('System.Web.UI.WebControls.TRequiredFieldValidator');
 
 /**
  * @package System.Web.UI.WebControls
  */
-class TRequiredFieldValidatorTest extends PHPUnit2_Framework_TestCase {
+class TRequiredFieldValidatorTest extends PHPUnit_Framework_TestCase {
 
   public function testGetEmptyInitialValue() {
     $validator = new TRequiredFieldValidator();
diff --git a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
index e277edbd..9fc6d769 100644
--- a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
+++ b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../../../phpunit2.php';
+require_once dirname(__FILE__).'/../../../phpunit.php';
 
 Prado::using('System.Web.UI.WebControls.TXmlTransform');
 Prado::using('System.Web.UI.THtmlWriter');
@@ -7,7 +7,7 @@ Prado::using('System.Web.UI.THtmlWriter');
 /**
  * @package System.Web.UI.WebControls
  */
-class TXmlTransformTest extends PHPUnit2_Framework_TestCase {
+class TXmlTransformTest extends PHPUnit_Framework_TestCase {
 
   private $documentContent;
   private $transformContent;
@@ -70,7 +70,7 @@ class TXmlTransformTest extends PHPUnit2_Framework_TestCase {
   }
 
   public function testAddParameter() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testRenderWithDocumentContentAndTransformContent() {
@@ -122,7 +122,7 @@ class TXmlTransformTest extends PHPUnit2_Framework_TestCase {
   }
   
   public function testRenderWithBodyAsDocumentAndTransformPath() {
-    throw new PHPUnit2_Framework_IncompleteTestError();
+    throw new PHPUnit_Framework_IncompleteTestError();
   }
 }