Isolate CI_Security instantiation from CI_Input; improve tests

3 files changed, 36 insertions, 30 deletions

diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
index e1f4011b5..78b659691 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -15,9 +15,7 @@ class Input_test extends CI_TestCase {
 		$security = new Mock_Core_Security();
 
 		$this->ci_set_config('charset', 'UTF-8');
-		$utf8 = new Mock_Core_Utf8();
-
-		$this->input = new Mock_Core_Input($security, $utf8);
+		$this->input = new Mock_Core_Input($security);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index 42dff3639..f862c666e 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -119,8 +119,13 @@ class URI_test extends CI_TestCase {
 	*/
 	// --------------------------------------------------------------------
 
+	/**
+	 * @runInSeparateProcess
+	 */
 	public function test_filter_uri_passing()
 	{
+		define('UTF8_ENABLED', FALSE);
+
 		$this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-');
 
 		$str = 'abc01239~%.:_-';
@@ -129,8 +134,12 @@ class URI_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * @runInSeparateProcess
+	 */
 	public function test_filter_uri_throws_error()
 	{
+		define('UTF8_ENABLED', FALSE);
 		$this->setExpectedException('RuntimeException');
 
 		$this->uri->config->set_item('enable_query_strings', FALSE);
diff --git a/tests/codeigniter/core/Utf8_test.php b/tests/codeigniter/core/Utf8_test.php
index 7e6ffd930..f40bb9848 100644
--- a/tests/codeigniter/core/Utf8_test.php
+++ b/tests/codeigniter/core/Utf8_test.php
@@ -1,31 +1,27 @@
 <?php
 
+/**
+ * @runTestsInSeparateProcesses
+ */
 class Utf8_test extends CI_TestCase {
 
-	public function set_up()
+	public function test___constructUTF8_ENABLED()
 	{
-		$this->ci_set_config('charset', 'UTF-8');
-		$this->utf8 = new Mock_Core_Utf8();
-		$this->ci_instance_var('utf8', $this->utf8);
+		if ( ! defined('PREG_BAD_UTF8_ERROR') OR (ICONV_ENABLED === FALSE && MB_ENABLED === FALSE))
+		{
+			return $this->markTestSkipped('PCRE_UTF8 and/or both ext/mbstring & ext/iconv are unavailable');
+		}
+
+		new CI_Utf8('UTF-8');
+		$this->assertTrue(UTF8_ENABLED);
 	}
 
 	// --------------------------------------------------------------------
 
-	/**
-	 * __construct() test
-	 *
-	 * @covers	CI_Utf8::__construct
-	 */
-	public function test___construct()
+	public function test__constructUTF8_DISABLED()
 	{
-		if (defined('PREG_BAD_UTF8_ERROR') && (ICONV_ENABLED === TRUE OR MB_ENABLED === TRUE) && strtoupper(config_item('charset')) === 'UTF-8')
-		{
-			$this->assertTrue(UTF8_ENABLED);
-		}
-		else
-		{
-			$this->assertFalse(UTF8_ENABLED);
-		}
+		new CI_Utf8('WINDOWS-1251');
+		$this->assertFalse(UTF8_ENABLED);
 	}
 
 	// --------------------------------------------------------------------
@@ -37,8 +33,9 @@ class Utf8_test extends CI_TestCase {
 	 */
 	public function test_is_ascii()
 	{
-		$this->assertTrue($this->utf8->is_ascii('foo bar'));
-		$this->assertFalse($this->utf8->is_ascii('тест'));
+		$utf8 = new CI_Utf8('UTF-8');
+		$this->assertTrue($utf8->is_ascii('foo bar'));
+		$this->assertFalse($utf8->is_ascii('тест'));
 	}
 
 	// --------------------------------------------------------------------
@@ -51,21 +48,22 @@ class Utf8_test extends CI_TestCase {
 	 */
 	public function test_clean_string()
 	{
-		$this->assertEquals('foo bar', $this->utf8->clean_string('foo bar'));
+		$utf8 = new CI_Utf8('UTF-8');
+		$this->assertEquals('foo bar', $utf8->clean_string('foo bar'));
 
 		$illegal_utf8 = "\xc0тест";
 		if (MB_ENABLED)
 		{
-			$this->assertEquals('тест', $this->utf8->clean_string($illegal_utf8));
+			$this->assertEquals('тест', $utf8->clean_string($illegal_utf8));
 		}
 		elseif (ICONV_ENABLED)
 		{
 			// This is a known issue, iconv doesn't always work with //IGNORE
-			$this->assertTrue(in_array($this->utf8->clean_string($illegal_utf8), array('тест', ''), TRUE));
+			$this->assertTrue(in_array($utf8->clean_string($illegal_utf8), array('тест', ''), TRUE));
 		}
 		else
 		{
-			$this->assertEquals($illegal_utf8, $this->utf8->clean_string($illegal_utf8));
+			$this->assertEquals($illegal_utf8, $utf8->clean_string($illegal_utf8));
 		}
 	}
 
@@ -78,14 +76,15 @@ class Utf8_test extends CI_TestCase {
 	 */
 	public function test_convert_to_utf8()
 	{
+		$utf8 = new CI_Utf8('UTF-8');
 		if (MB_ENABLED OR ICONV_ENABLED)
 		{
-			$this->assertEquals('тест', $this->utf8->convert_to_utf8('����', 'WINDOWS-1251'));
+			$this->assertEquals('тест', $utf8->convert_to_utf8('����', 'WINDOWS-1251'));
 		}
 		else
 		{
-			$this->assertFalse($this->utf8->convert_to_utf8('����', 'WINDOWS-1251'));
+			$this->assertFalse($utf8->convert_to_utf8('����', 'WINDOWS-1251'));
 		}
 	}
 
-}
\ No newline at end of file
+}