Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/codeigniter/core/Utf8_test.php b/tests/codeigniter/core/Utf8_test.php
new file mode 100644
index 000000000..caa7b6986
--- /dev/null
+++ b/tests/codeigniter/core/Utf8_test.php
@@ -0,0 +1,20 @@
+<?php
+
+class Utf8_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->utf8 = new Mock_Core_Utf8();
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_convert_to_utf8()
+	{
+		$this->assertEquals(
+			$this->utf8->convert_to_utf8('����', 'WINDOWS-1251'),
+			'тест'
+		);
+	}
+
+}
\ No newline at end of file