diff options
author | Hamza Bhatti <tiyowan@gmail.com> | 2012-03-10 10:07:05 +0100 |
---|---|---|
committer | Hamza Bhatti <tiyowan@gmail.com> | 2012-03-10 10:07:05 +0100 |
commit | 7729faa553c0ec93a13533003a53dc66078467a8 (patch) | |
tree | 2e61d04a3fa0d1648d17fd6e00f3bcfe75325571 /tests/codeigniter | |
parent | e39728c55d3745ff60742d7dd1c5114ec690d1db (diff) |
Fix test errors in Loader_test.php and URI_test.php
Change exceptions from Exception to RuntimeException since PHPUnit 3.6
doesn't like you to expect generic exceptions. The error it gives is:
InvalidArgumentException: You must not expect the generic exception class
travis-ci.org/#!/tiyowan/CodeIgniter/builds/832518
This issue addressed by using exceptions that are more specific.
Diffstat (limited to 'tests/codeigniter')
-rw-r--r-- | tests/codeigniter/core/Loader_test.php | 12 | ||||
-rw-r--r-- | tests/codeigniter/core/URI_test.php | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php index 9ba870b7d..b86fd3477 100644 --- a/tests/codeigniter/core/Loader_test.php +++ b/tests/codeigniter/core/Loader_test.php @@ -104,7 +104,7 @@ class Loader_test extends CI_TestCase { public function test_non_existent_model() { $this->setExpectedException( - 'Exception', + 'RuntimeException', 'CI Error: Unable to locate the model you have specified: ci_test_nonexistent_model.php' ); @@ -170,7 +170,7 @@ class Loader_test extends CI_TestCase { public function test_non_existent_view() { $this->setExpectedException( - 'Exception', + 'RuntimeException', 'CI Error: Unable to load the requested file: ci_test_nonexistent_view.php' ); @@ -192,7 +192,7 @@ class Loader_test extends CI_TestCase { $this->assertEquals($content, $load); $this->setExpectedException( - 'Exception', + 'RuntimeException', 'CI Error: Unable to load the requested file: ci_test_file_not_exists' ); @@ -219,7 +219,7 @@ class Loader_test extends CI_TestCase { $this->assertEquals(NULL, $this->load->helper('array')); $this->setExpectedException( - 'Exception', + 'RuntimeException', 'CI Error: Unable to load the requested file: helpers/bad_helper.php' ); @@ -256,7 +256,7 @@ class Loader_test extends CI_TestCase { $this->_setup_config_mock(); $this->setExpectedException( - 'Exception', + 'RuntimeException', 'CI Error: The configuration file foobar.php does not exist.' ); @@ -268,4 +268,4 @@ class Loader_test extends CI_TestCase { -}
\ No newline at end of file +} diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index 87d921b11..40252aa14 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -189,7 +189,7 @@ class URI_test extends CI_TestCase { public function test_filter_uri_throws_error() { - $this->setExpectedException('Exception'); + $this->setExpectedException('RuntimeException'); $this->uri->config->set_item('enable_query_strings', FALSE); $this->uri->config->set_item('permitted_uri_chars', 'a-z 0-9~%.:_\-'); @@ -341,4 +341,4 @@ class URI_test extends CI_TestCase { // END URI_test Class /* End of file URI_test.php */ -/* Location: ./tests/core/URI_test.php */
\ No newline at end of file +/* Location: ./tests/core/URI_test.php */ |