Merge remote-tracking branch 'upstream/develop' into new_date

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index a414f0ace..874230feb 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -18,13 +18,14 @@ class Lang_test extends CI_TestCase {
 	public function test_load()
 	{
 		$this->assertTrue($this->lang->load('profiler', 'english'));
+		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}
-	
-	// --------------------------------------------------------------------
 
-	public function test_line()
+	// --------------------------------------------------------------------
+	
+	public function test_load_with_unspecified_language()
 	{
-		$this->assertTrue($this->lang->load('profiler', 'english'));
+		$this->assertTrue($this->lang->load('profiler'));
 		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}