From 06c22871943bee956522b893e8acbf206524a229 Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux <j.jaffeux@gmail.com>
Date: Tue, 5 Jun 2012 13:36:13 +0200
Subject: Add test when loading language file and not using the second
 parameter (language)

---
 tests/codeigniter/core/Lang_test.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index a414f0ace..92c71322e 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -18,13 +18,21 @@ class Lang_test extends CI_TestCase {
 	public function test_load()
 	{
 		$this->assertTrue($this->lang->load('profiler', 'english'));
+		$this->_test_line();
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function test_load_with_unspecified_language()
+	{
+		$this->assertTrue($this->lang->load('profiler'));
+		$this->_test_line();
 	}
 	
 	// --------------------------------------------------------------------
 
-	public function test_line()
+	private function _test_line()
 	{
-		$this->assertTrue($this->lang->load('profiler', 'english'));
 		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}
 	
-- 
cgit v1.2.3-24-g4f1b


From d348cb0fd6f255074bc410f169072e2f613074fe Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux <j.jaffeux@gmail.com>
Date: Tue, 5 Jun 2012 15:32:55 +0200
Subject: remove _test_line()

---
 tests/codeigniter/core/Lang_test.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index 92c71322e..874230feb 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -18,7 +18,7 @@ class Lang_test extends CI_TestCase {
 	public function test_load()
 	{
 		$this->assertTrue($this->lang->load('profiler', 'english'));
-		$this->_test_line();
+		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}
 
 	// --------------------------------------------------------------------
@@ -26,13 +26,6 @@ class Lang_test extends CI_TestCase {
 	public function test_load_with_unspecified_language()
 	{
 		$this->assertTrue($this->lang->load('profiler'));
-		$this->_test_line();
-	}
-	
-	// --------------------------------------------------------------------
-
-	private function _test_line()
-	{
 		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}
 	
-- 
cgit v1.2.3-24-g4f1b