6 files changed, 45 insertions, 10 deletions
diff --git a/tests/unit/I18N/core/AllTests.php b/tests/unit/I18N/core/AllTests.php
new file mode 100644
index 00000000..66c8a6f2
--- /dev/null
+++ b/tests/unit/I18N/core/AllTests.php
@@ -0,0 +1,35 @@
+<?php
+require_once dirname(__FILE__).'/../../phpunit.php';
+
+if(!defined('PHPUnit_MAIN_METHOD')) {
+  define('PHPUnit_MAIN_METHOD', 'I18N_core_AllTests::main');
+}
+
+require_once 'CultureInfoTest.php';
+require_once 'DateFormatTest.php';
+require_once 'DateTimeFormatInfoTest.php';
+require_once 'NumberFormatInfoTest.php';
+require_once 'NumberFormatTest.php';
+
+class I18N_core_AllTests {
+  public static function main() {
+    PHPUnit_TextUI_TestRunner::run(self::suite());
+  }
+  
+  public static function suite() {
+    $suite = new PHPUnit_Framework_TestSuite('System.I18N.core');
+    
+    $suite->addTestSuite('CultureInfoTest');
+	$suite->addTestSuite('DateFormatTest');
+	$suite->addTestSuite('DateTimeFormatInfoTest');
+	$suite->addTestSuite('NumberFormatInfoTest');
+	$suite->addTestSuite('NumberFormatTest');
+    
+    return $suite;
+  }
+}
+
+if(PHPUnit_MAIN_METHOD == 'I18N_core_AllTests::main') {
+  I18N_core_AllTests::main();
+}
+?>
diff --git a/tests/unit/I18N/core/CultureInfoTest.php b/tests/unit/I18N/core/CultureInfoTest.php
index 14b60ece..c043edd7 100644
--- a/tests/unit/I18N/core/CultureInfoTest.php
+++ b/tests/unit/I18N/core/CultureInfoTest.php
@@ -1,12 +1,12 @@
 <?php
-require_once dirname(__FILE__).'/../../phpunit2.php';
+require_once dirname(__FILE__).'/../../phpunit.php';
 
 Prado::using('System.I18N.core.CultureInfo');
 
 /**
  * @package System.I18N.core
  */
-class CultureInfoTest extends PHPUnit2_Framework_TestCase {
+class CultureInfoTest extends PHPUnit_Framework_TestCase {
   protected $culture;
  
   function setUp() {
diff --git a/tests/unit/I18N/core/DateFormatTest.php b/tests/unit/I18N/core/DateFormatTest.php
index 3f5c9449..da7c6b73 100644
--- a/tests/unit/I18N/core/DateFormatTest.php
+++ b/tests/unit/I18N/core/DateFormatTest.php
@@ -1,12 +1,12 @@
 <?php
-require_once dirname(__FILE__).'/../../phpunit2.php';
+require_once dirname(__FILE__).'/../../phpunit.php';
 
 Prado::using('System.I18N.core.DateFormat');
 
 /**
  * @package System.I18N.core
  */
-class DateFormatTest extends PHPUnit2_Framework_TestCase {
+class DateFormatTest extends PHPUnit_Framework_TestCase {
 
   public function testStandardPatterns() {
     $dateFormatter = new DateFormat();
diff --git a/tests/unit/I18N/core/DateTimeFormatInfoTest.php b/tests/unit/I18N/core/DateTimeFormatInfoTest.php
index dcef6ba1..789329ce 100644
--- a/tests/unit/I18N/core/DateTimeFormatInfoTest.php
+++ b/tests/unit/I18N/core/DateTimeFormatInfoTest.php
@@ -1,12 +1,12 @@
 <?php
-require_once dirname(__FILE__).'/../../phpunit2.php';
+require_once dirname(__FILE__).'/../../phpunit.php';
 
 Prado::using('System.I18N.core.DateTimeFormatInfo');
 
 /**
  * @package System.I18N.core
  */
-class DateTimeFormatInfoTest extends PHPUnit2_Framework_TestCase {
+class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
 
   protected $format;
   
diff --git a/tests/unit/I18N/core/NumberFormatInfoTest.php b/tests/unit/I18N/core/NumberFormatInfoTest.php
index a3b6d05a..e01ba43e 100644
--- a/tests/unit/I18N/core/NumberFormatInfoTest.php
+++ b/tests/unit/I18N/core/NumberFormatInfoTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../../phpunit2.php';
+require_once dirname(__FILE__).'/../../phpunit.php';
 
 //NOTE: This page require UTF-8 aware editors
 Prado::using('System.I18N.core.NumberFormatInfo');
@@ -7,7 +7,7 @@ Prado::using('System.I18N.core.NumberFormatInfo');
 /**
  * @package System.I18N.core
  */
-class NumberFormatInfoTest extends PHPUnit2_Framework_TestCase {
+class NumberFormatInfoTest extends PHPUnit_Framework_TestCase {
   
   function testCurrencyPatterns() {
     $numberInfo = NumberFormatInfo::getCurrencyInstance();
diff --git a/tests/unit/I18N/core/NumberFormatTest.php b/tests/unit/I18N/core/NumberFormatTest.php
index e136058e..07d0d9ca 100644
--- a/tests/unit/I18N/core/NumberFormatTest.php
+++ b/tests/unit/I18N/core/NumberFormatTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../../phpunit2.php';
+require_once dirname(__FILE__).'/../../phpunit.php';
 
 //NOTE: This page require UTF-8 aware editors
 Prado::using('System.I18N.core.NumberFormat');
@@ -7,7 +7,7 @@ Prado::using('System.I18N.core.NumberFormat');
 /**
  * @package System.I18N.core
  */
-class NumberFormatTest extends PHPUnit2_Framework_TestCase {
+class NumberFormatTest extends PHPUnit_Framework_TestCase {
   function testDefaultFormats() {
     $formatter = new NumberFormat();
     $number = '123456789.125156';