2 files changed, 46 insertions, 34 deletions
diff --git a/tests/unit/I18N/MysqlMessageSourceTest.php b/tests/unit/I18N/MysqlMessageSourceTest.php
new file mode 100644
index 00000000..2890244d
--- /dev/null
+++ b/tests/unit/I18N/MysqlMessageSourceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+Prado::using('System.I18N.core.MessageSource_MySQL');
+Prado::using('System.I18N.core.MessageFormat');
+
+/**
+ * @package System.I18N
+ */
+class MysqlMessageSourceTestCase extends PHPUnit_Framework_TestCase
+{
+	private $_source;
+
+	function get_source()
+	{
+		if($this->_source===null)
+		{
+			$this->_source = new MessageSource_MySQL('mysq://prado:prado@localhost/i18n_test');
+			$this->_source->setCulture('en_AU');
+		}
+		return $this->_source;
+	}
+
+/*
+	function test_source()
+	{
+		$source = $this->get_source();
+		$this->assertEqual(3, count($source->catalogues()));
+	}
+
+	function test_load_source()
+	{
+		$source = $this->get_source();
+		$this->assertTrue($source->load());
+	}
+
+	function test_message_format()
+	{
+		$formatter = new MessageFormat($this->get_source());
+		var_dump($formatter->format('Hello'));
+		var_dump($formatter->format('Goodbye'));
+		//$this->assertEqual($formatter->format('Hello'),'G\'day Mate!');
+
+		//$this->assertEqual($formatter->format('Goodbye'), 'Goodbye');
+	}
+*/
+}
diff --git a/tests/unit/I18N/core/AllTests.php b/tests/unit/I18N/core/AllTests.php
deleted file mode 100644
index bf5fb813..00000000
--- a/tests/unit/I18N/core/AllTests.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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();
-}