Fixing usage of mb_internal_encoding so it doesn't bone group tests.

cakephp · Sep 25, 2010 · 32dc4aa · 32dc4aa
1 parent d45788e
commit 32dc4aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cake/tests/cases/libs/all_tests.test.php b/cake/tests/cases/libs/all_tests.test.php
@@ -42,14 +42,14 @@ public static function suite() {
 		$suite->addTestFile($path . 'all_components.test.php');
 		$suite->addTestFile($path . 'all_configure.test.php');
 		$suite->addTestFile($path . 'all_controllers.test.php');
-		//$suite->addTestFile($path . 'all_database.test.php');
+		$suite->addTestFile($path . 'all_database.test.php');
 		$suite->addTestFile($path . 'all_helpers.test.php');
 		//$suite->addTestFile($path . 'all_libs.test.php');
 		$suite->addTestFile($path . 'all_localization.test.php');
 		//$suite->addTestFile($path . 'all_model.test.php');
 		$suite->addTestFile($path . 'all_routing.test.php');
 		$suite->addTestFile($path . 'all_socket.test.php');
-		//$suite->addTestFile($path . 'all_test.test.php');;
+		//$suite->addTestFile($path . 'all_test_suite.test.php');;
 		$suite->addTestFile($path . 'all_views.test.php');
 		$suite->addTestFile($path . 'all_xml.test.php');
 		return $suite;

diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
@@ -896,6 +896,7 @@ function test_encodeSettingInternalCharset() {
 		if ($this->skipIf($skip, 'Missing mb_* functions, cannot run test.')) {
 			return;
 		}
+		$restore = mb_internal_encoding();
 		mb_internal_encoding('ISO-8859-1');
 
 		$this->Controller->charset = 'UTF-8';
@@ -916,6 +917,8 @@ function test_encodeSettingInternalCharset() {
 
 		$result = mb_internal_encoding();
 		$this->assertEqual($result, 'ISO-8859-1');
+
+		mb_internal_encoding($restore);
 	}
 
 /**