upgraded unit test suite to use PHPUnit3

use "cd tests/; phpunit AllTests.php" to run the tests
use "cd tests/; phpunit --report=coverage AllTests.php" to get a nice code coverage report (need xdebug)

5 files changed, 43 insertions, 10 deletions

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();
   }
 }