diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
| commit | 45a8afaabc6d09ad59bbb3c89a6cdfe8cbc3312c (patch) | |
| tree | 7ca4207099f9225b5ef74b31f48627a282e7fdf2 /tests/codeigniter/core | |
| parent | cd94dd7e1d8969658810ccc4158a75d2936d0a44 (diff) | |
| parent | 934d6d9797f4dadd4e4d05b12bc4d7309fedb6c3 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'tests/codeigniter/core')
| -rw-r--r-- | tests/codeigniter/core/Config_test.php | 13 | ||||
| -rw-r--r-- | tests/codeigniter/core/Lang_test.php | 7 | ||||
| -rw-r--r-- | tests/codeigniter/core/Output_test.php | 33 | ||||
| -rw-r--r-- | tests/codeigniter/core/URI_test.php | 23 | ||||
| -rw-r--r-- | tests/codeigniter/core/compat/standard_test.php | 6 |
5 files changed, 37 insertions, 45 deletions
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php index 8e312e361..f125fc6e9 100644 --- a/tests/codeigniter/core/Config_test.php +++ b/tests/codeigniter/core/Config_test.php @@ -205,13 +205,18 @@ class Config_test extends CI_TestCase { 'number' => 42, 'letter' => 'Z' ); + $pkg_dir = 'package'; - $this->ci_vfs_create($file.'.php', '<?php $config = '.var_export($cfg2, TRUE).';', $this->ci_app_root, - array($pkg_dir, 'config')); - $this->config->_config_paths[] = $this->ci_vfs_path($pkg_dir.'/', APPPATH); + $this->ci_vfs_create( + $file.'.php', + '<?php $config = '.var_export($cfg2, TRUE).';', + $this->ci_app_root, + array($pkg_dir, 'config') + ); + array_unshift($this->config->_config_paths, $this->ci_vfs_path($pkg_dir.'/', APPPATH)); $this->assertTrue($this->config->load($file, TRUE)); $this->assertEquals(array_merge($cfg, $cfg2), $this->config->item($file)); - array_pop($this->config->_config_paths); + array_shift($this->config->_config_paths); // Test graceful fail of invalid file $file = 'badfile'; diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php index d3c7ee1e4..87a71c885 100644 --- a/tests/codeigniter/core/Lang_test.php +++ b/tests/codeigniter/core/Lang_test.php @@ -29,6 +29,11 @@ class Lang_test extends CI_TestCase { $this->assertTrue($this->lang->load('date')); $this->assertEquals('Year', $this->lang->language['date_year']); + // A language other than english + $this->ci_vfs_clone('system/language/english/email_lang.php', 'system/language/german/'); + $this->assertTrue($this->lang->load('email', 'german')); + $this->assertEquals('german', $this->lang->is_loaded['email_lang.php'] ); + // Non-alpha idiom (should act the same as unspecified language) $this->ci_vfs_clone('system/language/english/number_lang.php'); $this->assertTrue($this->lang->load('number')); @@ -56,4 +61,4 @@ class Lang_test extends CI_TestCase { $this->assertFalse($this->lang->line(NULL)); } -}
\ No newline at end of file +} diff --git a/tests/codeigniter/core/Output_test.php b/tests/codeigniter/core/Output_test.php index 0eeb93f7b..887c077d7 100644 --- a/tests/codeigniter/core/Output_test.php +++ b/tests/codeigniter/core/Output_test.php @@ -3,19 +3,20 @@ class Output_test extends CI_TestCase { public $output; - protected $_output_data = <<<HTML -<html> - <head> - <title>Basic HTML</title> - </head> - <body> - Test - </body> -</html> -HTML; + protected $_output_data = ''; public function set_up() { + $this->_output_data =<<<HTML + <html> + <head> + <title>Basic HTML</title> + </head> + <body> + Test + </body> + </html> +HTML; $this->ci_set_config('charset', 'UTF-8'); $output = $this->ci_core_class('output'); $this->output = new $output(); @@ -38,16 +39,6 @@ HTML; // -------------------------------------------------------------------- - public function test_minify() - { - $this->assertEquals( - str_replace(array("\t", "\n"), '', $this->_output_data), - $this->output->minify($this->_output_data) - ); - } - - // -------------------------------------------------------------------- - public function test_get_content_type() { $this->assertEquals('text/html', $this->output->get_content_type()); @@ -69,4 +60,4 @@ HTML; ); } -}
\ No newline at end of file +} diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index b05a385d6..50663d54a 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -119,26 +119,12 @@ class URI_test extends CI_TestCase { */ // -------------------------------------------------------------------- - public function test_filter_uri() + public function test_filter_uri_passing() { $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-'); - $str_in = 'abc01239~%.:_-'; - $str = $this->uri->filter_uri($str_in); - - $this->assertEquals($str, $str_in); - } - - // -------------------------------------------------------------------- - - public function test_filter_uri_escaping() - { - // ensure escaping even if dodgey characters are permitted - $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-()$'); - - $str = $this->uri->filter_uri('$destroy_app(foo)'); - - $this->assertEquals($str, '$destroy_app(foo)'); + $str = 'abc01239~%.:_-'; + $this->uri->filter_uri($str); } // -------------------------------------------------------------------- @@ -149,7 +135,8 @@ class URI_test extends CI_TestCase { $this->uri->config->set_item('enable_query_strings', FALSE); $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-'); - $this->uri->filter_uri('$this()'); + $segment = '$this()'; // filter_uri() accepts by reference + $this->uri->filter_uri($segment); } // -------------------------------------------------------------------- diff --git a/tests/codeigniter/core/compat/standard_test.php b/tests/codeigniter/core/compat/standard_test.php index a3a6d9552..4077a5c7c 100644 --- a/tests/codeigniter/core/compat/standard_test.php +++ b/tests/codeigniter/core/compat/standard_test.php @@ -449,7 +449,6 @@ class standard_test extends CI_TestCase { return $this->markTestSkipped('quoted_printable_encode() is already available on PHP 5.3'); } - // These are actually imap_8bit() tests: $this->assertEquals("String with CRLF at end=20\r\n", quoted_printable_encode("String with CRLF at end \r\n")); // ext/imap/tests/imap_8bit_basic.phpt says for this line: @@ -459,6 +458,11 @@ class standard_test extends CI_TestCase { $this->assertEquals("String with tab at end =09", quoted_printable_encode("String with tab at end \t")); $this->assertEquals("=00=01=02=03=04=FE=FF=0A=0D", quoted_printable_encode("\x00\x01\x02\x03\x04\xfe\xff\x0a\x0d")); + if (function_exists('imap_8bit')) + { + return $this->markTestIncomplete('imap_8bit() exists and is called as an alias for quoted_printable_encode()'); + } + // And these are from ext/standard/tests/strings/quoted_printable_encode_002.phpt: $this->assertEquals( "=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=00=\r\n" |