1 files changed, 59 insertions, 73 deletions

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 43008651e..fdea962b7 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -1,35 +1,35 @@
 <?php
 
 class Loader_test extends CI_TestCase {
-	
+
 	private $ci_obj;
-	
+
 	public function set_up()
 	{
 		// Instantiate a new loader
 		$this->load = new Mock_Core_Loader();
-		
+
 		// mock up a ci instance
-		$this->ci_obj = new StdClass;
-		
+		$this->ci_obj = new stdClass;
+
 		// Fix get_instance()
 		$this->ci_instance($this->ci_obj);
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	public function test_library()
 	{
 		$this->_setup_config_mock();
-		
+
 		// Test loading as an array.
 		$this->assertNull($this->load->library(array('table')));
 		$this->assertTrue(class_exists('CI_Table'), 'Table class exists');
 		$this->assertAttributeInstanceOf('CI_Table', 'table', $this->ci_obj);
-		
+
 		// Test no lib given
 		$this->assertEquals(FALSE, $this->load->library());
-		
+
 		// Test a string given to params
 		$this->assertEquals(NULL, $this->load->library('table', ' '));
 	}
@@ -39,20 +39,18 @@ class Loader_test extends CI_TestCase {
 	public function test_load_library_in_application_dir()
 	{
 		$this->_setup_config_mock();
-		
+
 		$content = '<?php class Super_test_library {} ';
-		
-		$model = vfsStream::newFile('Super_test_library.php')->withContent($content)
-														->at($this->load->libs_dir);
-		
+
+		$model = vfsStream::newFile('Super_test_library.php')->withContent($content)->at($this->load->libs_dir);
 		$this->assertNull($this->load->library('super_test_library'));
-		
+
 		// Was the model class instantiated.
-		$this->assertTrue(class_exists('Super_test_library'));		
+		$this->assertTrue(class_exists('Super_test_library'));
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	private function _setup_config_mock()
 	{
 		// Mock up a config object until we
@@ -61,7 +59,7 @@ class Loader_test extends CI_TestCase {
 		$config->expects($this->any())
 			   ->method('load')
 			   ->will($this->returnValue(TRUE));
-		
+
 		// Add the mock to our stdClass
 		$this->ci_instance_var('config', $config);
 	}
@@ -73,64 +71,62 @@ class Loader_test extends CI_TestCase {
 		$this->setExpectedException(
 			'RuntimeException',
 			'CI Error: Unable to locate the model you have specified: ci_test_nonexistent_model.php'
-			);
-			
+		);
+
 		$this->load->model('ci_test_nonexistent_model.php');
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * @coverts CI_Loader::model
 	 */
 	public function test_models()
 	{
 		$this->ci_set_core_class('model', 'CI_Model');
-		
+
 		$content = '<?php class Unit_test_model extends CI_Model {} ';
-		
-		$model = vfsStream::newFile('unit_test_model.php')->withContent($content)
-														->at($this->load->models_dir);
-		
+
+		$model = vfsStream::newFile('unit_test_model.php')->withContent($content)->at($this->load->models_dir);
+
 		$this->assertNull($this->load->model('unit_test_model'));
-		
+
 		// Was the model class instantiated.
 		$this->assertTrue(class_exists('Unit_test_model'));
-		
+
 		// Test no model given
-		$this->assertNull($this->load->model(''));	
+		$this->assertNull($this->load->model(''));
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	// public function testDatabase()
 	// {
 	// 	$this->assertEquals(NULL, $this->load->database());
-	// 	$this->assertEquals(NULL, $this->load->dbutil());		
+	// 	$this->assertEquals(NULL, $this->load->dbutil());
 	// }
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * @coverts CI_Loader::view
 	 */
 	public function test_load_view()
 	{
 		$this->ci_set_core_class('output', 'CI_Output');
-		
+
 		$content = 'This is my test page.  <?php echo $hello; ?>';
-		$view = vfsStream::newFile('unit_test_view.php')->withContent($content)
-														->at($this->load->views_dir);
-		
+		$view = vfsStream::newFile('unit_test_view.php')->withContent($content)->at($this->load->views_dir);
+
 		// Use the optional return parameter in this test, so the view is not
 		// run through the output class.
 		$this->assertEquals('This is my test page.  World!',
 		$this->load->view('unit_test_view', array('hello' => "World!"), TRUE));
-		
+
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * @coverts CI_Loader::view
 	 */
@@ -139,8 +135,8 @@ class Loader_test extends CI_TestCase {
 		$this->setExpectedException(
 			'RuntimeException',
 			'CI Error: Unable to load the requested file: ci_test_nonexistent_view.php'
-			);
-			
+		);
+
 		$this->load->view('ci_test_nonexistent_view', array('foo' => 'bar'));
 	}
 
@@ -149,87 +145,77 @@ class Loader_test extends CI_TestCase {
 	public function test_file()
 	{
 		$content = 'Here is a test file, which we will load now.';
-		$file = vfsStream::newFile('ci_test_mock_file.php')->withContent($content)
-														   ->at($this->load->views_dir);
-		
+		$file = vfsStream::newFile('ci_test_mock_file.php')->withContent($content)->at($this->load->views_dir);
+
 		// Just like load->view(), take the output class out of the mix here.
-		$load = $this->load->file(vfsStream::url('application').'/views/ci_test_mock_file.php', 
-								TRUE);
-		
+		$load = $this->load->file(vfsStream::url('application').'/views/ci_test_mock_file.php', TRUE);
+
 		$this->assertEquals($content, $load);
-		
+
 		$this->setExpectedException(
 			'RuntimeException',
 			'CI Error: Unable to load the requested file: ci_test_file_not_exists'
-			);
-		
+		);
+
 		$this->load->file('ci_test_file_not_exists', TRUE);
-		
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	public function test_vars()
 	{
-		$vars = array(
-			'foo'	=> 'bar'
-		);
-		
-		$this->assertNull($this->load->vars($vars));
+		$this->assertNull($this->load->vars(array('foo' => 'bar')));
 		$this->assertNull($this->load->vars('foo', 'bar'));
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	public function test_helper()
 	{
 		$this->assertEquals(NULL, $this->load->helper('array'));
-		
+
 		$this->setExpectedException(
 			'RuntimeException',
 			'CI Error: Unable to load the requested file: helpers/bad_helper.php'
-			);
-		
+		);
+
 		$this->load->helper('bad');
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	public function test_loading_multiple_helpers()
 	{
 		$this->assertEquals(NULL, $this->load->helpers(array('file', 'array', 'string')));
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	// public function testLanguage()
 	// {
 	// 	$this->assertEquals(NULL, $this->load->language('test'));
-	// }	
+	// }
 
 	// --------------------------------------------------------------------
 
 	public function test_load_config()
 	{
 		$this->_setup_config_mock();
-		
 		$this->assertNull($this->load->config('config', FALSE));
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	public function test_load_bad_config()
 	{
 		$this->_setup_config_mock();
-		
+
 		$this->setExpectedException(
 			'RuntimeException',
 			'CI Error: The configuration file foobar.php does not exist.'
-			);
-		
+		);
+
 		$this->load->config('foobar', FALSE);
 	}
 
-	// --------------------------------------------------------------------
-	
-}
+}
\ No newline at end of file