From 5f8fa02b9e386dfc474d8a6f2302e32674f2b55a Mon Sep 17 00:00:00 2001 From: Master Yoda Date: Sun, 20 Sep 2015 09:43:12 -0700 Subject: Revert "The Lang unit testing claimed to be testing for non-alpha idioms, but wasn't. Setup a new test method to isolate this. Signed-off-by:Master Yoda " This reverts commit 1adf834231dae85e55c1bf2d19f3f4b28324f356. --- tests/codeigniter/core/Lang_test.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'tests/codeigniter/core/Lang_test.php') diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php index 8262d3e75..f04f6eab9 100644 --- a/tests/codeigniter/core/Lang_test.php +++ b/tests/codeigniter/core/Lang_test.php @@ -4,8 +4,7 @@ class Lang_test extends CI_TestCase { protected $lang; - public function set_up() - { + public function set_up() { $loader_cls = $this->ci_core_class('load'); $this->ci_instance_var('load', new $loader_cls); $cls = $this->ci_core_class('lang'); @@ -14,8 +13,7 @@ class Lang_test extends CI_TestCase { // -------------------------------------------------------------------- - public function test_load() - { + public function test_load() { // Regular usage $this->ci_vfs_clone('system/language/english/profiler_lang.php'); $this->assertTrue($this->lang->load('profiler', 'english')); @@ -43,8 +41,7 @@ class Lang_test extends CI_TestCase { // -------------------------------------------------------------------- - public function test_non_alpha_idiom() - { + public function test_non_alpha_idiom() { // Non-alpha idiom (should act the same as unspecified language) // test with existing file $this->ci_vfs_clone('system/language/english/number_lang.php'); @@ -60,8 +57,7 @@ class Lang_test extends CI_TestCase { // -------------------------------------------------------------------- - public function test_multiple_file_load() - { + public function test_multiple_file_load() { // Multiple files $this->ci_vfs_clone('system/language/english/profiler_lang.php'); $files = array( @@ -76,8 +72,7 @@ class Lang_test extends CI_TestCase { // -------------------------------------------------------------------- - public function test_alternative_path_load() - { + public function test_alternative_path_load() { // Alternative Path $this->ci_vfs_clone('system/language/english/profiler_lang.php'); $this->assertTrue($this->lang->load('profiler', 'english', FALSE, TRUE, 'vfs://system/')); @@ -88,8 +83,7 @@ class Lang_test extends CI_TestCase { /** * @depends test_load */ - public function test_line() - { + public function test_line() { $this->ci_vfs_clone('system/language/english/profiler_lang.php'); $this->lang->load('profiler', 'english'); $this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string')); -- cgit v1.2.3-24-g4f1b