From 69c97a71476e4eaa6c629022fcd4ec7f36d4ec0d Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Wed, 20 Apr 2011 21:44:54 -0400
Subject: Adding early bootstrap ideas for core test suite

---
 tests/codeigniter/Setup_test.php                |  13 +++
 tests/codeigniter/core/Config_test.php          | 107 ++++++++++++++++++
 tests/codeigniter/core/Lang_test.php            |  31 +++++
 tests/codeigniter/core/Loader_test.php          | 144 ++++++++++++++++++++++++
 tests/codeigniter/helpers/Array_helper_test.php |  49 ++++++++
 tests/codeigniter/libraries/Parser_test.php     | 125 ++++++++++++++++++++
 6 files changed, 469 insertions(+)
 create mode 100644 tests/codeigniter/Setup_test.php
 create mode 100644 tests/codeigniter/core/Config_test.php
 create mode 100644 tests/codeigniter/core/Lang_test.php
 create mode 100644 tests/codeigniter/core/Loader_test.php
 create mode 100644 tests/codeigniter/helpers/Array_helper_test.php
 create mode 100644 tests/codeigniter/libraries/Parser_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/Setup_test.php b/tests/codeigniter/Setup_test.php
new file mode 100644
index 000000000..e088b51d3
--- /dev/null
+++ b/tests/codeigniter/Setup_test.php
@@ -0,0 +1,13 @@
+<?php
+
+class Setup_test extends PHPUnit_Framework_TestCase {
+	
+	function testNonsense()
+	{
+		$this->markTestIncomplete('not implemented');
+		// ensure that our bootstrapped test environment
+		// is a good representation of an isolated CI install
+		//die('here');
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
new file mode 100644
index 000000000..628fc630b
--- /dev/null
+++ b/tests/codeigniter/core/Config_test.php
@@ -0,0 +1,107 @@
+<?php
+
+class Config_test extends CodeIgniterTestCase {
+
+	public function setUp()
+	{
+		$cls =& $this->ci_core_class('cfg');
+		
+		$stub = $this->getMock($cls, NULL, array(), '', FALSE);
+		
+	 	//I would prefer this, but it currently
+		// does not work as when you try to pass
+		// null to setMethods it fails on an internal
+		// function call that expects an array =(
+		/*
+		$stub = $this->getMockBuilder($cls)
+					 ->disableOriginalConstructor()
+					 ->setMethods(null)
+					 ->getMock();
+		*/
+
+		
+		// set predictable config values
+		$stub->config = array(
+			'index_page'		=> 'index.php',
+			'base_url'			=> 'http://example.com/',
+			'subclass_prefix'	=> 'MY_'
+		);
+		
+		$this->config = $stub;
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function testItem()
+	{
+		$this->assertEquals('http://example.com/', $this->config->item('base_url'));
+
+		// Bad Config value
+		$this->assertFalse($this->config->item('no_good_item'));
+		
+		// Index
+		$this->assertFalse($this->config->item('no_good_item', 'bad_index'));
+		$this->assertFalse($this->config->item('no_good_item', 'default'));
+	}
+	
+	// --------------------------------------------------------------------
+	
+	public function testSetItem()
+	{
+		$this->assertFalse($this->config->item('not_yet_set'));
+		
+		$this->config->set_item('not_yet_set', 'is set');
+		
+		$this->assertEquals('is set', $this->config->item('not_yet_set'));
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testSlashItem()
+	{
+		// Bad Config value
+		$this->assertFalse($this->config->slash_item('no_good_item'));
+		
+		$this->assertEquals('http://example.com/', $this->config->slash_item('base_url'));
+
+		$this->assertEquals('MY_/', $this->config->slash_item('subclass_prefix'));
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testSiteUrl()
+	{
+		$this->assertEquals('http://example.com/index.php', $this->config->site_url());
+		
+		$base_url = $this->config->item('base_url');
+		
+		$this->config->set_item('base_url', '');
+		
+		$q_string = $this->config->item('enable_query_strings');
+		
+		$this->config->set_item('enable_query_strings', FALSE);
+
+		$this->assertEquals('/index.php/test', $this->config->site_url('test'));
+		$this->assertEquals('/index.php/test/1', $this->config->site_url(array('test', '1')));
+		
+		$this->config->set_item('enable_query_strings', TRUE);
+
+		$this->assertEquals('/index.php?test', $this->config->site_url('test'));
+		$this->assertEquals('/index.php?0=test&1=1', $this->config->site_url(array('test', '1')));
+		
+		$this->config->set_item('base_url', $base_url);
+
+		$this->assertEquals('http://example.com/index.php?test', $this->config->site_url('test'));
+		
+		// back to home base
+		$this->config->set_item('enable_query_strings', $q_string);				
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testSystemUrl()
+	{
+		$this->assertEquals('http://example.com/system/', $this->config->system_url());
+	}
+
+}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
new file mode 100644
index 000000000..82e279a52
--- /dev/null
+++ b/tests/codeigniter/core/Lang_test.php
@@ -0,0 +1,31 @@
+<?php
+
+class Lang_test extends CodeIgniterTestCase {
+	
+	protected $lang;
+	
+	public function setUp()
+	{
+		$cls = $this->ci_core_class('lang');
+		$this->lang = new $cls;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	public function testLoad()
+	{
+		// get_config needs work
+		$this->markTestIncomplete('get_config needs work');
+		//$this->assertTrue($this->lang->load('profiler'));
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function testLine()
+	{
+		$this->markTestIncomplete('get_config needs work');
+		
+		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
new file mode 100644
index 000000000..fd9c63216
--- /dev/null
+++ b/tests/codeigniter/core/Loader_test.php
@@ -0,0 +1,144 @@
+<?php
+
+class Loader_test extends CodeIgniterTestCase {
+	
+	private $ci_obj;
+	
+	public function setUp()
+	{
+		// Instantiate a new loader
+		$cls = $this->ci_core_class('load');
+		$this->_loader = new $cls;
+		
+		// mock up a ci instance
+		$this->ci_obj = new StdClass;
+		
+		// Fix get_instance()
+		CodeIgniterTestCase::$test_instance =& $this;
+		$this->ci_instance($this->ci_obj);
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testLibrary()
+	{
+		// Mock up a config object until we
+		// figure out how to test the library configs
+		$config = $this->getMock('CI_Config', NULL, array(), '', FALSE);
+		$config->expects($this->any())
+			   ->method('load')
+			   ->will($this->returnValue(TRUE));
+		
+		// Add the mock to our stdClass
+		$this->ci_set_instance_var('config', $config);
+		
+		// Test loading as an array.
+		$this->assertEquals(NULL, $this->_loader->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->_loader->library());
+		
+		// Test a string given to params
+		$this->assertEquals(NULL, $this->_loader->library('table', ' '));
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	public function testModels()
+	{
+		// Test loading as an array.
+		$this->assertEquals(NULL, $this->_loader->model(array('foobar')));
+		
+		// Test no model given
+		$this->assertEquals(FALSE, $this->_loader->model(''));
+		
+		// Test a string given to params
+		$this->assertEquals(NULL, $this->_loader->model('foobar', ' '));		
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testDatabase()
+	{
+		$this->assertEquals(NULL, $this->_loader->database());
+		$this->assertEquals(NULL, $this->_loader->dbutil());		
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testView()
+	{
+		// I'm not entirely sure this is the proper way to handle this.
+		// So, let's revist it, m'kay?
+		try 
+		{
+			 $this->_loader->view('foo');
+		}
+		catch (Exception $expected)
+		{
+			return;
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testFile()
+	{
+		// I'm not entirely sure this is the proper way to handle this.
+		// So, let's revist it, m'kay?
+		try 
+		{
+			 $this->_loader->file('foo');
+		}
+		catch (Exception $expected)
+		{
+			return;
+		}		
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testVars()
+	{
+		$vars = array(
+			'foo'	=> 'bar'
+		);
+		
+		$this->assertEquals(NULL, $this->_loader->vars($vars));
+		$this->assertEquals(NULL, $this->_loader->vars('foo', 'bar'));
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testHelper()
+	{
+		$this->assertEquals(NULL, $this->_loader->helper('array'));
+		$this->assertEquals(NULL, $this->_loader->helper('bad'));
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function testHelpers()
+	{
+		$this->assertEquals(NULL, $this->_loader->helpers(array('file', 'array', 'string')));
+	}
+	
+	// --------------------------------------------------------------------
+	
+	// public function testLanguage()
+	// {
+	// 	$this->assertEquals(NULL, $this->_loader->language('test'));
+	// }	
+
+	// --------------------------------------------------------------------
+
+	public function testLoadConfig()
+	{
+		$this->assertEquals(NULL, $this->_loader->config('config', FALSE, TRUE));
+	}
+	
+	
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/Array_helper_test.php b/tests/codeigniter/helpers/Array_helper_test.php
new file mode 100644
index 000000000..bbefdb49d
--- /dev/null
+++ b/tests/codeigniter/helpers/Array_helper_test.php
@@ -0,0 +1,49 @@
+<?php
+
+// OLD TEST FORMAT: DO NOT COPY
+
+require_once(BASEPATH.'helpers/array_helper.php');
+
+class Array_helper_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		$this->my_array = array(
+			'foo'		=> 'bar',
+			'sally'		=> 'jim',
+			'maggie'	=> 'bessie',
+			'herb'		=> 'cook'
+		);
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	public function testElementWithExistingItem()
+	{	
+		$this->assertEquals(FALSE, element('testing', $this->my_array));
+		
+		$this->assertEquals('not set', element('testing', $this->my_array, 'not set'));
+		
+		$this->assertEquals('bar', element('foo', $this->my_array));
+	}
+	
+	// ------------------------------------------------------------------------	
+
+	public function testRandomElement()
+	{
+		// Send a string, not an array to random_element
+		$this->assertEquals('my string', random_element('my string'));
+		
+		// Test sending an array
+		$this->assertEquals(TRUE, in_array(random_element($this->my_array), $this->my_array));
+	}
+
+	// ------------------------------------------------------------------------	
+	
+	public function testElements()
+	{
+		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
+		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
+	}
+
+}
\ No newline at end of file
diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
new file mode 100644
index 000000000..a8de108f0
--- /dev/null
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -0,0 +1,125 @@
+<?php
+
+// OLD TEST FORMAT: DO NOT COPY
+
+class Parser_test extends PHPUnit_Framework_TestCase
+{
+	static $cls;
+	protected $parser;
+	
+	public static function setUpBeforeClass()
+	{
+		$CI = get_instance();
+		$CI->load->library('parser');
+		self::$cls = get_class($CI->parser);
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function setUp()
+	{
+		$cls = self::$cls;
+		$this->parser = new $cls;
+	}
+	// --------------------------------------------------------------------
+	
+	public function testSetDelimiters()
+	{
+		// Make sure default delimiters are there
+		$this->assertEquals('{', $this->parser->l_delim);
+		$this->assertEquals('}', $this->parser->r_delim);
+		
+		// Change them to square brackets
+		$this->parser->set_delimiters('[', ']');
+		
+		// Make sure they changed
+		$this->assertEquals('[', $this->parser->l_delim);
+		$this->assertEquals(']', $this->parser->r_delim);
+		
+		// Reset them
+		$this->parser->set_delimiters();
+		
+		// Make sure default delimiters are there
+		$this->assertEquals('{', $this->parser->l_delim);
+		$this->assertEquals('}', $this->parser->r_delim);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	public function testParseSimpleString()
+	{
+		$data = array(
+			'title' => 'Page Title',
+			'body' => 'Lorem ipsum dolor sit amet.'
+		);
+		
+		$template = "{title}\n{body}";
+		
+		$result = implode("\n", $data);
+		
+		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function testParse()
+	{
+		$this->_parse_no_template();
+		$this->_parse_var_pair();
+		$this->_mismatched_var_pair();
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _parse_no_template()
+	{
+		$this->assertFalse($this->parser->parse_string('', '', TRUE));
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _parse_var_pair()
+	{
+		$data = array(
+			'title'		=> 'Super Heroes',
+			'powers'	=> array(
+					array(
+						'invisibility'	=> 'yes',
+						'flying'		=> 'no'),
+			)
+		);
+		
+		$template = "{title}\n{powers}{invisibility}\n{flying}{/powers}";
+		
+		$result = "Super Heroes\nyes\nno";
+		
+		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));	
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _mismatched_var_pair()
+	{
+		$data = array(
+			'title'		=> 'Super Heroes',
+			'powers'	=> array(
+					array(
+						'invisibility'	=> 'yes',
+						'flying'		=> 'no'),
+			)
+		);
+		
+		$template = "{title}\n{powers}{invisibility}\n{flying}";
+		
+		$result = "Super Heroes\n{powers}{invisibility}\n{flying}";
+		
+		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));			
+	}
+
+	// --------------------------------------------------------------------
+
+	// --------------------------------------------------------------------
+
+	// --------------------------------------------------------------------
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 10ba64f9b76a25a77182d72a0a09413ccba12770 Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Thu, 21 Apr 2011 01:00:27 -0400
Subject: Renamed the main test class, fixing test cases.

---
 tests/codeigniter/core/Config_test.php | 26 ++++++--------------------
 tests/codeigniter/core/Lang_test.php   |  2 +-
 tests/codeigniter/core/Loader_test.php |  5 ++---
 3 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
index 628fc630b..b04dd67fa 100644
--- a/tests/codeigniter/core/Config_test.php
+++ b/tests/codeigniter/core/Config_test.php
@@ -1,33 +1,19 @@
 <?php
 
-class Config_test extends CodeIgniterTestCase {
+class Config_test extends CI_TestCase {
 
 	public function setUp()
 	{
 		$cls =& $this->ci_core_class('cfg');
-		
-		$stub = $this->getMock($cls, NULL, array(), '', FALSE);
-		
-	 	//I would prefer this, but it currently
-		// does not work as when you try to pass
-		// null to setMethods it fails on an internal
-		// function call that expects an array =(
-		/*
-		$stub = $this->getMockBuilder($cls)
-					 ->disableOriginalConstructor()
-					 ->setMethods(null)
-					 ->getMock();
-		*/
-
-		
+				
 		// set predictable config values
-		$stub->config = array(
+		$this->ci_set_config(array(
 			'index_page'		=> 'index.php',
 			'base_url'			=> 'http://example.com/',
 			'subclass_prefix'	=> 'MY_'
-		);
-		
-		$this->config = $stub;
+		));
+
+		$this->config = new $cls;	
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index 82e279a52..f65b335b0 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -1,6 +1,6 @@
 <?php
 
-class Lang_test extends CodeIgniterTestCase {
+class Lang_test extends CI_TestCase {
 	
 	protected $lang;
 	
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index fd9c63216..c7085c439 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -1,6 +1,6 @@
 <?php
 
-class Loader_test extends CodeIgniterTestCase {
+class Loader_test extends CI_TestCase {
 	
 	private $ci_obj;
 	
@@ -14,7 +14,6 @@ class Loader_test extends CodeIgniterTestCase {
 		$this->ci_obj = new StdClass;
 		
 		// Fix get_instance()
-		CodeIgniterTestCase::$test_instance =& $this;
 		$this->ci_instance($this->ci_obj);
 	}
 
@@ -30,7 +29,7 @@ class Loader_test extends CodeIgniterTestCase {
 			   ->will($this->returnValue(TRUE));
 		
 		// Add the mock to our stdClass
-		$this->ci_set_instance_var('config', $config);
+		$this->ci_instance_var('config', $config);
 		
 		// Test loading as an array.
 		$this->assertEquals(NULL, $this->_loader->library(array('table')));
-- 
cgit v1.2.3-24-g4f1b


From 8da69039f6d855eb4f88de73702155e6899d2d23 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 11:28:27 -0500
Subject: Working on tests in the loader.  Have generic model mocking working
 with vfsStream.

---
 tests/codeigniter/core/Loader_test.php | 134 ++++++++++++++++++++++-----------
 1 file changed, 90 insertions(+), 44 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index c7085c439..2aa1b8cb9 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -1,5 +1,38 @@
 <?php
 
+require_once 'vfsStream/vfsStream.php';
+require_once BASEPATH.'/core/Loader.php';
+
+class Extended_Loader extends CI_Loader {
+	
+	/**
+	 * Since we use paths to load up models, views, etc, we need the ability to
+	 * mock up the file system so when core tests are run, we aren't mucking
+	 * in the application directory.  this will give finer grained control over
+	 * these tests.  So yeah, while this looks odd, I need to overwrite protected
+	 * class vars in the loader.  So here we go...
+	 *
+	 * @covers CI_Loader::__construct()
+	 */
+	public function __construct()
+	{
+		vfsStreamWrapper::register();
+		vfsStreamWrapper::setRoot(new vfsStreamDirectory('application'));
+		
+		$this->models_dir 	= vfsStream::newDirectory('models')->at(vfsStreamWrapper::getRoot());
+		$this->libs_dir 	= vfsStream::newDirectory('libraries')->at(vfsStreamWrapper::getRoot());
+		$this->helpers_dir 	= vfsStream::newDirectory('helpers')->at(vfsStreamWrapper::getRoot());
+		$this->views_dir 	= vfsStream::newDirectory('views')->at(vfsStreamWrapper::getRoot());
+		
+		$this->_ci_ob_level  		= ob_get_level();
+		$this->_ci_library_paths	= array(vfsStream::url('application').'/', BASEPATH);
+		$this->_ci_helper_paths 	= array(vfsStream::url('application').'/', BASEPATH);
+		$this->_ci_model_paths 		= array(vfsStream::url('application').'/');
+		$this->_ci_view_paths 		= array(vfsStream::url('application').'/views/' => TRUE);
+	}
+}
+
+
 class Loader_test extends CI_TestCase {
 	
 	private $ci_obj;
@@ -7,8 +40,7 @@ class Loader_test extends CI_TestCase {
 	public function setUp()
 	{
 		// Instantiate a new loader
-		$cls = $this->ci_core_class('load');
-		$this->_loader = new $cls;
+		$this->load = new Extended_Loader();
 		
 		// mock up a ci instance
 		$this->ci_obj = new StdClass;
@@ -32,53 +64,67 @@ class Loader_test extends CI_TestCase {
 		$this->ci_instance_var('config', $config);
 		
 		// Test loading as an array.
-		$this->assertEquals(NULL, $this->_loader->library(array('table')));
+		$this->assertEquals(NULL, $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->_loader->library());
+		$this->assertEquals(FALSE, $this->load->library());
 		
 		// Test a string given to params
-		$this->assertEquals(NULL, $this->_loader->library('table', ' '));
+		$this->assertEquals(NULL, $this->load->library('table', ' '));
 	}	
 	
 	// --------------------------------------------------------------------
 	
+	public function testNonExistentModel()
+	{
+		$this->setExpectedException(
+			'Exception',
+			'CI Error: Unable to locate the model you have specified: ci_test_nonexistent_mode.php'
+			);
+			
+		$this->load->model('ci_test_nonexistent_mode.php');
+	}
+
+	// --------------------------------------------------------------------
+	
 	public function testModels()
 	{
-		// Test loading as an array.
-		$this->assertEquals(NULL, $this->_loader->model(array('foobar')));
+		$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);
+		
+		$this->assertNull($this->load->model('unit_test_model'));
 		
 		// Test no model given
-		$this->assertEquals(FALSE, $this->_loader->model(''));
+		$this->assertEquals(FALSE, $this->load->model(''));
 		
 		// Test a string given to params
-		$this->assertEquals(NULL, $this->_loader->model('foobar', ' '));		
+		// $this->assertEquals(NULL, $this->load->model('foobar', ' '));		
 	}
 
 	// --------------------------------------------------------------------
 	
-	public function testDatabase()
-	{
-		$this->assertEquals(NULL, $this->_loader->database());
-		$this->assertEquals(NULL, $this->_loader->dbutil());		
-	}
+	// public function testDatabase()
+	// {
+	// 	$this->assertEquals(NULL, $this->load->database());
+	// 	$this->assertEquals(NULL, $this->load->dbutil());		
+	// }
 
 	// --------------------------------------------------------------------
 	
-	public function testView()
+	public function testNonExistentView()
 	{
-		// I'm not entirely sure this is the proper way to handle this.
-		// So, let's revist it, m'kay?
-		try 
-		{
-			 $this->_loader->view('foo');
-		}
-		catch (Exception $expected)
-		{
-			return;
-		}
+		$this->setExpectedException(
+			'Exception',
+			'CI Error: Unable to load the requested file: ci_test_nonexistent_view.php'
+			);
+			
+		$this->load->view('ci_test_nonexistent_view', array('foo' => 'bar'));
 	}
 
 	// --------------------------------------------------------------------
@@ -86,10 +132,9 @@ class Loader_test extends CI_TestCase {
 	public function testFile()
 	{
 		// I'm not entirely sure this is the proper way to handle this.
-		// So, let's revist it, m'kay?
 		try 
 		{
-			 $this->_loader->file('foo');
+			 $this->load->file('foo');
 		}
 		catch (Exception $expected)
 		{
@@ -105,39 +150,40 @@ class Loader_test extends CI_TestCase {
 			'foo'	=> 'bar'
 		);
 		
-		$this->assertEquals(NULL, $this->_loader->vars($vars));
-		$this->assertEquals(NULL, $this->_loader->vars('foo', 'bar'));
+		$this->assertEquals(NULL, $this->load->vars($vars));
+		$this->assertEquals(NULL, $this->load->vars('foo', 'bar'));
 	}
 
 	// --------------------------------------------------------------------
 	
-	public function testHelper()
-	{
-		$this->assertEquals(NULL, $this->_loader->helper('array'));
-		$this->assertEquals(NULL, $this->_loader->helper('bad'));
-	}
+	// public function testHelper()
+	// {
+	// 	$this->assertEquals(NULL, $this->load->helper('array'));
+	// 	$this->assertEquals(NULL, $this->load->helper('bad'));
+	// }
 	
 	// --------------------------------------------------------------------
 
 	public function testHelpers()
 	{
-		$this->assertEquals(NULL, $this->_loader->helpers(array('file', 'array', 'string')));
+		$this->assertEquals(NULL, $this->load->helpers(array('file', 'array', 'string')));
 	}
 	
 	// --------------------------------------------------------------------
 	
 	// public function testLanguage()
 	// {
-	// 	$this->assertEquals(NULL, $this->_loader->language('test'));
+	// 	$this->assertEquals(NULL, $this->load->language('test'));
 	// }	
 
 	// --------------------------------------------------------------------
 
-	public function testLoadConfig()
-	{
-		$this->assertEquals(NULL, $this->_loader->config('config', FALSE, TRUE));
-	}
-	
-	
-	
-}
\ No newline at end of file
+	// public function testLoadConfig()
+	// {
+	// 	$this->assertEquals(NULL, $this->load->config('config', FALSE, TRUE));
+	// }
+}
+
+
+
+
-- 
cgit v1.2.3-24-g4f1b


From 98357c5865dbec43bcb79fb114469d40cf2f5367 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 11:30:23 -0500
Subject: Swap from assertEquals(FALSE, x) to just assertFalse().  Silly Greg.

---
 tests/codeigniter/core/Loader_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 2aa1b8cb9..83ee68777 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -101,7 +101,7 @@ class Loader_test extends CI_TestCase {
 		$this->assertNull($this->load->model('unit_test_model'));
 		
 		// Test no model given
-		$this->assertEquals(FALSE, $this->load->model(''));
+		$this->assertFalse($this->load->model(''));
 		
 		// Test a string given to params
 		// $this->assertEquals(NULL, $this->load->model('foobar', ' '));		
-- 
cgit v1.2.3-24-g4f1b


From deab6ad864f05367e2c122906f63d24286b731d1 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 11:44:11 -0500
Subject: Buttoning up model loader tests.

---
 tests/codeigniter/core/Loader_test.php | 39 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 83ee68777..d84928eca 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -64,7 +64,7 @@ class Loader_test extends CI_TestCase {
 		$this->ci_instance_var('config', $config);
 		
 		// Test loading as an array.
-		$this->assertEquals(NULL, $this->load->library(array('table')));
+		$this->assertNull($this->load->library(array('table')));
 		$this->assertTrue(class_exists('CI_Table'), 'Table class exists');
 		$this->assertAttributeInstanceOf('CI_Table', 'table', $this->ci_obj);
 		
@@ -100,11 +100,11 @@ class Loader_test extends CI_TestCase {
 		
 		$this->assertNull($this->load->model('unit_test_model'));
 		
-		// Test no model given
-		$this->assertFalse($this->load->model(''));
+		// Was the model class instantiated.
+		$this->assertTrue(class_exists('Unit_test_model'));
 		
-		// Test a string given to params
-		// $this->assertEquals(NULL, $this->load->model('foobar', ' '));		
+		// Test no model given
+		$this->assertNull($this->load->model(''));	
 	}
 
 	// --------------------------------------------------------------------
@@ -132,14 +132,8 @@ class Loader_test extends CI_TestCase {
 	public function testFile()
 	{
 		// I'm not entirely sure this is the proper way to handle this.
-		try 
-		{
-			 $this->load->file('foo');
-		}
-		catch (Exception $expected)
-		{
-			return;
-		}		
+		// $this->load->file('foo');
+		
 	}
 
 	// --------------------------------------------------------------------
@@ -156,15 +150,22 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	// public function testHelper()
-	// {
-	// 	$this->assertEquals(NULL, $this->load->helper('array'));
-	// 	$this->assertEquals(NULL, $this->load->helper('bad'));
-	// }
+	public function testHelper()
+	{
+		$this->assertEquals(NULL, $this->load->helper('array'));
+		
+		$this->setExpectedException(
+			'Exception',
+			'CI Error: Unable to load the requested file: helpers/bad_helper.php'
+			);
+		
+		
+		$this->load->helper('bad');
+	}
 	
 	// --------------------------------------------------------------------
 
-	public function testHelpers()
+	public function testLoadingMultipleHelpers()
 	{
 		$this->assertEquals(NULL, $this->load->helpers(array('file', 'array', 'string')));
 	}
-- 
cgit v1.2.3-24-g4f1b


From 321768d902f68a929a55ef9480c22cb54d40bd34 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 12:09:33 -0500
Subject: Testing view loading.

---
 tests/codeigniter/core/Loader_test.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index d84928eca..782751cd7 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -117,6 +117,23 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
+	public function testLoadView()
+	{
+		$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);
+		
+		// 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));
+		
+	}
+
+	// --------------------------------------------------------------------
+	
 	public function testNonExistentView()
 	{
 		$this->setExpectedException(
-- 
cgit v1.2.3-24-g4f1b


From 6858fb92133afa127eff6f11dd29abf554e1b2d1 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 12:27:23 -0500
Subject: Adding mock testing of libraries in the application directory

---
 tests/codeigniter/core/Loader_test.php | 58 +++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 12 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 782751cd7..1e32c7e0a 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -53,15 +53,7 @@ class Loader_test extends CI_TestCase {
 	
 	public function testLibrary()
 	{
-		// Mock up a config object until we
-		// figure out how to test the library configs
-		$config = $this->getMock('CI_Config', NULL, array(), '', FALSE);
-		$config->expects($this->any())
-			   ->method('load')
-			   ->will($this->returnValue(TRUE));
-		
-		// Add the mock to our stdClass
-		$this->ci_instance_var('config', $config);
+		$this->_setup_config_mock();
 		
 		// Test loading as an array.
 		$this->assertNull($this->load->library(array('table')));
@@ -73,22 +65,58 @@ class Loader_test extends CI_TestCase {
 		
 		// Test a string given to params
 		$this->assertEquals(NULL, $this->load->library('table', ' '));
-	}	
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testLoadLibraryInApplicationDir()
+	{
+		$this->_setup_config_mock();
+		
+		$content = '<?php class Super_test_library {} ';
+		
+		$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'));		
+	}
 	
 	// --------------------------------------------------------------------
 	
+	private function _setup_config_mock()
+	{
+		// Mock up a config object until we
+		// figure out how to test the library configs
+		$config = $this->getMock('CI_Config', NULL, array(), '', FALSE);
+		$config->expects($this->any())
+			   ->method('load')
+			   ->will($this->returnValue(TRUE));
+		
+		// Add the mock to our stdClass
+		$this->ci_instance_var('config', $config);
+	}
+
+	// --------------------------------------------------------------------
+
+	
 	public function testNonExistentModel()
 	{
 		$this->setExpectedException(
 			'Exception',
-			'CI Error: Unable to locate the model you have specified: ci_test_nonexistent_mode.php'
+			'CI Error: Unable to locate the model you have specified: ci_test_nonexistent_model.php'
 			);
 			
-		$this->load->model('ci_test_nonexistent_mode.php');
+		$this->load->model('ci_test_nonexistent_model.php');
 	}
 
 	// --------------------------------------------------------------------
 	
+	/**
+	 * @coverts CI_Loader::model
+	 */
 	public function testModels()
 	{
 		$this->ci_set_core_class('model', 'CI_Model');
@@ -117,6 +145,9 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
+	/**
+	 * @coverts CI_Loader::view
+	 */
 	public function testLoadView()
 	{
 		$this->ci_set_core_class('output', 'CI_Output');
@@ -134,6 +165,9 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
+	/**
+	 * @coverts CI_Loader::view
+	 */
 	public function testNonExistentView()
 	{
 		$this->setExpectedException(
-- 
cgit v1.2.3-24-g4f1b


From 4d2bb09cbb4fc66dc4881c2ffdeee7dbaf0a3a3b Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 12:33:12 -0500
Subject: config CI_Loader tests.

---
 tests/codeigniter/core/Loader_test.php | 36 +++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 1e32c7e0a..55ab9a4e5 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -195,8 +195,8 @@ class Loader_test extends CI_TestCase {
 			'foo'	=> 'bar'
 		);
 		
-		$this->assertEquals(NULL, $this->load->vars($vars));
-		$this->assertEquals(NULL, $this->load->vars('foo', 'bar'));
+		$this->assertNull($this->load->vars($vars));
+		$this->assertNull($this->load->vars('foo', 'bar'));
 	}
 
 	// --------------------------------------------------------------------
@@ -230,12 +230,30 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	// public function testLoadConfig()
-	// {
-	// 	$this->assertEquals(NULL, $this->load->config('config', FALSE, TRUE));
-	// }
-}
-
-
+	public function testLoadConfig()
+	{
+		$this->_setup_config_mock();
+		
+		$this->assertNull($this->load->config('config', FALSE));
+	}
+	
+	// --------------------------------------------------------------------
 
+	public function testLoadBadConfig()
+	{
+		$this->_setup_config_mock();
+		
+		$this->setExpectedException(
+			'Exception',
+			'CI Error: The configuration file foobar.php does not exist.'
+			);
+		
+		$this->load->config('foobar', FALSE);
+	}
 
+	// --------------------------------------------------------------------
+	
+	
+	
+	
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 56106630e172203858d58325dea5d2e81b226f87 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 13:10:19 -0500
Subject: load->file() tests.

---
 tests/codeigniter/core/Loader_test.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 55ab9a4e5..49679e241 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -101,7 +101,6 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	
 	public function testNonExistentModel()
 	{
 		$this->setExpectedException(
@@ -182,8 +181,22 @@ class Loader_test extends CI_TestCase {
 
 	public function testFile()
 	{
-		// I'm not entirely sure this is the proper way to handle this.
-		// $this->load->file('foo');
+		$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);
+		
+		// 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);
+		
+		$this->assertEquals($content, $load);
+		
+		$this->setExpectedException(
+			'Exception',
+			'CI Error: Unable to load the requested file: ci_test_file_not_exists'
+			);
+		
+		$this->load->file('ci_test_file_not_exists', TRUE);
 		
 	}
 
@@ -210,7 +223,6 @@ class Loader_test extends CI_TestCase {
 			'CI Error: Unable to load the requested file: helpers/bad_helper.php'
 			);
 		
-		
 		$this->load->helper('bad');
 	}
 	
-- 
cgit v1.2.3-24-g4f1b


From b567947d38a20960aade96f9179ad6bc21f22646 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:34:31 -0500
Subject: Moving tests/codeigniter/helpers/Array_helper_test.php to be lower
 cased.

Adding html_helper_test.php as well.
---
 tests/codeigniter/helpers/Array_helper_test.php | 49 ------------------
 tests/codeigniter/helpers/array_helper_test.php | 49 ++++++++++++++++++
 tests/codeigniter/helpers/html_helper_test.php  | 67 +++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 49 deletions(-)
 delete mode 100644 tests/codeigniter/helpers/Array_helper_test.php
 create mode 100644 tests/codeigniter/helpers/array_helper_test.php
 create mode 100644 tests/codeigniter/helpers/html_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/Array_helper_test.php b/tests/codeigniter/helpers/Array_helper_test.php
deleted file mode 100644
index bbefdb49d..000000000
--- a/tests/codeigniter/helpers/Array_helper_test.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-// OLD TEST FORMAT: DO NOT COPY
-
-require_once(BASEPATH.'helpers/array_helper.php');
-
-class Array_helper_test extends PHPUnit_Framework_TestCase
-{
-	public function setUp()
-	{
-		$this->my_array = array(
-			'foo'		=> 'bar',
-			'sally'		=> 'jim',
-			'maggie'	=> 'bessie',
-			'herb'		=> 'cook'
-		);
-	}
-	
-	// ------------------------------------------------------------------------
-	
-	public function testElementWithExistingItem()
-	{	
-		$this->assertEquals(FALSE, element('testing', $this->my_array));
-		
-		$this->assertEquals('not set', element('testing', $this->my_array, 'not set'));
-		
-		$this->assertEquals('bar', element('foo', $this->my_array));
-	}
-	
-	// ------------------------------------------------------------------------	
-
-	public function testRandomElement()
-	{
-		// Send a string, not an array to random_element
-		$this->assertEquals('my string', random_element('my string'));
-		
-		// Test sending an array
-		$this->assertEquals(TRUE, in_array(random_element($this->my_array), $this->my_array));
-	}
-
-	// ------------------------------------------------------------------------	
-	
-	public function testElements()
-	{
-		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
-		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
new file mode 100644
index 000000000..bbefdb49d
--- /dev/null
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -0,0 +1,49 @@
+<?php
+
+// OLD TEST FORMAT: DO NOT COPY
+
+require_once(BASEPATH.'helpers/array_helper.php');
+
+class Array_helper_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		$this->my_array = array(
+			'foo'		=> 'bar',
+			'sally'		=> 'jim',
+			'maggie'	=> 'bessie',
+			'herb'		=> 'cook'
+		);
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	public function testElementWithExistingItem()
+	{	
+		$this->assertEquals(FALSE, element('testing', $this->my_array));
+		
+		$this->assertEquals('not set', element('testing', $this->my_array, 'not set'));
+		
+		$this->assertEquals('bar', element('foo', $this->my_array));
+	}
+	
+	// ------------------------------------------------------------------------	
+
+	public function testRandomElement()
+	{
+		// Send a string, not an array to random_element
+		$this->assertEquals('my string', random_element('my string'));
+		
+		// Test sending an array
+		$this->assertEquals(TRUE, in_array(random_element($this->my_array), $this->my_array));
+	}
+
+	// ------------------------------------------------------------------------	
+	
+	public function testElements()
+	{
+		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
+		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
+	}
+
+}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
new file mode 100644
index 000000000..3b7f2b342
--- /dev/null
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -0,0 +1,67 @@
+<?php
+
+require_once(BASEPATH.'helpers/html_helper.php');
+
+class Html_helper_test extends PHPUnit_Framework_TestCase
+{
+	public function testHeading()
+	{
+		$this->assertEquals('<h1>foobar</h1>', heading('foobar'));
+	}
+
+	// ------------------------------------------------------------------------
+	
+	public function testUl()
+	{
+		$expect = <<<EOH
+<ul>
+  <li>foo</li>
+  <li>bar</li>
+</ul>
+
+EOH;
+
+		$expect = ltrim($expect);
+
+		$list = array('foo', 'bar');
+		
+		$this->assertEquals($expect, ul($list));
+
+
+		$expect = <<<EOH
+<ul class="test">
+  <li>foo</li>
+  <li>bar</li>
+</ul>
+
+EOH;
+
+		$expect = ltrim($expect);
+
+		$list = array('foo', 'bar');
+
+		$this->assertEquals($expect, ul($list, ' class="test"'));
+
+		$this->assertEquals($expect, ul($list, array('class' => 'test')));
+	}
+	
+	// ------------------------------------------------------------------------
+
+	public function testNBS()
+	{
+		$this->assertEquals('&nbsp;&nbsp;&nbsp;', nbs(3));
+	}
+
+	// ------------------------------------------------------------------------
+	
+	public function testMeta()
+	{
+		$this->assertEquals("<meta name=\"test\" content=\"foo\" />\n", meta('test', 'foo'));
+		
+		$expect = "<meta name=\"foo\" content=\"\" />\n";
+		
+		$this->assertEquals($expect, meta(array('name' => 'foo')));
+		
+	}
+	
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 9071573bc510f127fa22ddd367b2ff46a60242cc Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:36:26 -0500
Subject: Adding text_helper_test

---
 tests/codeigniter/helpers/text_helper_test.php | 151 +++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 tests/codeigniter/helpers/text_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php
new file mode 100644
index 000000000..aa6660ea0
--- /dev/null
+++ b/tests/codeigniter/helpers/text_helper_test.php
@@ -0,0 +1,151 @@
+<?php
+
+require_once(BASEPATH.'helpers/text_helper.php');
+
+class Text_helper_test extends PHPUnit_Framework_TestCase
+{
+	private $_long_string;
+	
+	public function setUp()
+	{
+		$this->_long_string = 'Once upon a time, a framework had no tests.  It sad.  So some nice people began to write tests.  The more time that went on, the happier it became.  Everyone was happy.';
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	public function testWordLimiter()
+	{
+		$this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
+		$this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
+		$this->assertEquals('', word_limiter('', 4));
+	}
+
+	// ------------------------------------------------------------------------	
+	
+	public function testCharacterLimiter()
+	{
+		$this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
+		$this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
+		$this->assertEquals('Short', character_limiter('Short', 20));
+		$this->assertEquals('Short', character_limiter('Short', 5));
+	}
+
+	// ------------------------------------------------------------------------	
+	
+	public function testAsciiToEntities()
+	{
+		$strs = array(
+			'“‘ “test”'			=> '&#8220;&#8216; &#8220;test&#8221;',
+			'†¥¨ˆøåß∂ƒ©˙∆˚¬'	=> '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, ascii_to_entities($str));
+		}
+	}
+
+	// ------------------------------------------------------------------------	
+
+	public function testEntitiesToAscii()
+	{
+		$strs = array(
+			'&#8220;&#8216; &#8220;test&#8221;' => '“‘ “test”',
+			'&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;' => '†¥¨ˆøåß∂ƒ©˙∆˚¬'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, entities_to_ascii($str));
+		}		
+	}
+
+	// ------------------------------------------------------------------------	
+	
+	public function testCensoredWords()
+	{
+		$censored = array('boob', 'nerd', 'ass', 'fart');
+		
+		$strs = array(
+			'Ted bobbled the ball' 			=> 'Ted bobbled the ball',
+			'Jake is a nerdo'				=> 'Jake is a nerdo',
+			'The borg will assimilate you'	=> 'The borg will assimilate you',
+			'Did Mary Fart?'				=> 'Did Mary $*#?',
+			'Jake is really a boob'			=> 'Jake is really a $*#'
+		);
+		
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, word_censor($str, $censored, '$*#'));
+		}
+		
+		// test censored words being sent as a string
+		$this->assertEquals('test', word_censor('test', 'test'));
+	}
+
+	// ------------------------------------------------------------------------	
+
+	public function testHighlightCode()
+	{
+		$code = '<?php var_dump($this); ?>';
+		$expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
+
+		$this->assertEquals($expect, highlight_code($code));
+	}
+
+	// ------------------------------------------------------------------------	
+
+	public function testHighlightPhrase()
+	{
+		$strs = array(
+			'this is a phrase'			=> '<strong>this is</strong> a phrase',
+			'this is another'			=> '<strong>this is</strong> another',
+			'Gimme a test, Sally'		=> 'Gimme a test, Sally',
+			'Or tell me what this is'	=> 'Or tell me what <strong>this is</strong>',
+			''							=> ''
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, highlight_phrase($str, 'this is'));
+		}
+	}
+
+	// ------------------------------------------------------------------------	
+
+	public function testEllipsizing()
+	{
+		$strs = array(
+			'0'		=> array(
+				'this is my string'				=> '&hellip; my string',
+				"here's another one"			=> '&hellip;nother one',
+				'this one is just a bit longer'	=> '&hellip;bit longer',
+				'short'							=> 'short'
+			),
+			'.5'	=> array(
+				'this is my string'				=> 'this &hellip;tring',
+				"here's another one"			=> "here'&hellip;r one",
+				'this one is just a bit longer'	=> 'this &hellip;onger',
+				'short'							=> 'short'
+			),
+			'1'	=> array(
+				'this is my string'				=> 'this is my&hellip;',
+				"here's another one"			=> "here's ano&hellip;",
+				'this one is just a bit longer'	=> 'this one i&hellip;',
+				'short'							=> 'short'
+			),
+		);
+		
+		foreach ($strs as $pos => $s)
+		{
+			foreach ($s as $str => $expect)
+			{
+				$this->assertEquals($expect, ellipsize($str, 10, $pos));				
+			}
+		}
+	}
+
+	// ------------------------------------------------------------------------	
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 052b01d9398de56e23300242f25d5317afcacf82 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:38:03 -0500
Subject: Adding string helper and inflector helper tests

---
 .../codeigniter/helpers/inflector_helper_test.php  |  91 ++++++++++++++++
 tests/codeigniter/helpers/string_helper_test.php   | 117 +++++++++++++++++++++
 2 files changed, 208 insertions(+)
 create mode 100644 tests/codeigniter/helpers/inflector_helper_test.php
 create mode 100644 tests/codeigniter/helpers/string_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
new file mode 100644
index 000000000..5e2fae9fd
--- /dev/null
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -0,0 +1,91 @@
+<?php
+
+require_once(BASEPATH.'helpers/inflector_helper.php');
+
+class Inflector_helper_test extends PHPUnit_Framework_TestCase {
+	
+	
+	public function testSingular()
+	{
+		$strs = array(
+			'tellies'		=> 'telly',
+			'smellies'		=> 'smelly',
+			'abjectnesses'	=> 'abjectness',
+			'smells'		=> 'smell'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, singular($str));
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	public function testPlural()
+	{
+		$strs = array(
+			'telly'			=> 'tellies',
+			'smelly'		=> 'smellies',
+			'abjectness'	=> 'abjectness',
+			'smell'			=> 'smells',
+			'witch'			=> 'witches'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, plural($str));
+		}		
+	}	
+
+	// --------------------------------------------------------------------
+	
+	public function testCamelize()
+	{
+		$strs = array(
+			'this is the string'	=> 'thisIsTheString',
+			'this is another one'	=> 'thisIsAnotherOne',
+			'i-am-playing-a-trick'	=> 'i-am-playing-a-trick',
+			'what_do_you_think-yo?'	=> 'whatDoYouThink-yo?',
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, camelize($str));
+		}
+	}	
+
+	// --------------------------------------------------------------------
+	
+	public function testUnderscore()
+	{
+		$strs = array(
+			'this is the string'	=> 'this_is_the_string',
+			'this is another one'	=> 'this_is_another_one',
+			'i-am-playing-a-trick'	=> 'i-am-playing-a-trick',
+			'what_do_you_think-yo?'	=> 'what_do_you_think-yo?',
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, underscore($str));
+		}
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testHumanize()
+	{
+		$strs = array(
+			'this_is_the_string'	=> 'This Is The String',
+			'this_is_another_one'	=> 'This Is Another One',
+			'i-am-playing-a-trick'	=> 'I-am-playing-a-trick',
+			'what_do_you_think-yo?'	=> 'What Do You Think-yo?',
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, humanize($str));
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
new file mode 100644
index 000000000..71449f64a
--- /dev/null
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -0,0 +1,117 @@
+<?php
+
+require_once(BASEPATH.'helpers/string_helper.php');
+
+class String_helper_test extends PHPUnit_Framework_TestCase
+{
+	public function testTrimSlashes()
+	{
+		$strs = array(
+			'//Slashes//\/'	=> 'Slashes//\\',
+			'/var/www/html/'	=> 'var/www/html'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, trim_slashes($str));
+		}
+	}
+	
+	// --------------------------------------------------------------------	
+	
+	public function testStripSlashes()
+	{
+		$this->assertEquals("This is totally foo bar'd", trim_slashes("This is totally foo bar'd"));
+	}
+
+	// --------------------------------------------------------------------	
+
+	public function testStripQuotes()
+	{
+		$strs = array(
+			'"me oh my!"'		=> 'me oh my!',
+			"it's a winner!"	=> 'its a winner!',
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, strip_quotes($str));
+		}
+	}
+
+	// --------------------------------------------------------------------	
+	
+	public function testQuotesToEntities()
+	{
+		$strs = array(
+			'"me oh my!"'		=> '&quot;me oh my!&quot;',
+			"it's a winner!"	=> 'it&#39;s a winner!',
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, quotes_to_entities($str));
+		}		
+	}
+
+	// --------------------------------------------------------------------	
+	
+	public function testReduceDoubleSlashes()
+	{
+		$strs = array(
+			'http://codeigniter.com'		=> 'http://codeigniter.com',
+			'//var/www/html/example.com/'	=> '/var/www/html/example.com/',
+			'/var/www/html//index.php'		=> '/var/www/html/index.php'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, reduce_double_slashes($str));
+		}		
+	}
+
+	// --------------------------------------------------------------------	
+	
+	public function testReduceMultiples()
+	{
+		$strs = array(
+			'Fred, Bill,, Joe, Jimmy'	=> 'Fred, Bill, Joe, Jimmy',
+			'Ringo, John, Paul,,'		=> 'Ringo, John, Paul,'
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, reduce_multiples($str));
+		}
+		
+		$strs = array(
+			'Fred, Bill,, Joe, Jimmy'	=> 'Fred, Bill, Joe, Jimmy',
+			'Ringo, John, Paul,,'		=> 'Ringo, John, Paul'
+		);		
+
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
+		}		
+	}
+	
+	// --------------------------------------------------------------------	
+	
+	public function testRepeater()
+	{
+		$strs = array(
+			'a'			=> 'aaaaaaaaaa',
+			'&nbsp;'	=> '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
+			'<br>'		=> '<br><br><br><br><br><br><br><br><br><br>'
+			
+		);
+		
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, repeater($str, 10));
+		}
+	}	
+
+	// --------------------------------------------------------------------	
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From b4d93dbab7253f98613ab10e75e0ed20f06eaf19 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:42:33 -0500
Subject: Updating helper test classes to extend CI_TestCase

---
 tests/codeigniter/helpers/array_helper_test.php     | 2 +-
 tests/codeigniter/helpers/html_helper_test.php      | 2 +-
 tests/codeigniter/helpers/inflector_helper_test.php | 2 +-
 tests/codeigniter/helpers/string_helper_test.php    | 2 +-
 tests/codeigniter/helpers/text_helper_test.php      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index bbefdb49d..fd306cee8 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -4,7 +4,7 @@
 
 require_once(BASEPATH.'helpers/array_helper.php');
 
-class Array_helper_test extends PHPUnit_Framework_TestCase
+class Array_helper_test extends CI_TestCase
 {
 	public function setUp()
 	{
diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 3b7f2b342..8c0e53301 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -2,7 +2,7 @@
 
 require_once(BASEPATH.'helpers/html_helper.php');
 
-class Html_helper_test extends PHPUnit_Framework_TestCase
+class Html_helper_test extends CI_TestCase
 {
 	public function testHeading()
 	{
diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index 5e2fae9fd..e59875e4a 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -2,7 +2,7 @@
 
 require_once(BASEPATH.'helpers/inflector_helper.php');
 
-class Inflector_helper_test extends PHPUnit_Framework_TestCase {
+class Inflector_helper_test extends CI_TestCase {
 	
 	
 	public function testSingular()
diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index 71449f64a..00ba5dec7 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -2,7 +2,7 @@
 
 require_once(BASEPATH.'helpers/string_helper.php');
 
-class String_helper_test extends PHPUnit_Framework_TestCase
+class String_helper_test extends CI_TestCase
 {
 	public function testTrimSlashes()
 	{
diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php
index aa6660ea0..22c834bcf 100644
--- a/tests/codeigniter/helpers/text_helper_test.php
+++ b/tests/codeigniter/helpers/text_helper_test.php
@@ -2,7 +2,7 @@
 
 require_once(BASEPATH.'helpers/text_helper.php');
 
-class Text_helper_test extends PHPUnit_Framework_TestCase
+class Text_helper_test extends CI_TestCase
 {
 	private $_long_string;
 	
-- 
cgit v1.2.3-24-g4f1b


From a7f9b251b03f7fb17251951d3024cb11fc1f881f Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:54:59 -0500
Subject: Parser test.

---
 tests/codeigniter/libraries/Parser_test.php | 42 +++++++++++------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index a8de108f0..3f63bd589 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -2,24 +2,19 @@
 
 // OLD TEST FORMAT: DO NOT COPY
 
-class Parser_test extends PHPUnit_Framework_TestCase
-{
-	static $cls;
-	protected $parser;
-	
-	public static function setUpBeforeClass()
-	{
-		$CI = get_instance();
-		$CI->load->library('parser');
-		self::$cls = get_class($CI->parser);
-	}
+require BASEPATH.'libraries/Parser.php';
 
-	// --------------------------------------------------------------------
+class Parser_test extends CI_TestCase
+{
 	
 	public function setUp()
 	{
-		$cls = self::$cls;
-		$this->parser = new $cls;
+		$obj = new StdClass;
+		$obj->parser = new CI_Parser();
+		
+		$this->ci_instance($obj);
+		
+		$this->parser = $obj->parser;
 	}
 	// --------------------------------------------------------------------
 	
@@ -61,23 +56,23 @@ class Parser_test extends PHPUnit_Framework_TestCase
 	}
 	
 	// --------------------------------------------------------------------
-
+	
 	public function testParse()
 	{
 		$this->_parse_no_template();
 		$this->_parse_var_pair();
 		$this->_mismatched_var_pair();
 	}
-
+	
 	// --------------------------------------------------------------------
-
+	
 	private function _parse_no_template()
 	{
 		$this->assertFalse($this->parser->parse_string('', '', TRUE));
 	}
-
+	
 	// --------------------------------------------------------------------
-
+	
 	private function _parse_var_pair()
 	{
 		$data = array(
@@ -95,9 +90,9 @@ class Parser_test extends PHPUnit_Framework_TestCase
 		
 		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));	
 	}
-
+	
 	// --------------------------------------------------------------------
-
+	
 	private function _mismatched_var_pair()
 	{
 		$data = array(
@@ -117,9 +112,4 @@ class Parser_test extends PHPUnit_Framework_TestCase
 	}
 
 	// --------------------------------------------------------------------
-
-	// --------------------------------------------------------------------
-
-	// --------------------------------------------------------------------
-
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 57fb5180092fef3de867b88a06c4e3ec232b4cd5 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:58:26 -0500
Subject: Cleanup in Parser_test...Adding Table_test Pascal did earlier.

---
 tests/codeigniter/libraries/Parser_test.php |   2 -
 tests/codeigniter/libraries/Table_test.php  | 291 ++++++++++++++++++++++++++++
 2 files changed, 291 insertions(+), 2 deletions(-)
 create mode 100644 tests/codeigniter/libraries/Table_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index 3f63bd589..44269ad2c 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -1,7 +1,5 @@
 <?php
 
-// OLD TEST FORMAT: DO NOT COPY
-
 require BASEPATH.'libraries/Parser.php';
 
 class Parser_test extends CI_TestCase
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
new file mode 100644
index 000000000..ded4c22c1
--- /dev/null
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -0,0 +1,291 @@
+<?php
+
+require BASEPATH.'libraries/Table.php';
+
+class Table_test extends CI_TestCase
+{
+
+	public function setUp()
+	{
+		$obj = new StdClass;
+		$obj->table = new CI_table();
+		
+		$this->ci_instance($obj);
+		
+		$this->table = $obj->table;
+	}
+
+	
+	// Setter Methods
+	// --------------------------------------------------------------------
+	
+	public function testSetTemplate()
+	{
+		$this->assertFalse($this->table->set_template('not an array'));
+		
+		$template = array(
+			'a' => 'b'
+		);
+		
+		$this->table->set_template($template);
+		$this->assertEquals($template, $this->table->template);
+	}
+	
+	public function testSetEmpty()
+	{
+		$this->table->set_empty('nada');
+		$this->assertEquals('nada', $this->table->empty_cells);
+	}
+	
+	public function testSetCaption()
+	{
+		$this->table->set_caption('awesome cap');
+		$this->assertEquals('awesome cap', $this->table->caption);
+	}
+	
+	
+	/*
+	 * @depends testPrepArgs
+	 */
+	public function testSetHeading()
+	{
+		// uses _prep_args internally, so we'll just do a quick
+		// check to verify that func_get_args and prep_args are
+		// being called.
+		
+		$this->table->set_heading('name', 'color', 'size');
+		
+		$this->assertEquals(
+			array(
+				array('data' => 'name'),
+				array('data' => 'color'),
+				array('data' => 'size')
+			),
+			$this->table->heading
+		);
+	}
+	
+	
+	/*
+	 * @depends testPrepArgs
+	 */
+	public function testAddRow()
+	{
+		// uses _prep_args internally, so we'll just do a quick
+		// check to verify that func_get_args and prep_args are
+		// being called.
+		
+		$this->table->add_row('my', 'pony', 'sings');
+		$this->table->add_row('your', 'pony', 'stinks');
+		$this->table->add_row('my pony', '>', 'your pony');
+		
+		$this->assertEquals(count($this->table->rows), 3);
+		
+		$this->assertEquals(
+			array(
+				array('data' => 'your'),
+				array('data' => 'pony'),
+				array('data' => 'stinks')
+			),
+			$this->table->rows[1]
+		);
+	}
+	
+	
+	// Uility Methods
+	// --------------------------------------------------------------------
+	
+	public function testPrepArgs()
+	{
+		$expected = array(
+			array('data' => 'name'),
+			array('data' => 'color'),
+			array('data' => 'size')
+		);
+		
+		// test what would be discreet args,
+		// basically means a single array as the calling method
+		// will use func_get_args()
+		$this->assertEquals(
+			$expected,
+			$this->table->_prep_args(array(
+				'name', 'color', 'size'
+			)),
+		'discreet');
+		
+		
+		// test what would be a single array argument. Again, nested
+		// due to func_get_args on calling methods
+		$this->assertEquals(
+			$expected,
+			$this->table->_prep_args(array(
+				 array('name', 'color', 'size')
+			)),
+		'array');
+		
+		
+		// with cell attributes
+		
+		// need to add that new argument row to our expected outcome
+		$expected[] = array('data' => 'weight', 'class' => 'awesome');
+				
+		$this->assertEquals(
+			$expected,
+			$this->table->_prep_args(array(
+				array('name', 'color', 'size',
+					array('data' => 'weight', 'class' => 'awesome')
+				)
+			)),
+		'attributes');
+	}
+	
+	public function testDefaultTemplateKeys()
+	{
+		$deft_template = $this->table->_default_template();
+		$keys = array(
+			'table_open',
+			'thead_open', 'thead_close',
+			'heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end',
+			'tbody_open', 'tbody_close',
+			'row_start', 'row_end', 'cell_start', 'cell_end',
+			'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end',
+			'table_close'
+		);
+		
+		foreach ($keys as $key)
+		{
+			$this->assertArrayHasKey($key, $deft_template);
+		}
+	}
+	
+	public function testCompileTemplate()
+	{
+		$this->assertFalse($this->table->set_template('invalid_junk'));
+		
+		// non default key
+		$this->table->set_template(array('nonsense' => 'foo'));
+		$this->table->_compile_template();
+		
+		$this->assertArrayHasKey('nonsense', $this->table->template);
+		$this->assertEquals('foo', $this->table->template['nonsense']);
+		
+		// override default
+		$this->table->set_template(array('table_close' => '</table junk>'));
+		$this->table->_compile_template();
+		
+		$this->assertArrayHasKey('table_close', $this->table->template);
+		$this->assertEquals('</table junk>', $this->table->template['table_close']);
+	}
+	
+	public function testMakeColumns()
+	{
+		// Test bogus parameters
+		$this->assertFalse($this->table->make_columns('invalid_junk'));
+		$this->assertFalse( $this->table->make_columns(array()));
+		// $this->assertFalse(
+		// 	$this->table->make_columns(array('one', 'two')),
+		// 	'2.5' // not an integer!
+		// );
+		
+		
+		// Now on to the actual column creation
+		
+		$five_values = array(
+			'Laura', 'Red', '15',
+			'Katie', 'Blue'
+		);
+		
+		// No column count - no changes to the array
+		$this->assertEquals(
+			$five_values,
+			$this->table->make_columns($five_values)
+		);
+		
+		// Column count of 3 leaves us with one &nbsp;
+		$this->assertEquals(
+			array(
+				array('Laura', 'Red', '15'),
+				array('Katie', 'Blue', '&nbsp;')				
+			),
+			$this->table->make_columns($five_values, 3)
+		);
+		
+		$this->markTestSkipped('Look at commented assertFalse above');
+	}
+	
+	public function testClear()
+	{
+		$this->table->set_heading('Name', 'Color', 'Size');
+		
+		// Make columns changes auto_heading
+		$rows = $this->table->make_columns(array(
+			'Laura', 'Red', '15',
+			'Katie', 'Blue'
+		), 3);
+		
+		foreach ($rows as $row)
+		{
+			$this->table->add_row($row);
+		}
+		
+		$this->assertFalse($this->table->auto_heading);
+		$this->assertEquals(count($this->table->heading), 3);
+		$this->assertEquals(count($this->table->rows), 2);
+		
+		$this->table->clear();
+		
+		$this->assertTrue($this->table->auto_heading);
+		$this->assertEmpty($this->table->heading);
+		$this->assertEmpty($this->table->rows);
+	}
+	
+	
+	public function testSetFromArray()
+	{
+		$this->assertFalse($this->table->_set_from_array('bogus'));
+		$this->assertFalse($this->table->_set_from_array(array()));
+		
+		$data = array(
+			array('name', 'color', 'number'),
+			array('Laura', 'Red', '22'),
+			array('Katie', 'Blue')				
+		);
+		
+		$this->table->_set_from_array($data, FALSE);
+		$this->assertEmpty($this->table->heading);
+		
+		$this->table->clear();
+		
+		$expected_heading = array(
+			array('data' => 'name'),
+			array('data' => 'color'),
+			array('data' => 'number')
+		);
+		
+		$expected_second = array(
+			array('data' => 'Katie'),
+			array('data' => 'Blue'),
+		);
+		
+		$this->table->_set_from_array($data);
+		$this->assertEquals(count($this->table->rows), 2);
+		
+		$this->assertEquals(
+			$expected_heading,
+			$this->table->heading
+		);
+		
+		$this->assertEquals(
+			$expected_second,
+			$this->table->rows[1]
+		);
+	}
+	
+	function testSetFromObject()
+	{
+		$this->markTestSkipped('Not yet implemented.');
+	}
+	
+	// Test main generate method
+	// --------------------------------------------------------------------
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 2cadade8e3598fc4d19a3029db0b861a8d3bfc80 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 15:00:49 -0500
Subject: Adding typography library test.

---
 tests/codeigniter/libraries/Typography_test.php | 191 ++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100644 tests/codeigniter/libraries/Typography_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Typography_test.php b/tests/codeigniter/libraries/Typography_test.php
new file mode 100644
index 000000000..242a6e944
--- /dev/null
+++ b/tests/codeigniter/libraries/Typography_test.php
@@ -0,0 +1,191 @@
+<?php
+
+require BASEPATH.'libraries/Typography.php';
+
+class Typography_test extends CI_TestCase
+{
+
+	public function setUp()
+	{
+		$obj = new StdClass;
+		$obj->type = new CI_Typography();
+		
+		$this->ci_instance($obj);
+		
+		$this->type = $obj->type;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Tests the format_characters() function.
+	 *
+	 * this can and should grow.
+	 */
+	public function testFormatCharacters()
+	{
+		$strs = array(
+			'"double quotes"' 				=> '&#8220;double quotes&#8221;',
+			'"testing" in "theory" that is' => '&#8220;testing&#8221; in &#8220;theory&#8221; that is',
+			"Here's what I'm" 				=> 'Here&#8217;s what I&#8217;m',
+			'&' 							=> '&amp;',
+			'&amp;' 						=> '&amp;',
+			'&nbsp;'						=> '&nbsp;',
+			'--'							=> '&#8212;',
+			'foo...'						=> 'foo&#8230;',
+			'foo..'							=> 'foo..',
+			'foo...bar.'					=> 'foo&#8230;bar.',
+			'test.  new'					=> 'test.&nbsp; new',
+		);	
+		
+		foreach ($strs as $str => $expected)
+		{
+			$this->assertEquals($expected, $this->type->format_characters($str));		
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testNl2brExceptPre()
+	{	
+		$str = <<<EOH
+Hello, I'm a happy string with some new lines.  
+
+I like to skip.
+
+Jump
+
+and sing.
+
+<pre>
+I am inside a pre tag.  Please don't mess with me.
+
+k?
+</pre>
+
+That's my story and I'm sticking to it.
+
+The End.
+EOH;
+
+		$expected = <<<EOH
+Hello, I'm a happy string with some new lines.  <br />
+<br />
+I like to skip.<br />
+<br />
+Jump<br />
+<br />
+and sing.<br />
+<br />
+<pre>
+I am inside a pre tag.  Please don't mess with me.
+
+k?
+</pre><br />
+<br />
+That's my story and I'm sticking to it.<br />
+<br />
+The End.
+EOH;
+
+		$this->assertEquals($expected, 
+							$this->type->nl2br_except_pre($str));
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function testAutoTypography()
+	{
+		$this->_blank_string();
+		$this->_standardize_new_lines();
+		$this->_reduce_linebreaks();
+		$this->_remove_comments();
+		$this->_protect_pre();
+		$this->_no_opening_block();
+		$this->_protect_braced_quotes();
+	}
+
+	// --------------------------------------------------------------------
+	
+	private function _blank_string()
+	{
+		// Test blank string
+		$this->assertEquals('', $this->type->auto_typography(''));
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _standardize_new_lines()
+	{
+		$strs = array(
+			"My string\rhas return characters"	=> "<p>My string<br />\nhas return characters</p>",
+			'This one does not!' 				=> '<p>This one does not!</p>'
+		);
+
+		foreach ($strs as $str => $expect)
+		{
+			$this->assertEquals($expect, $this->type->auto_typography($str));
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _reduce_linebreaks()
+	{
+		$str = "This has way too many linebreaks.\n\n\n\nSee?";
+		$expect = "<p>This has way too many linebreaks.</p>\n\n<p>See?</p>";
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str, TRUE));
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _remove_comments()
+	{
+		$str = '<!-- I can haz comments? -->  But no!';
+		$expect = '<p><!-- I can haz comments? -->&nbsp; But no!</p>';
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str));
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _protect_pre()
+	{
+		$str = '<p>My Sentence</p><pre>var_dump($this);</pre>';
+		$expect = '<p>My Sentence</p><pre>var_dump($this);</pre>';
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str));
+	}
+
+	// --------------------------------------------------------------------
+
+	private function _no_opening_block()
+	{
+		$str = 'My Sentence<pre>var_dump($this);</pre>';
+		$expect = '<p>My Sentence</p><pre>var_dump($this);</pre>';
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str));
+	}
+
+	// --------------------------------------------------------------------
+
+	public function _protect_braced_quotes()
+	{
+		$this->type->protect_braced_quotes = TRUE;
+		
+		$str = 'Test {parse="foobar"}';
+		$expect = '<p>Test {parse="foobar"}</p>';
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str));
+
+		$this->type->protect_braced_quotes = FALSE;
+		
+		$str = 'Test {parse="foobar"}';
+		$expect = '<p>Test {parse=&#8220;foobar&#8221;}</p>';
+		
+		$this->assertEquals($expect, $this->type->auto_typography($str));
+
+
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 9512ab8a22ff14a3789cba6e5ace03aed4196e23 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 15:10:48 -0500
Subject: Adding user agent library test.  Needs some work, but is a good
 start.

---
 tests/codeigniter/libraries/User_agent_test.php | 91 +++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 tests/codeigniter/libraries/User_agent_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/User_agent_test.php b/tests/codeigniter/libraries/User_agent_test.php
new file mode 100644
index 000000000..d1d950cd9
--- /dev/null
+++ b/tests/codeigniter/libraries/User_agent_test.php
@@ -0,0 +1,91 @@
+<?php
+
+require BASEPATH.'libraries/User_agent.php';
+
+// This class needs some work...
+
+class UserAgent_test extends CI_TestCase
+{
+	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
+	protected $_mobile_ua = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
+	
+	public function setUp()
+	{
+		// set a baseline user agent
+		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
+		
+		$obj = new StdClass;
+		$obj->agent = new CI_User_agent();
+		
+		$this->ci_instance($obj);
+		
+		$this->agent = $obj->agent;
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testAcceptLang()
+	{
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en';
+
+		$this->assertEquals('en', $this->agent->accept_lang());
+
+		unset($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testMobile()
+	{
+		// Mobile Not Set
+		$_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
+		$this->assertEquals('', $this->agent->mobile());
+		unset($_SERVER['HTTP_USER_AGENT']);
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testUtilIsFunctions()
+	{
+		$this->assertTrue($this->agent->is_browser());
+		$this->assertFalse($this->agent->is_robot());
+		$this->assertFalse($this->agent->is_mobile());
+		$this->assertFalse($this->agent->is_referral());
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testAgentString()
+	{
+		$this->assertEquals($this->_user_agent, $this->agent->agent_string());
+	}
+
+	// --------------------------------------------------------------------
+
+	public function testBrowserInfo()
+	{
+		$this->assertEquals('Mac OS X', $this->agent->platform());
+		$this->assertEquals('Safari', $this->agent->browser());
+		$this->assertEquals('533.20.27', $this->agent->version());
+		$this->assertEquals('', $this->agent->robot());
+		$this->assertEquals('', $this->agent->referrer());
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function testCharsets()
+	{
+		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'utf8';
+		
+		$charsets = $this->agent->charsets();
+		
+		$this->assertEquals('utf8', $charsets[0]);
+		
+		unset($_SERVER['HTTP_ACCEPT_CHARSET']);
+		
+		$this->assertFalse($this->agent->accept_charset());
+	}
+
+	// --------------------------------------------------------------------
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 68286a4dcc1ed4d904ad992173c1b3621bf6fced Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Thu, 21 Apr 2011 22:00:33 -0400
Subject: Reworked unit tests to match rest of framework and added a few more.

---
 tests/codeigniter/Setup_test.php                   |  2 +-
 tests/codeigniter/core/Common_test.php             | 16 +++++++++++++
 tests/codeigniter/core/Config_test.php             | 12 +++++-----
 tests/codeigniter/core/Lang_test.php               |  6 ++---
 tests/codeigniter/core/Loader_test.php             | 28 +++++++++++-----------
 tests/codeigniter/helpers/array_helper_test.php    |  8 +++----
 tests/codeigniter/helpers/email_helper_test.php    | 16 +++++++++++++
 tests/codeigniter/helpers/html_helper_test.php     | 19 +++++++++++----
 .../codeigniter/helpers/inflector_helper_test.php  | 10 ++++----
 tests/codeigniter/helpers/number_helper_test.php   | 13 ++++++++++
 tests/codeigniter/helpers/string_helper_test.php   | 27 +++++++++++----------
 tests/codeigniter/helpers/text_helper_test.php     | 26 +++++++++++++-------
 tests/codeigniter/helpers/xml_helper_test.php      | 13 ++++++++++
 tests/codeigniter/libraries/Parser_test.php        |  8 +++----
 tests/codeigniter/libraries/Table_test.php         | 26 ++++++++++----------
 tests/codeigniter/libraries/Typography_test.php    |  8 +++----
 tests/codeigniter/libraries/User_agent_test.php    | 14 +++++------
 17 files changed, 165 insertions(+), 87 deletions(-)
 create mode 100644 tests/codeigniter/core/Common_test.php
 create mode 100644 tests/codeigniter/helpers/email_helper_test.php
 create mode 100644 tests/codeigniter/helpers/number_helper_test.php
 create mode 100644 tests/codeigniter/helpers/xml_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/Setup_test.php b/tests/codeigniter/Setup_test.php
index e088b51d3..550245f2f 100644
--- a/tests/codeigniter/Setup_test.php
+++ b/tests/codeigniter/Setup_test.php
@@ -2,7 +2,7 @@
 
 class Setup_test extends PHPUnit_Framework_TestCase {
 	
-	function testNonsense()
+	function test_nonsense()
 	{
 		$this->markTestIncomplete('not implemented');
 		// ensure that our bootstrapped test environment
diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
new file mode 100644
index 000000000..cec12982d
--- /dev/null
+++ b/tests/codeigniter/core/Common_test.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(BASEPATH.'helpers/email_helper.php');
+
+class Common_test extends CI_TestCase
+{
+	
+	// ------------------------------------------------------------------------
+	
+	public function test_is_php()
+	{
+		$this->assertEquals(TRUE, is_php('1.2.0'));
+		$this->assertEquals(FALSE, is_php('9999.9.9'));
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
index b04dd67fa..b6c57da70 100644
--- a/tests/codeigniter/core/Config_test.php
+++ b/tests/codeigniter/core/Config_test.php
@@ -2,7 +2,7 @@
 
 class Config_test extends CI_TestCase {
 
-	public function setUp()
+	public function set_up()
 	{
 		$cls =& $this->ci_core_class('cfg');
 				
@@ -18,7 +18,7 @@ class Config_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 
-	public function testItem()
+	public function test_item()
 	{
 		$this->assertEquals('http://example.com/', $this->config->item('base_url'));
 
@@ -32,7 +32,7 @@ class Config_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 	
-	public function testSetItem()
+	public function test_set_item()
 	{
 		$this->assertFalse($this->config->item('not_yet_set'));
 		
@@ -43,7 +43,7 @@ class Config_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testSlashItem()
+	public function test_slash_item()
 	{
 		// Bad Config value
 		$this->assertFalse($this->config->slash_item('no_good_item'));
@@ -55,7 +55,7 @@ class Config_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	public function testSiteUrl()
+	public function test_site_url()
 	{
 		$this->assertEquals('http://example.com/index.php', $this->config->site_url());
 		
@@ -85,7 +85,7 @@ class Config_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testSystemUrl()
+	public function test_system_url()
 	{
 		$this->assertEquals('http://example.com/system/', $this->config->system_url());
 	}
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index f65b335b0..dcc3d0879 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -4,7 +4,7 @@ class Lang_test extends CI_TestCase {
 	
 	protected $lang;
 	
-	public function setUp()
+	public function set_up()
 	{
 		$cls = $this->ci_core_class('lang');
 		$this->lang = new $cls;
@@ -12,7 +12,7 @@ class Lang_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 	
-	public function testLoad()
+	public function test_load()
 	{
 		// get_config needs work
 		$this->markTestIncomplete('get_config needs work');
@@ -21,7 +21,7 @@ class Lang_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 
-	public function testLine()
+	public function test_line()
 	{
 		$this->markTestIncomplete('get_config needs work');
 		
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 49679e241..9ba870b7d 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -37,7 +37,7 @@ class Loader_test extends CI_TestCase {
 	
 	private $ci_obj;
 	
-	public function setUp()
+	public function set_up()
 	{
 		// Instantiate a new loader
 		$this->load = new Extended_Loader();
@@ -51,7 +51,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testLibrary()
+	public function test_library()
 	{
 		$this->_setup_config_mock();
 		
@@ -69,7 +69,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	public function testLoadLibraryInApplicationDir()
+	public function test_load_library_in_application_dir()
 	{
 		$this->_setup_config_mock();
 		
@@ -101,7 +101,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	public function testNonExistentModel()
+	public function test_non_existent_model()
 	{
 		$this->setExpectedException(
 			'Exception',
@@ -116,7 +116,7 @@ class Loader_test extends CI_TestCase {
 	/**
 	 * @coverts CI_Loader::model
 	 */
-	public function testModels()
+	public function test_models()
 	{
 		$this->ci_set_core_class('model', 'CI_Model');
 		
@@ -147,7 +147,7 @@ class Loader_test extends CI_TestCase {
 	/**
 	 * @coverts CI_Loader::view
 	 */
-	public function testLoadView()
+	public function test_load_view()
 	{
 		$this->ci_set_core_class('output', 'CI_Output');
 		
@@ -158,7 +158,7 @@ class Loader_test extends CI_TestCase {
 		// 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));
+		$this->load->view('unit_test_view', array('hello' => "World!"), TRUE));
 		
 	}
 
@@ -167,7 +167,7 @@ class Loader_test extends CI_TestCase {
 	/**
 	 * @coverts CI_Loader::view
 	 */
-	public function testNonExistentView()
+	public function test_non_existent_view()
 	{
 		$this->setExpectedException(
 			'Exception',
@@ -179,7 +179,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	public function testFile()
+	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)
@@ -202,7 +202,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testVars()
+	public function test_vars()
 	{
 		$vars = array(
 			'foo'	=> 'bar'
@@ -214,7 +214,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testHelper()
+	public function test_helper()
 	{
 		$this->assertEquals(NULL, $this->load->helper('array'));
 		
@@ -228,7 +228,7 @@ class Loader_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 
-	public function testLoadingMultipleHelpers()
+	public function test_loading_multiple_helpers()
 	{
 		$this->assertEquals(NULL, $this->load->helpers(array('file', 'array', 'string')));
 	}
@@ -242,7 +242,7 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
-	public function testLoadConfig()
+	public function test_load_config()
 	{
 		$this->_setup_config_mock();
 		
@@ -251,7 +251,7 @@ class Loader_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 
-	public function testLoadBadConfig()
+	public function test_load_bad_config()
 	{
 		$this->_setup_config_mock();
 		
diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index fd306cee8..62559de83 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -6,7 +6,7 @@ require_once(BASEPATH.'helpers/array_helper.php');
 
 class Array_helper_test extends CI_TestCase
 {
-	public function setUp()
+	public function set_up()
 	{
 		$this->my_array = array(
 			'foo'		=> 'bar',
@@ -18,7 +18,7 @@ class Array_helper_test extends CI_TestCase
 	
 	// ------------------------------------------------------------------------
 	
-	public function testElementWithExistingItem()
+	public function test_element_with_existing_item()
 	{	
 		$this->assertEquals(FALSE, element('testing', $this->my_array));
 		
@@ -29,7 +29,7 @@ class Array_helper_test extends CI_TestCase
 	
 	// ------------------------------------------------------------------------	
 
-	public function testRandomElement()
+	public function test_random_element()
 	{
 		// Send a string, not an array to random_element
 		$this->assertEquals('my string', random_element('my string'));
@@ -40,7 +40,7 @@ class Array_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 	
-	public function testElements()
+	public function test_elements()
 	{
 		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
 		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
diff --git a/tests/codeigniter/helpers/email_helper_test.php b/tests/codeigniter/helpers/email_helper_test.php
new file mode 100644
index 000000000..7324e8109
--- /dev/null
+++ b/tests/codeigniter/helpers/email_helper_test.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(BASEPATH.'helpers/email_helper.php');
+
+class Email_helper_test extends CI_TestCase
+{
+	
+	public function test_valid_email()
+	{
+		$this->assertEquals(FALSE, valid_email('test'));
+		$this->assertEquals(FALSE, valid_email('test@test@test.com'));
+		$this->assertEquals(TRUE, valid_email('test@test.com'));
+		$this->assertEquals(TRUE, valid_email('my.test@test.com'));
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 8c0e53301..706874f9e 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -4,14 +4,25 @@ require_once(BASEPATH.'helpers/html_helper.php');
 
 class Html_helper_test extends CI_TestCase
 {
-	public function testHeading()
+	
+	// ------------------------------------------------------------------------
+	
+	public function test_br()
+	{
+		$this->assertEquals('<br /><br />', br(2));
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	public function test_heading()
 	{
 		$this->assertEquals('<h1>foobar</h1>', heading('foobar'));
+		$this->assertEquals('<h2 class="bar">foobar</h2>', heading('foobar', 2, 'class="bar"'));
 	}
 
 	// ------------------------------------------------------------------------
 	
-	public function testUl()
+	public function test_Ul()
 	{
 		$expect = <<<EOH
 <ul>
@@ -47,14 +58,14 @@ EOH;
 	
 	// ------------------------------------------------------------------------
 
-	public function testNBS()
+	public function test_NBS()
 	{
 		$this->assertEquals('&nbsp;&nbsp;&nbsp;', nbs(3));
 	}
 
 	// ------------------------------------------------------------------------
 	
-	public function testMeta()
+	public function test_meta()
 	{
 		$this->assertEquals("<meta name=\"test\" content=\"foo\" />\n", meta('test', 'foo'));
 		
diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index e59875e4a..34bc34ebb 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -5,7 +5,7 @@ require_once(BASEPATH.'helpers/inflector_helper.php');
 class Inflector_helper_test extends CI_TestCase {
 	
 	
-	public function testSingular()
+	public function test_singular()
 	{
 		$strs = array(
 			'tellies'		=> 'telly',
@@ -22,7 +22,7 @@ class Inflector_helper_test extends CI_TestCase {
 	
 	// --------------------------------------------------------------------
 	
-	public function testPlural()
+	public function test_plural()
 	{
 		$strs = array(
 			'telly'			=> 'tellies',
@@ -40,7 +40,7 @@ class Inflector_helper_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testCamelize()
+	public function test_camelize()
 	{
 		$strs = array(
 			'this is the string'	=> 'thisIsTheString',
@@ -57,7 +57,7 @@ class Inflector_helper_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testUnderscore()
+	public function test_underscore()
 	{
 		$strs = array(
 			'this is the string'	=> 'this_is_the_string',
@@ -74,7 +74,7 @@ class Inflector_helper_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	public function testHumanize()
+	public function test_humanize()
 	{
 		$strs = array(
 			'this_is_the_string'	=> 'This Is The String',
diff --git a/tests/codeigniter/helpers/number_helper_test.php b/tests/codeigniter/helpers/number_helper_test.php
new file mode 100644
index 000000000..02fc49c3d
--- /dev/null
+++ b/tests/codeigniter/helpers/number_helper_test.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(BASEPATH.'helpers/number_helper.php');
+
+class Number_helper_test extends CI_TestCase
+{
+	
+	public function test_byte_format()
+	{
+		// $this->assertEquals('456 Bytes', byte_format(456));
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index 00ba5dec7..5e0ee45de 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -4,7 +4,7 @@ require_once(BASEPATH.'helpers/string_helper.php');
 
 class String_helper_test extends CI_TestCase
 {
-	public function testTrimSlashes()
+	public function test_trim_slashes()
 	{
 		$strs = array(
 			'//Slashes//\/'	=> 'Slashes//\\',
@@ -17,16 +17,9 @@ class String_helper_test extends CI_TestCase
 		}
 	}
 	
-	// --------------------------------------------------------------------	
-	
-	public function testStripSlashes()
-	{
-		$this->assertEquals("This is totally foo bar'd", trim_slashes("This is totally foo bar'd"));
-	}
-
 	// --------------------------------------------------------------------	
 
-	public function testStripQuotes()
+	public function test_strip_quotes()
 	{
 		$strs = array(
 			'"me oh my!"'		=> 'me oh my!',
@@ -41,7 +34,7 @@ class String_helper_test extends CI_TestCase
 
 	// --------------------------------------------------------------------	
 	
-	public function testQuotesToEntities()
+	public function test_quotes_to_entities()
 	{
 		$strs = array(
 			'"me oh my!"'		=> '&quot;me oh my!&quot;',
@@ -56,7 +49,7 @@ class String_helper_test extends CI_TestCase
 
 	// --------------------------------------------------------------------	
 	
-	public function testReduceDoubleSlashes()
+	public function test_reduce_double_slashes()
 	{
 		$strs = array(
 			'http://codeigniter.com'		=> 'http://codeigniter.com',
@@ -72,7 +65,7 @@ class String_helper_test extends CI_TestCase
 
 	// --------------------------------------------------------------------	
 	
-	public function testReduceMultiples()
+	public function test_reduce_multiples()
 	{
 		$strs = array(
 			'Fred, Bill,, Joe, Jimmy'	=> 'Fred, Bill, Joe, Jimmy',
@@ -97,7 +90,7 @@ class String_helper_test extends CI_TestCase
 	
 	// --------------------------------------------------------------------	
 	
-	public function testRepeater()
+	public function test_repeater()
 	{
 		$strs = array(
 			'a'			=> 'aaaaaaaaaa',
@@ -114,4 +107,12 @@ class String_helper_test extends CI_TestCase
 
 	// --------------------------------------------------------------------	
 
+
+	public function test_random_string()
+	{
+		$this->assertEquals(16, strlen(random_string('alnum', 16)));
+		$this->assertEquals(32, strlen(random_string('unique', 16)));
+		$this->assertInternalType('string', random_string('numeric', 16));
+	}
+	
 }
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php
index 22c834bcf..a0866e638 100644
--- a/tests/codeigniter/helpers/text_helper_test.php
+++ b/tests/codeigniter/helpers/text_helper_test.php
@@ -6,14 +6,14 @@ class Text_helper_test extends CI_TestCase
 {
 	private $_long_string;
 	
-	public function setUp()
+	public function set_up()
 	{
 		$this->_long_string = 'Once upon a time, a framework had no tests.  It sad.  So some nice people began to write tests.  The more time that went on, the happier it became.  Everyone was happy.';
 	}
 	
 	// ------------------------------------------------------------------------
 	
-	public function testWordLimiter()
+	public function test_word_limiter()
 	{
 		$this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
 		$this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
@@ -22,7 +22,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 	
-	public function testCharacterLimiter()
+	public function test_character_limiter()
 	{
 		$this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
 		$this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
@@ -32,7 +32,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 	
-	public function testAsciiToEntities()
+	public function test_ascii_to_entities()
 	{
 		$strs = array(
 			'“‘ “test”'			=> '&#8220;&#8216; &#8220;test&#8221;',
@@ -47,7 +47,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 
-	public function testEntitiesToAscii()
+	public function test_entities_to_ascii()
 	{
 		$strs = array(
 			'&#8220;&#8216; &#8220;test&#8221;' => '“‘ “test”',
@@ -59,10 +59,18 @@ class Text_helper_test extends CI_TestCase
 			$this->assertEquals($expect, entities_to_ascii($str));
 		}		
 	}
+	
+	// ------------------------------------------------------------------------	
+	
+	function test_convert_accented_characters() 
+	{
+		$this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
+		$this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
+	}
 
 	// ------------------------------------------------------------------------	
 	
-	public function testCensoredWords()
+	public function test_censored_words()
 	{
 		$censored = array('boob', 'nerd', 'ass', 'fart');
 		
@@ -86,7 +94,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 
-	public function testHighlightCode()
+	public function test_highlight_code()
 	{
 		$code = '<?php var_dump($this); ?>';
 		$expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
@@ -96,7 +104,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 
-	public function testHighlightPhrase()
+	public function test_highlight_phrase()
 	{
 		$strs = array(
 			'this is a phrase'			=> '<strong>this is</strong> a phrase',
@@ -114,7 +122,7 @@ class Text_helper_test extends CI_TestCase
 
 	// ------------------------------------------------------------------------	
 
-	public function testEllipsizing()
+	public function test_ellipsizing()
 	{
 		$strs = array(
 			'0'		=> array(
diff --git a/tests/codeigniter/helpers/xml_helper_test.php b/tests/codeigniter/helpers/xml_helper_test.php
new file mode 100644
index 000000000..49f49e166
--- /dev/null
+++ b/tests/codeigniter/helpers/xml_helper_test.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(BASEPATH.'helpers/xml_helper.php');
+
+class Xml_helper_test extends CI_TestCase
+{
+	
+	public function test_xml_convert()
+	{
+		$this->assertEquals('&lt;tag&gt;my &amp; test &#45; &lt;/tag&gt;', xml_convert('<tag>my & test - </tag>'));
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index 44269ad2c..b4580a4b1 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -5,7 +5,7 @@ require BASEPATH.'libraries/Parser.php';
 class Parser_test extends CI_TestCase
 {
 	
-	public function setUp()
+	public function set_up()
 	{
 		$obj = new StdClass;
 		$obj->parser = new CI_Parser();
@@ -16,7 +16,7 @@ class Parser_test extends CI_TestCase
 	}
 	// --------------------------------------------------------------------
 	
-	public function testSetDelimiters()
+	public function test_set_delimiters()
 	{
 		// Make sure default delimiters are there
 		$this->assertEquals('{', $this->parser->l_delim);
@@ -39,7 +39,7 @@ class Parser_test extends CI_TestCase
 	
 	// --------------------------------------------------------------------
 	
-	public function testParseSimpleString()
+	public function test_parse_simple_string()
 	{
 		$data = array(
 			'title' => 'Page Title',
@@ -55,7 +55,7 @@ class Parser_test extends CI_TestCase
 	
 	// --------------------------------------------------------------------
 	
-	public function testParse()
+	public function test_parse()
 	{
 		$this->_parse_no_template();
 		$this->_parse_var_pair();
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index ded4c22c1..133179f3a 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -5,7 +5,7 @@ require BASEPATH.'libraries/Table.php';
 class Table_test extends CI_TestCase
 {
 
-	public function setUp()
+	public function set_up()
 	{
 		$obj = new StdClass;
 		$obj->table = new CI_table();
@@ -19,7 +19,7 @@ class Table_test extends CI_TestCase
 	// Setter Methods
 	// --------------------------------------------------------------------
 	
-	public function testSetTemplate()
+	public function test_set_template()
 	{
 		$this->assertFalse($this->table->set_template('not an array'));
 		
@@ -31,13 +31,13 @@ class Table_test extends CI_TestCase
 		$this->assertEquals($template, $this->table->template);
 	}
 	
-	public function testSetEmpty()
+	public function test_set_empty()
 	{
 		$this->table->set_empty('nada');
 		$this->assertEquals('nada', $this->table->empty_cells);
 	}
 	
-	public function testSetCaption()
+	public function test_set_caption()
 	{
 		$this->table->set_caption('awesome cap');
 		$this->assertEquals('awesome cap', $this->table->caption);
@@ -47,7 +47,7 @@ class Table_test extends CI_TestCase
 	/*
 	 * @depends testPrepArgs
 	 */
-	public function testSetHeading()
+	public function test_set_heading()
 	{
 		// uses _prep_args internally, so we'll just do a quick
 		// check to verify that func_get_args and prep_args are
@@ -69,7 +69,7 @@ class Table_test extends CI_TestCase
 	/*
 	 * @depends testPrepArgs
 	 */
-	public function testAddRow()
+	public function test_add_row()
 	{
 		// uses _prep_args internally, so we'll just do a quick
 		// check to verify that func_get_args and prep_args are
@@ -95,7 +95,7 @@ class Table_test extends CI_TestCase
 	// Uility Methods
 	// --------------------------------------------------------------------
 	
-	public function testPrepArgs()
+	public function test_prep_args()
 	{
 		$expected = array(
 			array('data' => 'name'),
@@ -139,7 +139,7 @@ class Table_test extends CI_TestCase
 		'attributes');
 	}
 	
-	public function testDefaultTemplateKeys()
+	public function test_default_template_keys()
 	{
 		$deft_template = $this->table->_default_template();
 		$keys = array(
@@ -158,7 +158,7 @@ class Table_test extends CI_TestCase
 		}
 	}
 	
-	public function testCompileTemplate()
+	public function test_compile_template()
 	{
 		$this->assertFalse($this->table->set_template('invalid_junk'));
 		
@@ -177,7 +177,7 @@ class Table_test extends CI_TestCase
 		$this->assertEquals('</table junk>', $this->table->template['table_close']);
 	}
 	
-	public function testMakeColumns()
+	public function test_make_columns()
 	{
 		// Test bogus parameters
 		$this->assertFalse($this->table->make_columns('invalid_junk'));
@@ -213,7 +213,7 @@ class Table_test extends CI_TestCase
 		$this->markTestSkipped('Look at commented assertFalse above');
 	}
 	
-	public function testClear()
+	public function test_clear()
 	{
 		$this->table->set_heading('Name', 'Color', 'Size');
 		
@@ -240,7 +240,7 @@ class Table_test extends CI_TestCase
 	}
 	
 	
-	public function testSetFromArray()
+	public function test_set_from_array()
 	{
 		$this->assertFalse($this->table->_set_from_array('bogus'));
 		$this->assertFalse($this->table->_set_from_array(array()));
@@ -281,7 +281,7 @@ class Table_test extends CI_TestCase
 		);
 	}
 	
-	function testSetFromObject()
+	function test_set_from_object()
 	{
 		$this->markTestSkipped('Not yet implemented.');
 	}
diff --git a/tests/codeigniter/libraries/Typography_test.php b/tests/codeigniter/libraries/Typography_test.php
index 242a6e944..a0533bae0 100644
--- a/tests/codeigniter/libraries/Typography_test.php
+++ b/tests/codeigniter/libraries/Typography_test.php
@@ -5,7 +5,7 @@ require BASEPATH.'libraries/Typography.php';
 class Typography_test extends CI_TestCase
 {
 
-	public function setUp()
+	public function set_up()
 	{
 		$obj = new StdClass;
 		$obj->type = new CI_Typography();
@@ -22,7 +22,7 @@ class Typography_test extends CI_TestCase
 	 *
 	 * this can and should grow.
 	 */
-	public function testFormatCharacters()
+	public function test_format_characters()
 	{
 		$strs = array(
 			'"double quotes"' 				=> '&#8220;double quotes&#8221;',
@@ -46,7 +46,7 @@ class Typography_test extends CI_TestCase
 
 	// --------------------------------------------------------------------
 
-	public function testNl2brExceptPre()
+	public function test_nl2br_except_pre()
 	{	
 		$str = <<<EOH
 Hello, I'm a happy string with some new lines.  
@@ -94,7 +94,7 @@ EOH;
 
 	// --------------------------------------------------------------------
 	
-	public function testAutoTypography()
+	public function test_auto_typography()
 	{
 		$this->_blank_string();
 		$this->_standardize_new_lines();
diff --git a/tests/codeigniter/libraries/User_agent_test.php b/tests/codeigniter/libraries/User_agent_test.php
index d1d950cd9..277c12ed0 100644
--- a/tests/codeigniter/libraries/User_agent_test.php
+++ b/tests/codeigniter/libraries/User_agent_test.php
@@ -9,7 +9,7 @@ class UserAgent_test extends CI_TestCase
 	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
 	protected $_mobile_ua = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
 	
-	public function setUp()
+	public function set_up()
 	{
 		// set a baseline user agent
 		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
@@ -24,7 +24,7 @@ class UserAgent_test extends CI_TestCase
 
 	// --------------------------------------------------------------------
 
-	public function testAcceptLang()
+	public function test_accept_lang()
 	{
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en';
 
@@ -35,7 +35,7 @@ class UserAgent_test extends CI_TestCase
 
 	// --------------------------------------------------------------------
 
-	public function testMobile()
+	public function test_mobile()
 	{
 		// Mobile Not Set
 		$_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
@@ -45,7 +45,7 @@ class UserAgent_test extends CI_TestCase
 
 	// --------------------------------------------------------------------
 
-	public function testUtilIsFunctions()
+	public function test_util_is_functions()
 	{
 		$this->assertTrue($this->agent->is_browser());
 		$this->assertFalse($this->agent->is_robot());
@@ -55,14 +55,14 @@ class UserAgent_test extends CI_TestCase
 
 	// --------------------------------------------------------------------
 
-	public function testAgentString()
+	public function test_agent_string()
 	{
 		$this->assertEquals($this->_user_agent, $this->agent->agent_string());
 	}
 
 	// --------------------------------------------------------------------
 
-	public function testBrowserInfo()
+	public function test_browser_info()
 	{
 		$this->assertEquals('Mac OS X', $this->agent->platform());
 		$this->assertEquals('Safari', $this->agent->browser());
@@ -73,7 +73,7 @@ class UserAgent_test extends CI_TestCase
 	
 	// --------------------------------------------------------------------
 
-	public function testCharsets()
+	public function test_charsets()
 	{
 		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'utf8';
 		
-- 
cgit v1.2.3-24-g4f1b


From d92277d650139af381a856cfa8f23a42b8ce04cb Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Fri, 22 Apr 2011 12:56:22 -0500
Subject: Initial commit of file helper tests.

---
 tests/codeigniter/helpers/file_helper_test.php | 157 +++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 tests/codeigniter/helpers/file_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/file_helper_test.php b/tests/codeigniter/helpers/file_helper_test.php
new file mode 100644
index 000000000..a596a0375
--- /dev/null
+++ b/tests/codeigniter/helpers/file_helper_test.php
@@ -0,0 +1,157 @@
+<?php
+
+require_once 'vfsStream/vfsStream.php';
+require BASEPATH.'helpers/file_helper.php';
+
+class File_helper_Test extends CI_TestCase
+{
+	public function set_up()
+	{
+		vfsStreamWrapper::register();
+		vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir'));
+		
+		$this->_test_dir = vfsStreamWrapper::getRoot();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	public function test_read_file()
+	{
+		$this->assertFalse(read_file('does_not_exist'));
+		
+		$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+		
+		$file = vfsStream::newFile('my_file.txt')->withContent($content)
+												 ->at($this->_test_dir);
+		
+		$this->assertEquals($content, read_file(vfsStream::url('my_file.txt')));
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_octal_permissions()
+	{
+		$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+		
+		$file = vfsStream::newFile('my_file.txt', 0777)->withContent($content)
+												 ->lastModified(time() - 86400)
+												 ->at($this->_test_dir);
+		
+		$this->assertEquals('777', octal_permissions($file->getPermissions()));		
+	}
+
+	// --------------------------------------------------------------------	
+	
+	/**
+	 * More tests should happen here, since I'm not hitting the whole function.
+	 */
+	public function test_symbolic_permissions()
+	{
+		$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+		
+		$file = vfsStream::newFile('my_file.txt', 0777)->withContent($content)
+												 ->lastModified(time() - 86400)
+												 ->at($this->_test_dir);
+												
+		$this->assertEquals('urwxrwxrwx', symbolic_permissions($file->getPermissions()));		
+	}
+
+	// --------------------------------------------------------------------	
+	
+	public function test_get_mime_by_extension()
+	{
+		$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+		
+		$file = vfsStream::newFile('my_file.txt', 0777)->withContent($content)
+												 ->lastModified(time() - 86400)
+												 ->at($this->_test_dir);
+												
+		$this->assertEquals('text/plain', 
+						get_mime_by_extension(vfsStream::url('my_file.txt')));
+						
+		// Test a mime with an array, such as png		
+		$file = vfsStream::newFile('foo.png')->at($this->_test_dir);
+		
+		$this->assertEquals('image/png', get_mime_by_extension(vfsStream::url('foo.png')));			
+			
+		// Test a file not in the mimes array
+		$file = vfsStream::newFile('foo.blarfengar')->at($this->_test_dir);
+		
+		$this->assertFalse(get_mime_by_extension(vfsStream::url('foo.blarfengar')));
+	}
+
+	// --------------------------------------------------------------------	
+
+	public function test_get_file_info()
+	{
+		// Test Bad File
+		$this->assertFalse(get_file_info('i_am_bad_boo'));
+		
+		// Test the rest
+		
+		// First pass in an array
+		$vals = array(
+			'name', 'server_path', 'size', 'date',
+			'readable', 'writable', 'executable',  'fileperms'
+		);
+		
+		$this->_test_get_file_info($vals);
+
+		// Test passing in vals as a string.
+		$vals = 'name, server_path, size, date, readable, writable, executable, fileperms';
+		$this->_test_get_file_info($vals);
+	}
+	
+	private function _test_get_file_info($vals)
+	{
+		$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+		$last_modified = time() - 86400;
+		
+		$file = vfsStream::newFile('my_file.txt', 0777)->withContent($content)
+												 ->lastModified($last_modified)
+												 ->at($this->_test_dir);
+		
+		$ret_values = array(
+			'name'			=> 'my_file.txt', 
+			'server_path'	=> 'vfs://my_file.txt', 
+			'size'			=> 57, 
+			'date'			=> $last_modified, 
+			'readable'		=> TRUE,
+			'writable'		=> TRUE, 
+			'executable'	=> TRUE, 
+			'fileperms'		=> 33279
+		);
+		
+		$info = get_file_info(vfsStream::url('my_file.txt'), $vals);
+		
+		foreach ($info as $k => $v)
+		{
+			$this->assertEquals($ret_values[$k], $v);
+		}
+	}
+	
+	// --------------------------------------------------------------------	
+
+	// Skipping for now, as it's not implemented in vfsStreamWrapper
+	// flock(): vfsStreamWrapper::stream_lock is not implemented!
+	
+	// public function test_write_file()
+	// {
+	// 	if ( ! defined('FOPEN_WRITE_CREATE_DESTRUCTIVE'))
+	// 	{
+	// 		define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb');
+	// 	}
+	// 	
+	// 	$content = 'Jack and Jill went up the mountain to fight a billy goat.';
+	// 	
+	// 	$file = vfsStream::newFile('write.txt', 0777)->withContent('')
+	// 											 	 ->lastModified(time() - 86400)
+	// 											 	 ->at($this->_test_dir);
+	// 	
+	// 	$this->assertTrue(write_file(vfsStream::url('write.txt'), $content));
+	// 		
+	// }
+
+	// --------------------------------------------------------------------		
+	
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 19379ef47a6bc0a788c65038bb59eca0b6624848 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Tue, 3 May 2011 22:16:11 -0400
Subject: Added unit tests for number helper.

---
 tests/codeigniter/helpers/number_helper_test.php | 71 +++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 3 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/number_helper_test.php b/tests/codeigniter/helpers/number_helper_test.php
index 02fc49c3d..3322b2475 100644
--- a/tests/codeigniter/helpers/number_helper_test.php
+++ b/tests/codeigniter/helpers/number_helper_test.php
@@ -1,13 +1,78 @@
 <?php
 
-require_once(BASEPATH.'helpers/number_helper.php');
+require_once BASEPATH.'helpers/number_helper.php';
 
 class Number_helper_test extends CI_TestCase
 {
 	
+	public function set_up()
+	{
+		// Grab the core lang class
+		$lang_cls = $this->ci_core_class('lang');
+		
+		// Mock away load, too much going on in there,
+		// we'll just check for the expected parameter
+		
+		$lang = $this->getMock($lang_cls, array('load'));
+		$lang->expects($this->once())
+			 ->method('load')
+			 ->with($this->equalTo('number'));
+		
+		// Assign the proper language array
+		
+		$lang->language = $this->_get_lang('number');
+		
+		// We don't have a controller, so just create
+		// a cheap class to act as our super object.
+		// Make sure it has a lang attribute.
+		
+		$obj = new StdClass;
+		$obj->lang = $lang;
+		$this->ci_instance($obj);
+	}
+	
+	// Quick helper to actually grab the language
+	// file. Consider moving this to ci_testcase?
+	public function _get_lang($name)
+	{
+		require BASEPATH.'language/english/'.$name.'_lang.php';
+		return $lang;
+	}
+	
 	public function test_byte_format()
 	{
-		// $this->assertEquals('456 Bytes', byte_format(456));
+		$this->assertEquals('456 Bytes', byte_format(456));
+	}
+	
+	public function test_kb_format()
+	{
+		$this->assertEquals('4.5 KB', byte_format(4567));
+	}
+	
+	public function test_kb_format_medium()
+	{
+		$this->assertEquals('44.6 KB', byte_format(45678));
 	}
 	
-}
\ No newline at end of file
+	public function test_kb_format_large()
+	{
+		$this->assertEquals('446.1 KB', byte_format(456789));
+	}
+	
+	public function test_mb_format()
+	{
+		$this->assertEquals('3.3 MB', byte_format(3456789));
+	}
+	
+	public function test_gb_format()
+	{
+		$this->assertEquals('1.8 GB', byte_format(1932735283.2));
+	}
+	
+	public function test_tb_format()
+	{
+		$this->assertEquals('112,283.3 TB', byte_format(123456789123456789));
+	}
+}
+
+// EOF
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 5d1e32b2fbae74e6f9e1ab2bdb6a3635579ef13e Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Tue, 3 May 2011 22:28:59 -0400
Subject: Added unit tests for date helper.

---
 tests/codeigniter/helpers/date_helper_test.php | 240 +++++++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 tests/codeigniter/helpers/date_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
new file mode 100644
index 000000000..f6048c324
--- /dev/null
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -0,0 +1,240 @@
+<?php
+require_once BASEPATH.'helpers/date_helper.php';
+
+class Date_helper_test extends CI_TestCase
+{
+	// ------------------------------------------------------------------------
+
+	public function test_now()
+	{
+		$this->markTestIncomplete('not implemented yet');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_mdate()
+	{
+		$time = time();
+		$expected = date("Y-m-d - h:i a", $time);
+		$test = mdate("%Y-%m-%d - %h:%i %a", $time);
+		$this->assertEquals($expected, $test);
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rfc822()
+	{
+		$time = time();
+		$format = 'DATE_RFC822';
+		$expected = date("D, d F y G:i:s O", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_atom()
+	{
+		$time = time();
+		$format = 'DATE_ATOM';
+		$expected = date("Y-m-d\TH:i:sO", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_cookie()
+	{
+		$time = time();
+		$format = 'DATE_COOKIE';
+		$expected = date("l, d-M-y H:i:s \U\T\C", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_iso8601()
+	{
+		$time = time();
+		$format = 'DATE_ISO8601';
+		$expected = date("Y-m-d\TH:i:sO", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rfc850()
+	{
+		$time = time();
+		$format = 'DATE_RFC850';
+		$expected = date("l, d-M-y H:i:s \U\T\C", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rfc1036()
+	{
+		$time = time();
+		$format = 'DATE_RFC1036';
+		$expected = date("D, d M y H:i:s O", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rfc1123()
+	{
+		$time = time();
+		$format = 'DATE_RFC1123';
+		$expected = date("D, d M Y H:i:s O", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rfc2822()
+	{
+		$time = time();
+		$format = 'DATE_RFC2822';
+		$expected = date("D, d M Y H:i:s O", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_rss()
+	{
+		$time = time();
+		$format = 'DATE_RSS';
+		$expected = date("D, d M Y H:i:s O", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_standard_date_w3c()
+	{
+		$time = time();
+		$format = 'DATE_W3C';
+		$expected = date("Y-m-d\TH:i:sO", $time);
+		$this->assertEquals($expected, standard_date($format, $time));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_timespan()
+	{
+		$this->markTestIncomplete('not implemented yet');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_days_in_month()
+	{
+		$this->assertEquals(30, days_in_month(06, 2005));
+		$this->assertEquals(28, days_in_month(02, 2011));
+		$this->assertEquals(29, days_in_month(02, 2012));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_local_to_gmt()
+	{
+		$this->markTestIncomplete('not implemented yet');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_gmt_to_local()
+	{
+		$timestamp = '1140153693';
+		$timezone = 'UM8';
+		$daylight_saving = TRUE;
+
+		$this->assertEquals(1140128493, gmt_to_local($timestamp, $timezone, $daylight_saving));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_mysql_to_unix()
+	{
+		$this->assertEquals(1164378225, mysql_to_unix(20061124092345));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_unix_to_human()
+	{
+		$time = time();
+		$this->assertEquals(date("Y-m-d h:i A"), unix_to_human($time));
+		$this->assertEquals(date("Y-m-d h:i:s A"), unix_to_human($time, TRUE, 'us'));
+		$this->assertEquals(date("Y-m-d H:i:s"), unix_to_human($time, TRUE, 'eu'));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_human_to_unix()
+	{
+		$time = time();
+		$this->markTestIncomplete('Failed Test');
+		// $this->assertEquals($time, human_to_unix(unix_to_human($time)));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_timezones()
+	{
+		$zones = array(
+			'UM12'		=> -12,
+			'UM11'		=> -11,
+			'UM10'		=> -10,
+			'UM95'		=> -9.5,
+			'UM9'		=> -9,
+			'UM8'		=> -8,
+			'UM7'		=> -7,
+			'UM6'		=> -6,
+			'UM5'		=> -5,
+			'UM45'		=> -4.5,
+			'UM4'		=> -4,
+			'UM35'		=> -3.5,
+			'UM3'		=> -3,
+			'UM2'		=> -2,
+			'UM1'		=> -1,
+			'UTC'		=> 0,
+			'UP1'		=> +1,
+			'UP2'		=> +2,
+			'UP3'		=> +3,
+			'UP35'		=> +3.5,
+			'UP4'		=> +4,
+			'UP45'		=> +4.5,
+			'UP5'		=> +5,
+			'UP55'		=> +5.5,
+			'UP575'		=> +5.75,
+			'UP6'		=> +6,
+			'UP65'		=> +6.5,
+			'UP7'		=> +7,
+			'UP8'		=> +8,
+			'UP875'		=> +8.75,
+			'UP9'		=> +9,
+			'UP95'		=> +9.5,
+			'UP10'		=> +10,
+			'UP105'		=> +10.5,
+			'UP11'		=> +11,
+			'UP115'		=> +11.5,
+			'UP12'		=> +12,
+			'UP1275'	=> +12.75,
+			'UP13'		=> +13,
+			'UP14'		=> +14
+		);
+
+		foreach ($zones AS $test => $expected)
+		{
+			$this->assertEquals($expected, timezones($test));
+		}
+
+		$this->assertArrayHasKey('UP3', timezones());
+		$this->assertEquals(0, timezones('non_existant'));
+	}
+}
+
+/* End of file date_helper_test.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 71644d683d0a15a6f7e04fabd0f51a4200d620b4 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Tue, 12 Jul 2011 21:45:40 -0400
Subject: Fixed some small issues in the date tests.

---
 tests/codeigniter/helpers/date_helper_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index f6048c324..63cf30bbe 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -26,7 +26,7 @@ class Date_helper_test extends CI_TestCase
 	{
 		$time = time();
 		$format = 'DATE_RFC822';
-		$expected = date("D, d F y G:i:s O", $time);
+		$expected = date("D, d M y H:i:s O", $time);
 		$this->assertEquals($expected, standard_date($format, $time));
 	}
 
@@ -158,7 +158,7 @@ class Date_helper_test extends CI_TestCase
 
 	public function test_mysql_to_unix()
 	{
-		$this->assertEquals(1164378225, mysql_to_unix(20061124092345));
+		$this->assertEquals(1344708680, mysql_to_unix(date("YYYY-MM-DD HH:MM:SS")));
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 92ff07ee199d17a4dccd84114da8b66a95a4f56d Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sat, 20 Aug 2011 16:57:48 -0500
Subject: Updating error in html_helper test_Ul

---
 tests/codeigniter/helpers/html_helper_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 706874f9e..553fc2bb1 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -51,7 +51,7 @@ EOH;
 
 		$list = array('foo', 'bar');
 
-		$this->assertEquals($expect, ul($list, ' class="test"'));
+		$this->assertEquals($expect, ul($list, 'class="test"'));
 
 		$this->assertEquals($expect, ul($list, array('class' => 'test')));
 	}
-- 
cgit v1.2.3-24-g4f1b


From 2e0f825c942e7e77a9aba451f3252762db0c86f5 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 21 Aug 2011 16:19:16 -0500
Subject: Fixing errors in date helper tests.

---
 tests/codeigniter/helpers/date_helper_test.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 63cf30bbe..c7a2c9b6e 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -158,7 +158,9 @@ class Date_helper_test extends CI_TestCase
 
 	public function test_mysql_to_unix()
 	{
-		$this->assertEquals(1344708680, mysql_to_unix(date("YYYY-MM-DD HH:MM:SS")));
+		$time = time();
+		$this->assertEquals($time, 
+				mysql_to_unix(date("Y-m-d H:i:s", $time)));
 	}
 
 	// ------------------------------------------------------------------------
@@ -166,9 +168,9 @@ class Date_helper_test extends CI_TestCase
 	public function test_unix_to_human()
 	{
 		$time = time();
-		$this->assertEquals(date("Y-m-d h:i A"), unix_to_human($time));
-		$this->assertEquals(date("Y-m-d h:i:s A"), unix_to_human($time, TRUE, 'us'));
-		$this->assertEquals(date("Y-m-d H:i:s"), unix_to_human($time, TRUE, 'eu'));
+		$this->assertEquals(date("Y-m-d h:i A", $time), unix_to_human($time));
+		$this->assertEquals(date("Y-m-d h:i:s A", $time), unix_to_human($time, TRUE, 'us'));
+		$this->assertEquals(date("Y-m-d H:i:s", $time), unix_to_human($time, TRUE, 'eu'));
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From d031ef79248bef6e188b6726682aac12b2fb8ff6 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 21 Aug 2011 16:19:56 -0500
Subject: ignoring a test in the inflector test.

---
 tests/codeigniter/helpers/inflector_helper_test.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index 34bc34ebb..ef1f54afc 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -24,6 +24,10 @@ class Inflector_helper_test extends CI_TestCase {
 	
 	public function test_plural()
 	{
+		$this->markTestSkipped(
+		              'abjectness is breaking.  SKipping for the time being.'
+		            );
+		
 		$strs = array(
 			'telly'			=> 'tellies',
 			'smelly'		=> 'smellies',
-- 
cgit v1.2.3-24-g4f1b


From 2c4b36620828173f3caf83fc7f6146bccb3688f4 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 21 Aug 2011 16:28:06 -0500
Subject: Adding url_helper unit test file.  GO!

---
 tests/codeigniter/helpers/url_helper_test.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/codeigniter/helpers/url_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
new file mode 100644
index 000000000..ea3fb0e4f
--- /dev/null
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once(BASEPATH.'helpers/url_helper.php');
+
+class Url_helper_test extends CI_TestCase
+{
+	public function test_url_title()
+	{
+		$words = array(
+			'foo bar /' 	=> 'foo-bar',
+			'\  testing 12' => 'testing-12'
+		);
+		
+		foreach ($words as $in => $out)
+		{
+			$this->assertEquals($out, url_title($in, 'dash', TRUE));
+		}		
+	}
+
+	// --------------------------------------------------------------------
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 2e00c2490fb544596fba06483ad1c1d626c1fd4f Mon Sep 17 00:00:00 2001
From: Stephen <stephen@flowsa.com>
Date: Sun, 28 Aug 2011 10:25:40 +0200
Subject: Added tests for CI_URI class. Made modifications to core class which
 helped with isolation for testing.

---
 tests/codeigniter/core/URI_test.php | 344 ++++++++++++++++++++++++++++++++++++
 1 file changed, 344 insertions(+)
 create mode 100644 tests/codeigniter/core/URI_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
new file mode 100644
index 000000000..87d921b11
--- /dev/null
+++ b/tests/codeigniter/core/URI_test.php
@@ -0,0 +1,344 @@
+<?php
+
+require BASEPATH.'core/URI.php';
+
+/**
+ * Extend the URI class
+ *  - override contructor
+ *  - override CLI detection
+ */
+class URI_extended extends CI_URI {
+	
+	public function __construct()
+	{
+		$test = CI_TestCase::instance();
+		$cls =& $test->ci_core_class('cfg');
+		
+		// set predictable config values
+		$test->ci_set_config(array(
+			'index_page'		=> 'index.php',
+			'base_url'			=> 'http://example.com/',
+			'subclass_prefix'	=> 'MY_'
+		));
+
+		$this->config = new $cls;	
+
+	}
+	
+	protected function _is_cli_request()
+	{
+		return FALSE;
+	}
+}
+
+class URI_test extends CI_TestCase {
+	
+	public function set_up()
+	{
+		$this->uri = new URI_extended();
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_set_uri_string()
+	{
+		// Slashes get killed
+		$this->uri->_set_uri_string('/');
+		
+		$a = '';
+		$b =& $this->uri->uri_string;
+		
+		$this->assertEquals($a, $b);
+		
+		$this->uri->_set_uri_string('nice/uri');
+		
+		$a = 'nice/uri';
+		
+		$this->assertEquals($a, $b);
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function test_fetch_uri_string()
+	{
+		define('SELF', 'index.php');
+
+		// uri_protocol: AUTO
+		$this->uri->config->set_item('uri_protocol', 'AUTO');
+		
+		// Test a variety of request uris
+		$requests = array(
+			'/index.php/controller/method' => 'controller/method',
+			'/index.php?/controller/method' => 'controller/method',
+			'/index.php?/controller/method/?var=foo' => 'controller/method'
+		);
+		
+		foreach($requests as $request => $expected)
+		{
+			$_SERVER['SCRIPT_NAME'] = '/index.php';
+			$_SERVER['REQUEST_URI'] = $request;
+			
+			$this->uri->_fetch_uri_string();
+			$this->assertEquals($expected, $this->uri->uri_string );
+		}
+		
+		// Test a subfolder
+		$_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
+		$_SERVER['REQUEST_URI'] = '/subfolder/index.php/controller/method';
+		
+		$this->uri->_fetch_uri_string();
+		
+		$a = 'controller/method';
+		$b = $this->uri->uri_string;
+		
+		$this->assertEquals($a, $b);
+		
+		// death to request uri
+		unset($_SERVER['REQUEST_URI']);
+		
+		// life to path info
+		$_SERVER['PATH_INFO'] = '/controller/method/';
+		
+		$this->uri->_fetch_uri_string();
+		
+		$a = '/controller/method/';
+		$b =& $this->uri->uri_string;
+
+		$this->assertEquals($a, $b);
+		
+		// death to path info
+		// At this point your server must be seriously drunk
+		unset($_SERVER['PATH_INFO']);
+		
+		$_SERVER['QUERY_STRING'] = '/controller/method/';
+		
+		$this->uri->_fetch_uri_string();
+
+		$a = '/controller/method/';
+		$b = $this->uri->uri_string;
+		
+		$this->assertEquals($a, $b);
+		
+		// At this point your server is a labotomy victim
+		
+		unset($_SERVER['QUERY_STRING']);
+		
+		$_GET['/controller/method/'] = '';
+		
+		$this->uri->_fetch_uri_string();
+		$this->assertEquals($a, $b);
+
+		// Test coverage implies that these will work
+		// uri_protocol: REQUEST_URI
+		// uri_protocol: CLI
+				
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function test_explode_segments()
+	{
+		// Lets test the function's ability to clean up this mess
+		$uris = array(
+			'test/uri' => array('test', 'uri'),
+			'/test2/uri2' => array('test2', 'uri2'),
+			'//test3/test3///' => array('test3', 'test3')
+		);
+		
+		foreach($uris as $uri => $a)
+		{
+			$this->uri->segments = array();
+			$this->uri->uri_string = $uri;
+			$this->uri->_explode_segments();
+			
+			$b = $this->uri->segments;
+			
+			$this->assertEquals($a, $b);
+		}
+		
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_filter_uri()
+	{
+		$this->uri->config->set_item('enable_query_strings', FALSE);
+		$this->uri->config->set_item('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->config->set_item('enable_query_strings', FALSE);
+		$this->uri->config->set_item('permitted_uri_chars', 'a-z 0-9~%.:_\-()$');
+
+		$str = $this->uri->_filter_uri('$destroy_app(foo)');
+		
+		$this->assertEquals($str, '&#36;destroy_app&#40;foo&#41;');
+	}
+
+	// --------------------------------------------------------------------
+
+    public function test_filter_uri_throws_error()
+    {
+		$this->setExpectedException('Exception');
+		
+		$this->uri->config->set_item('enable_query_strings', FALSE);
+		$this->uri->config->set_item('permitted_uri_chars', 'a-z 0-9~%.:_\-');
+		$this->uri->_filter_uri('$this()');
+    }
+
+	// --------------------------------------------------------------------
+
+	public function test_remove_url_suffix()
+	{
+		$this->uri->config->set_item('url_suffix', '.html');
+		
+		$this->uri->uri_string = 'controller/method/index.html';
+		$this->uri->_remove_url_suffix();
+		
+		$this->assertEquals($this->uri->uri_string, 'controller/method/index');
+		
+		$this->uri->uri_string = 'controller/method/index.htmlify.html';
+		$this->uri->_remove_url_suffix();
+		
+		$this->assertEquals($this->uri->uri_string, 'controller/method/index.htmlify');
+	}
+
+	// --------------------------------------------------------------------
+	
+	public function test_segment()
+	{
+		$this->uri->segments = array(1 => 'controller');
+		$this->assertEquals($this->uri->segment(1), 'controller');
+		$this->assertEquals($this->uri->segment(2, 'default'), 'default');
+	}
+	
+	// --------------------------------------------------------------------
+
+	public function test_rsegment()
+	{
+		$this->uri->rsegments = array(1 => 'method');
+		$this->assertEquals($this->uri->rsegment(1), 'method');
+		$this->assertEquals($this->uri->rsegment(2, 'default'), 'default');
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_uri_to_assoc()
+	{
+		$this->uri->segments = array('a', '1', 'b', '2', 'c', '3');
+		
+		$a = array('a' => '1', 'b' => '2', 'c' => '3');
+		$b = $this->uri->uri_to_assoc(1);
+		$this->assertEquals($a, $b);
+		
+		$a = array('b' => '2', 'c' => '3');
+		$b = $this->uri->uri_to_assoc(3);
+		$this->assertEquals($a, $b);
+		
+		
+		$this->uri->keyval = array(); // reset cache
+				
+		$this->uri->segments = array('a', '1', 'b', '2', 'c');
+		
+		$a = array('a' => '1', 'b' => '2', 'c' => FALSE);
+		$b = $this->uri->uri_to_assoc(1);
+		$this->assertEquals($a, $b);
+		
+		$this->uri->keyval = array(); // reset cache
+		
+		$this->uri->segments = array('a', '1');
+		
+		// test default
+		$a = array('a' => '1', 'b' => FALSE);
+		$b = $this->uri->uri_to_assoc(1, array('a', 'b'));
+		$this->assertEquals($a, $b);
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_ruri_to_assoc()
+	{
+		$this->uri->rsegments = array('x', '1', 'y', '2', 'z', '3');
+		
+		$a = array('x' => '1', 'y' => '2', 'z' => '3');
+		$b = $this->uri->ruri_to_assoc(1);
+		$this->assertEquals($a, $b);
+		
+		$a = array('y' => '2', 'z' => '3');
+		$b = $this->uri->ruri_to_assoc(3);
+		$this->assertEquals($a, $b);
+		
+		
+		$this->uri->keyval = array(); // reset cache
+				
+		$this->uri->rsegments = array('x', '1', 'y', '2', 'z');
+		
+		$a = array('x' => '1', 'y' => '2', 'z' => FALSE);
+		$b = $this->uri->ruri_to_assoc(1);
+		$this->assertEquals($a, $b);
+		
+		$this->uri->keyval = array(); // reset cache
+		
+		$this->uri->rsegments = array('x', '1');
+		
+		// test default
+		$a = array('x' => '1', 'y' => FALSE);
+		$b = $this->uri->ruri_to_assoc(1, array('x', 'y'));
+		$this->assertEquals($a, $b);
+
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_assoc_to_uri()
+	{
+		$this->uri->config->set_item('uri_string_slashes', 'none');
+		
+		$arr = array('a' => 1, 'b' => 2);
+		$a = 'a/1/b/2';
+		$b = $this->uri->assoc_to_uri($arr);
+		$this->assertEquals($a, $b);
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_slash_segment()
+	{
+		$this->uri->segments[1] = 'segment';
+		$this->uri->rsegments[1] = 'segment';
+
+		$a = '/segment/';
+		$b = $this->uri->slash_segment(1, 'both');
+		$this->assertEquals($a, $b);
+		$b = $this->uri->slash_rsegment(1, 'both');
+		$this->assertEquals($a, $b);
+		
+		$a = '/segment';
+		$b = $this->uri->slash_segment(1, 'leading');
+		$this->assertEquals($a, $b);
+		$b = $this->uri->slash_rsegment(1, 'leading');
+		$this->assertEquals($a, $b);
+		
+		$a = 'segment/';
+		$b = $this->uri->slash_segment(1, 'trailing');
+		$this->assertEquals($a, $b);
+		$b = $this->uri->slash_rsegment(1, 'trailing');
+		$this->assertEquals($a, $b);
+	}
+
+
+}
+// END URI_test Class
+
+/* End of file URI_test.php */
+/* Location: ./tests/core/URI_test.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From cf1926acb352f1d80cab7c1bc7e1ec5457a2b43d Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Mon, 29 Aug 2011 00:00:51 -0400
Subject: Removed beginning slash in expected for site_url.

---
 tests/codeigniter/core/Config_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
index b6c57da70..30f0cc61d 100644
--- a/tests/codeigniter/core/Config_test.php
+++ b/tests/codeigniter/core/Config_test.php
@@ -67,13 +67,13 @@ class Config_test extends CI_TestCase {
 		
 		$this->config->set_item('enable_query_strings', FALSE);
 
-		$this->assertEquals('/index.php/test', $this->config->site_url('test'));
-		$this->assertEquals('/index.php/test/1', $this->config->site_url(array('test', '1')));
+		$this->assertEquals('index.php/test', $this->config->site_url('test'));
+		$this->assertEquals('index.php/test/1', $this->config->site_url(array('test', '1')));
 		
 		$this->config->set_item('enable_query_strings', TRUE);
 
-		$this->assertEquals('/index.php?test', $this->config->site_url('test'));
-		$this->assertEquals('/index.php?0=test&1=1', $this->config->site_url(array('test', '1')));
+		$this->assertEquals('index.php?test', $this->config->site_url('test'));
+		$this->assertEquals('index.php?0=test&1=1', $this->config->site_url(array('test', '1')));
 		
 		$this->config->set_item('base_url', $base_url);
 
-- 
cgit v1.2.3-24-g4f1b


From 78ec0603601001b6f0b4d0c4ef6087d32a133a63 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 27 Nov 2011 00:48:56 -0500
Subject: Added tests for new increment_string

---
 tests/codeigniter/helpers/string_helper_test.php | 65 ++++++++++++++----------
 1 file changed, 38 insertions(+), 27 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index 5e0ee45de..2d7f96aa5 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -10,14 +10,14 @@ class String_helper_test extends CI_TestCase
 			'//Slashes//\/'	=> 'Slashes//\\',
 			'/var/www/html/'	=> 'var/www/html'
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, trim_slashes($str));
 		}
 	}
-	
-	// --------------------------------------------------------------------	
+
+	// --------------------------------------------------------------------
 
 	public function test_strip_quotes()
 	{
@@ -25,30 +25,30 @@ class String_helper_test extends CI_TestCase
 			'"me oh my!"'		=> 'me oh my!',
 			"it's a winner!"	=> 'its a winner!',
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, strip_quotes($str));
 		}
 	}
 
-	// --------------------------------------------------------------------	
-	
+	// --------------------------------------------------------------------
+
 	public function test_quotes_to_entities()
 	{
 		$strs = array(
 			'"me oh my!"'		=> '&quot;me oh my!&quot;',
 			"it's a winner!"	=> 'it&#39;s a winner!',
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, quotes_to_entities($str));
-		}		
+		}
 	}
 
-	// --------------------------------------------------------------------	
-	
+	// --------------------------------------------------------------------
+
 	public function test_reduce_double_slashes()
 	{
 		$strs = array(
@@ -56,57 +56,56 @@ class String_helper_test extends CI_TestCase
 			'//var/www/html/example.com/'	=> '/var/www/html/example.com/',
 			'/var/www/html//index.php'		=> '/var/www/html/index.php'
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, reduce_double_slashes($str));
-		}		
+		}
 	}
 
-	// --------------------------------------------------------------------	
-	
+	// --------------------------------------------------------------------
+
 	public function test_reduce_multiples()
 	{
 		$strs = array(
 			'Fred, Bill,, Joe, Jimmy'	=> 'Fred, Bill, Joe, Jimmy',
 			'Ringo, John, Paul,,'		=> 'Ringo, John, Paul,'
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, reduce_multiples($str));
 		}
-		
+
 		$strs = array(
 			'Fred, Bill,, Joe, Jimmy'	=> 'Fred, Bill, Joe, Jimmy',
 			'Ringo, John, Paul,,'		=> 'Ringo, John, Paul'
-		);		
+		);
 
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
-		}		
+		}
 	}
-	
-	// --------------------------------------------------------------------	
-	
+
+	// --------------------------------------------------------------------
+
 	public function test_repeater()
 	{
 		$strs = array(
 			'a'			=> 'aaaaaaaaaa',
 			'&nbsp;'	=> '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
 			'<br>'		=> '<br><br><br><br><br><br><br><br><br><br>'
-			
+
 		);
-		
+
 		foreach ($strs as $str => $expect)
 		{
 			$this->assertEquals($expect, repeater($str, 10));
 		}
-	}	
-
-	// --------------------------------------------------------------------	
+	}
 
+	// --------------------------------------------------------------------
 
 	public function test_random_string()
 	{
@@ -114,5 +113,17 @@ class String_helper_test extends CI_TestCase
 		$this->assertEquals(32, strlen(random_string('unique', 16)));
 		$this->assertInternalType('string', random_string('numeric', 16));
 	}
-	
+
+	// --------------------------------------------------------------------
+
+	public function test_increment_string()
+	{
+		$this->assertEquals('my-test_1', increment_string('my-test'));
+		$this->assertEquals('my-test-1', increment_string('my-test', '-'));
+		$this->assertEquals('file_5', increment_string('file_4'));
+		$this->assertEquals('file-5', increment_string('file-4', '-'));
+		$this->assertEquals('file-5', increment_string('file-4', '-'));
+		$this->assertEquals('file-1', increment_string('file', '-', '1'));
+		$this->assertEquals(124, increment_string('123', ''));
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 051a317e1e51c2ab50920e3ced50732bc7041bd7 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 27 Nov 2011 00:49:25 -0500
Subject: Fixed accept lang test to account for boolean results.

---
 tests/codeigniter/libraries/User_agent_test.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/User_agent_test.php b/tests/codeigniter/libraries/User_agent_test.php
index 277c12ed0..6f9e87196 100644
--- a/tests/codeigniter/libraries/User_agent_test.php
+++ b/tests/codeigniter/libraries/User_agent_test.php
@@ -8,17 +8,17 @@ class UserAgent_test extends CI_TestCase
 {
 	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
 	protected $_mobile_ua = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
-	
+
 	public function set_up()
 	{
 		// set a baseline user agent
 		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
-		
+
 		$obj = new StdClass;
 		$obj->agent = new CI_User_agent();
-		
+
 		$this->ci_instance($obj);
-		
+
 		$this->agent = $obj->agent;
 	}
 
@@ -27,10 +27,10 @@ class UserAgent_test extends CI_TestCase
 	public function test_accept_lang()
 	{
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en';
-
-		$this->assertEquals('en', $this->agent->accept_lang());
-
+		$this->assertTrue($this->agent->accept_lang());
 		unset($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		$this->assertTrue($this->agent->accept_lang('en'));
+		$this->assertFalse($this->agent->accept_lang('fr'));
 	}
 
 	// --------------------------------------------------------------------
@@ -70,19 +70,19 @@ class UserAgent_test extends CI_TestCase
 		$this->assertEquals('', $this->agent->robot());
 		$this->assertEquals('', $this->agent->referrer());
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	public function test_charsets()
 	{
 		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'utf8';
-		
+
 		$charsets = $this->agent->charsets();
-		
+
 		$this->assertEquals('utf8', $charsets[0]);
-		
+
 		unset($_SERVER['HTTP_ACCEPT_CHARSET']);
-		
+
 		$this->assertFalse($this->agent->accept_charset());
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 940761464e6f7788bdce0bad55f41850ad73eb89 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 27 Nov 2011 00:59:07 -0500
Subject: Added tests for removing extra dashes in url title.

---
 tests/codeigniter/helpers/url_helper_test.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index ea3fb0e4f..b5384eaef 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -10,13 +10,25 @@ class Url_helper_test extends CI_TestCase
 			'foo bar /' 	=> 'foo-bar',
 			'\  testing 12' => 'testing-12'
 		);
-		
+
 		foreach ($words as $in => $out)
 		{
 			$this->assertEquals($out, url_title($in, 'dash', TRUE));
-		}		
+		}
 	}
 
 	// --------------------------------------------------------------------
 
+	public function test_url_title_extra_dashes()
+	{
+		$words = array(
+			'_foo bar_' 	=> 'foo_bar',
+			'_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS'
+		);
+
+		foreach ($words as $in => $out)
+		{
+			$this->assertEquals($out, url_title($in, 'underscore'));
+		}
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 32b6780d6e75a39e62784cec998ee2b5f69ee77e Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 27 Nov 2011 01:10:09 -0500
Subject: Added prep_url and auto_link tests

---
 tests/codeigniter/helpers/url_helper_test.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index b5384eaef..30ba4a417 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -31,4 +31,27 @@ class Url_helper_test extends CI_TestCase
 			$this->assertEquals($out, url_title($in, 'underscore'));
 		}
 	}
+
+	// --------------------------------------------------------------------
+
+	public function test_prep_url()
+	{
+		$this->assertEquals('http://codeigniter.com', prep_url('codeigniter.com'));
+		$this->assertEquals('http://www.codeigniter.com', prep_url('www.codeigniter.com'));
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_auto_link_url()
+	{
+		$strings = array(
+			'www.codeigniter.com test' => '<a href="http://www.codeigniter.com">http://www.codeigniter.com</a> test',
+			'This is my noreply@codeigniter.com test' => 'This is my noreply@codeigniter.com test',
+		);
+
+		foreach ($strings as $in => $out)
+		{
+			$this->assertEquals($out, auto_link($in, 'url'));
+		}
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From d90e1a0fb541ee94459a20cf8b0726aebaec9692 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 27 Nov 2011 14:12:46 -0500
Subject: Added unit test to confirm pull request #675

---
 tests/codeigniter/helpers/url_helper_test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index 30ba4a417..51a8cc7c0 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -47,6 +47,21 @@ class Url_helper_test extends CI_TestCase
 		$strings = array(
 			'www.codeigniter.com test' => '<a href="http://www.codeigniter.com">http://www.codeigniter.com</a> test',
 			'This is my noreply@codeigniter.com test' => 'This is my noreply@codeigniter.com test',
+			'<br />www.google.com' => '<br /><a href="http://www.google.com">http://www.google.com</a>',
+		);
+
+		foreach ($strings as $in => $out)
+		{
+			$this->assertEquals($out, auto_link($in, 'url'));
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_pull_675()
+	{
+		$strings = array(
+			'<br />www.google.com' => '<br /><a href="http://www.google.com">http://www.google.com</a>',
 		);
 
 		foreach ($strings as $in => $out)
-- 
cgit v1.2.3-24-g4f1b


From e39728c55d3745ff60742d7dd1c5114ec690d1db Mon Sep 17 00:00:00 2001
From: tiyowan <tiyowan@gmail.com>
Date: Sat, 10 Mar 2012 02:10:44 +0400
Subject: Fix issue #1148

Rewrote tests to use reflection to access protected/private
functions of Table class. This fixes fatal errors that
prevent the test suite from executing other tests.

Signed-off-by: tiyowan <tiyowan@gmail.com>
---
 tests/codeigniter/libraries/Table_test.php | 64 +++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 23 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 133179f3a..045216b16 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -106,42 +106,50 @@ class Table_test extends CI_TestCase
 		// test what would be discreet args,
 		// basically means a single array as the calling method
 		// will use func_get_args()
+		
+		$reflectionOfTable = new ReflectionClass($this->table);
+		$method = $reflectionOfTable->getMethod('_prep_args');
+		
+		$method->setAccessible(true);
+			
 		$this->assertEquals(
 			$expected,
-			$this->table->_prep_args(array(
-				'name', 'color', 'size'
-			)),
-		'discreet');
-		
+			$method->invokeArgs(
+				$this->table, array(array('name', 'color', 'size'), 'discreet')
+			)
+		);
 		
 		// test what would be a single array argument. Again, nested
 		// due to func_get_args on calling methods
 		$this->assertEquals(
 			$expected,
-			$this->table->_prep_args(array(
-				 array('name', 'color', 'size')
-			)),
-		'array');
+			$method->invokeArgs(
+				$this->table, array(array('name', 'color', 'size'), 'array')
+			)
+		);
 		
 		
 		// with cell attributes
 		
 		// need to add that new argument row to our expected outcome
 		$expected[] = array('data' => 'weight', 'class' => 'awesome');
-				
+
 		$this->assertEquals(
 			$expected,
-			$this->table->_prep_args(array(
-				array('name', 'color', 'size',
-					array('data' => 'weight', 'class' => 'awesome')
-				)
-			)),
-		'attributes');
+			$method->invokeArgs(
+				$this->table, array(array('name', 'color', 'size', array('data' => 'weight', 'class' => 'awesome')), 'attributes')
+			)
+		);
 	}
 	
 	public function test_default_template_keys()
 	{
-		$deft_template = $this->table->_default_template();
+		$reflectionOfTable = new ReflectionClass($this->table);
+		$method = $reflectionOfTable->getMethod('_default_template');
+		
+		$method->setAccessible(true);
+		
+		$deft_template = $method->invoke($this->table);
 		$keys = array(
 			'table_open',
 			'thead_open', 'thead_close',
@@ -160,18 +168,23 @@ class Table_test extends CI_TestCase
 	
 	public function test_compile_template()
 	{
+		$reflectionOfTable = new ReflectionClass($this->table);
+		$method = $reflectionOfTable->getMethod('_compile_template');
+		
+		$method->setAccessible(true);
+		
 		$this->assertFalse($this->table->set_template('invalid_junk'));
 		
 		// non default key
 		$this->table->set_template(array('nonsense' => 'foo'));
-		$this->table->_compile_template();
+		$method->invoke($this->table);
 		
 		$this->assertArrayHasKey('nonsense', $this->table->template);
 		$this->assertEquals('foo', $this->table->template['nonsense']);
 		
 		// override default
 		$this->table->set_template(array('table_close' => '</table junk>'));
-		$this->table->_compile_template();
+		$method->invoke($this->table);
 		
 		$this->assertArrayHasKey('table_close', $this->table->template);
 		$this->assertEquals('</table junk>', $this->table->template['table_close']);
@@ -242,8 +255,13 @@ class Table_test extends CI_TestCase
 	
 	public function test_set_from_array()
 	{
-		$this->assertFalse($this->table->_set_from_array('bogus'));
-		$this->assertFalse($this->table->_set_from_array(array()));
+		$reflectionOfTable = new ReflectionClass($this->table);
+		$method = $reflectionOfTable->getMethod('_set_from_array');
+		
+		$method->setAccessible(true);
+				
+		$this->assertFalse($method->invokeArgs($this->table, array('bogus')));
+		$this->assertFalse($method->invoke($this->table, array()));
 		
 		$data = array(
 			array('name', 'color', 'number'),
@@ -251,7 +269,7 @@ class Table_test extends CI_TestCase
 			array('Katie', 'Blue')				
 		);
 		
-		$this->table->_set_from_array($data, FALSE);
+		$method->invokeArgs($this->table, array($data, FALSE));
 		$this->assertEmpty($this->table->heading);
 		
 		$this->table->clear();
@@ -267,7 +285,7 @@ class Table_test extends CI_TestCase
 			array('data' => 'Blue'),
 		);
 		
-		$this->table->_set_from_array($data);
+		$method->invokeArgs($this->table, array($data));
 		$this->assertEquals(count($this->table->rows), 2);
 		
 		$this->assertEquals(
-- 
cgit v1.2.3-24-g4f1b


From 7729faa553c0ec93a13533003a53dc66078467a8 Mon Sep 17 00:00:00 2001
From: Hamza Bhatti <tiyowan@gmail.com>
Date: Sat, 10 Mar 2012 13:07:05 +0400
Subject: 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.
---
 tests/codeigniter/core/Loader_test.php | 12 ++++++------
 tests/codeigniter/core/URI_test.php    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/codeigniter')

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 */
-- 
cgit v1.2.3-24-g4f1b


From 8749bc7e836c196dfef37d3b7b5a67736a15092c Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 11 Mar 2012 05:43:45 +0700
Subject: Fix incomplete and skipped test

---
 tests/codeigniter/core/Lang_test.php               | 10 ++--
 tests/codeigniter/helpers/date_helper_test.php     | 56 +++++++++++++++++++---
 .../codeigniter/helpers/inflector_helper_test.php  |  6 +--
 tests/codeigniter/libraries/Table_test.php         | 51 ++++++++++++++++----
 4 files changed, 98 insertions(+), 25 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index dcc3d0879..a414f0ace 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -6,6 +6,9 @@ class Lang_test extends CI_TestCase {
 	
 	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');
 		$this->lang = new $cls;
 	}
@@ -14,17 +17,14 @@ class Lang_test extends CI_TestCase {
 	
 	public function test_load()
 	{
-		// get_config needs work
-		$this->markTestIncomplete('get_config needs work');
-		//$this->assertTrue($this->lang->load('profiler'));
+		$this->assertTrue($this->lang->load('profiler', 'english'));
 	}
 	
 	// --------------------------------------------------------------------
 
 	public function test_line()
 	{
-		$this->markTestIncomplete('get_config needs work');
-		
+		$this->assertTrue($this->lang->load('profiler', 'english'));
 		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
 	}
 	
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index c7a2c9b6e..662d16485 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -5,9 +5,39 @@ class Date_helper_test extends CI_TestCase
 {
 	// ------------------------------------------------------------------------
 
-	public function test_now()
+	public function test_now_local()
 	{
-		$this->markTestIncomplete('not implemented yet');
+		// This stub job, is simply to cater $config['time_reference']
+		$config = $this->getMock('CI_Config');
+		$config->expects($this->any())
+			   ->method('item')
+			   ->will($this->returnValue('local'));
+		
+		// Add the stub to our test instance
+		$this->ci_instance_var('config', $config);
+
+		$expected = time();
+		$test = now();
+		$this->assertEquals($expected, $test);
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_now_gmt()
+	{
+		// This stub job, is simply to cater $config['time_reference']
+		$config = $this->getMock('CI_Config');
+		$config->expects($this->any())
+			   ->method('item')
+			   ->will($this->returnValue('gmt'));
+		
+		// Add the stub to our stdClass
+		$this->ci_instance_var('config', $config);
+
+		$t = time();
+		$expected = mktime(gmdate("H", $t), gmdate("i", $t), gmdate("s", $t), gmdate("m", $t), gmdate("d", $t), gmdate("Y", $t));
+		$test = now();
+		$this->assertEquals($expected, $test);
 	}
 
 	// ------------------------------------------------------------------------
@@ -124,7 +154,16 @@ class Date_helper_test extends CI_TestCase
 
 	public function test_timespan()
 	{
-		$this->markTestIncomplete('not implemented yet');
+		$loader_cls = $this->ci_core_class('load');
+		$this->ci_instance_var('load', new $loader_cls);
+
+		$lang_cls = $this->ci_core_class('lang');
+		$this->ci_instance_var('lang', new $lang_cls);
+
+		$this->assertEquals('1 Second', timespan(time(), time()+1));
+		$this->assertEquals('1 Minute', timespan(time(), time()+60));
+		$this->assertEquals('1 Hour', timespan(time(), time()+3600));
+		$this->assertEquals('2 Hours', timespan(time(), time()+7200));
 	}
 
 	// ------------------------------------------------------------------------
@@ -140,7 +179,9 @@ class Date_helper_test extends CI_TestCase
 
 	public function test_local_to_gmt()
 	{
-		$this->markTestIncomplete('not implemented yet');
+		$t = time();
+		$expected = mktime(gmdate("H", $t), gmdate("i", $t), gmdate("s", $t), gmdate("m", $t), gmdate("d", $t), gmdate("Y", $t));
+		$this->assertEquals($expected, local_to_gmt($t));
 	}
 
 	// ------------------------------------------------------------------------
@@ -177,9 +218,10 @@ class Date_helper_test extends CI_TestCase
 
 	public function test_human_to_unix()
 	{
-		$time = time();
-		$this->markTestIncomplete('Failed Test');
-		// $this->assertEquals($time, human_to_unix(unix_to_human($time)));
+		$date = '2000-12-31 10:00:00 PM';
+		$expected = strtotime($date);
+		$this->assertEquals($expected, human_to_unix($date));
+		$this->assertFalse(human_to_unix());
 	}
 
 	// ------------------------------------------------------------------------
diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index ef1f54afc..e476f6dc8 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -24,14 +24,10 @@ class Inflector_helper_test extends CI_TestCase {
 	
 	public function test_plural()
 	{
-		$this->markTestSkipped(
-		              'abjectness is breaking.  SKipping for the time being.'
-		            );
-		
 		$strs = array(
 			'telly'			=> 'tellies',
 			'smelly'		=> 'smellies',
-			'abjectness'	=> 'abjectness',
+			'abjectness'	=> 'abjectnesses', // ref : http://en.wiktionary.org/wiki/abjectnesses
 			'smell'			=> 'smells',
 			'witch'			=> 'witches'
 		);
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 045216b16..0208a465a 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -194,11 +194,8 @@ class Table_test extends CI_TestCase
 	{
 		// Test bogus parameters
 		$this->assertFalse($this->table->make_columns('invalid_junk'));
-		$this->assertFalse( $this->table->make_columns(array()));
-		// $this->assertFalse(
-		// 	$this->table->make_columns(array('one', 'two')),
-		// 	'2.5' // not an integer!
-		// );
+		$this->assertFalse($this->table->make_columns(array()));
+		$this->assertFalse($this->table->make_columns(array('one', 'two'), '2.5'));
 		
 		
 		// Now on to the actual column creation
@@ -222,8 +219,6 @@ class Table_test extends CI_TestCase
 			),
 			$this->table->make_columns($five_values, 3)
 		);
-		
-		$this->markTestSkipped('Look at commented assertFalse above');
 	}
 	
 	public function test_clear()
@@ -301,7 +296,47 @@ class Table_test extends CI_TestCase
 	
 	function test_set_from_object()
 	{
-		$this->markTestSkipped('Not yet implemented.');
+		$reflectionOfTable = new ReflectionClass($this->table);
+		$method = $reflectionOfTable->getMethod('_set_from_object');
+		
+		$method->setAccessible(true);
+
+		// Make a stub of query instance
+		$query = new CI_TestCase();
+		$query->list_fields = function(){
+			return array('name', 'email');
+		};
+		$query->result_array = function(){
+			return array(
+					array('name' => 'John Doe', 'email' => 'john@doe.com'),
+					array('name' => 'Foo Bar', 'email' => 'foo@bar.com'),
+				);
+		};
+		$query->num_rows = function(){
+			return 2;
+		};
+
+		$expected_heading = array(
+			array('data' => 'name'),
+			array('data' => 'email')
+		);
+
+		$expected_second = array(
+			'name' => array('data' => 'Foo Bar'),
+			'email' => array('data' => 'foo@bar.com'),
+		);
+
+		$method->invokeArgs($this->table, array($query));
+
+		$this->assertEquals(
+			$expected_heading,
+			$this->table->heading
+		);
+		
+		$this->assertEquals(
+			$expected_second,
+			$this->table->rows[1]
+		);
 	}
 	
 	// Test main generate method
-- 
cgit v1.2.3-24-g4f1b


From 575895f66884904617fcdd60e9db894ca1786ca9 Mon Sep 17 00:00:00 2001
From: Hamza Bhatti <tiyowan@gmail.com>
Date: Sun, 11 Mar 2012 11:58:31 +0400
Subject: Add unit tests for directory helper

---
 .../codeigniter/helpers/directory_helper_test.php  | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 tests/codeigniter/helpers/directory_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php
new file mode 100644
index 000000000..3fae81b82
--- /dev/null
+++ b/tests/codeigniter/helpers/directory_helper_test.php
@@ -0,0 +1,42 @@
+<?php
+
+require_once 'vfsStream/vfsStream.php';
+require BASEPATH.'helpers/directory_helper.php';
+
+class Directory_helper_test extends CI_TestCase
+{
+	public function set_up()
+	{
+		vfsStreamWrapper::register();
+		vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir'));
+		
+		$this->_test_dir = vfsStreamWrapper::getRoot();
+	}	
+	
+	public function test_directory_map()
+	{
+		$structure = array('libraries' => array('benchmark.html' => '', 'database' =>
+			array('active_record.html' => '', 'binds.html' => ''), 'email.html' => '', '.hiddenfile.txt' => ''));
+		
+		vfsStream::create($structure, $this->_test_dir);
+
+		// test default recursive behavior
+		$expected = array('libraries' => array('benchmark.html', 'database' =>
+			array('active_record.html', 'binds.html'), 'email.html'));
+			
+		$this->assertEquals($expected, directory_map(vfsStream::url('testDir')));
+
+		// test recursion depth behavior
+		$expected = array('libraries');
+			
+		$this->assertEquals($expected, directory_map(vfsStream::url('testDir'), 1));
+
+		// test detection of hidden files
+		$expected = array('libraries' => array('benchmark.html', 'database' =>
+			array('active_record.html', 'binds.html'), 'email.html', '.hiddenfile.txt'));
+			
+		$this->assertEquals($expected, directory_map(vfsStream::url('testDir'), FALSE, TRUE));
+  }  
+}
+
+/* End of file directory_helper_test.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 756516dac202e376cd16c4dbc11a1292f8cca4e6 Mon Sep 17 00:00:00 2001
From: Hamza Bhatti <tiyowan@gmail.com>
Date: Mon, 12 Mar 2012 09:47:34 +0400
Subject: Add unit tests for path helper

---
 tests/codeigniter/helpers/path_helper_test.php | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/codeigniter/helpers/path_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/path_helper_test.php b/tests/codeigniter/helpers/path_helper_test.php
new file mode 100644
index 000000000..591214bde
--- /dev/null
+++ b/tests/codeigniter/helpers/path_helper_test.php
@@ -0,0 +1,29 @@
+<?php
+
+require BASEPATH . 'helpers/path_helper.php';
+
+class Path_helper_test extends CI_TestCase 
+{
+	public function test_set_realpath()
+	{				
+		$expected = getcwd() . '/';
+		$this->assertEquals($expected, set_realpath(getcwd()));		
+	}
+
+	public function test_set_realpath_nonexistent_directory()
+	{
+		$expected = '/path/to/nowhere';
+		$this->assertEquals($expected, set_realpath('/path/to/nowhere', FALSE));
+	}
+
+	public function test_set_realpath_error_trigger()
+	{
+		$this->setExpectedException(
+				'RuntimeException', 'CI Error: Not a valid path: /path/to/nowhere'
+		);
+
+		set_realpath('/path/to/nowhere', TRUE);
+	}
+}
+
+/* End of file path_helper_test.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 3ec336fc6020e3126b8be7d2b3516b4e40abd87d Mon Sep 17 00:00:00 2001
From: Hamza Bhatti <tiyowan@gmail.com>
Date: Wed, 14 Mar 2012 13:50:23 +0400
Subject: Add fix for Windows OS

---
 tests/codeigniter/helpers/path_helper_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/path_helper_test.php b/tests/codeigniter/helpers/path_helper_test.php
index 591214bde..2e6cc6391 100644
--- a/tests/codeigniter/helpers/path_helper_test.php
+++ b/tests/codeigniter/helpers/path_helper_test.php
@@ -6,7 +6,7 @@ class Path_helper_test extends CI_TestCase
 {
 	public function test_set_realpath()
 	{				
-		$expected = getcwd() . '/';
+		$expected = getcwd() . DIRECTORY_SEPARATOR;
 		$this->assertEquals($expected, set_realpath(getcwd()));		
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 2a6a6162ff6de8c2114c50254a5046ee6822c5dc Mon Sep 17 00:00:00 2001
From: Hamza Bhatti <tiyowan@gmail.com>
Date: Thu, 15 Mar 2012 09:45:29 +0400
Subject: Change unit tests to provide one hundred percent code coverage

- Add value to test is_countable() conditional in test_singular()
- Add value to test is_countable() conditional in test_plural()
---
 tests/codeigniter/helpers/inflector_helper_test.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index e476f6dc8..472e28adb 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -11,7 +11,8 @@ class Inflector_helper_test extends CI_TestCase {
 			'tellies'		=> 'telly',
 			'smellies'		=> 'smelly',
 			'abjectnesses'	=> 'abjectness',
-			'smells'		=> 'smell'
+			'smells'		=> 'smell',
+			'equipment'		=> 'equipment'
 		);
 		
 		foreach ($strs as $str => $expect)
@@ -29,7 +30,8 @@ class Inflector_helper_test extends CI_TestCase {
 			'smelly'		=> 'smellies',
 			'abjectness'	=> 'abjectnesses', // ref : http://en.wiktionary.org/wiki/abjectnesses
 			'smell'			=> 'smells',
-			'witch'			=> 'witches'
+			'witch'			=> 'witches',
+			'equipment'		=> 'equipment'
 		);
 		
 		foreach ($strs as $str => $expect)
-- 
cgit v1.2.3-24-g4f1b


From 3fb5aa5886de15ef68e40b556a6ea3f1badf962e Mon Sep 17 00:00:00 2001
From: tiyowan <tiyowan@gmail.com>
Date: Fri, 16 Mar 2012 19:08:34 +0400
Subject: Add unit test for strip_slashes() in string_helper.php

---
 tests/codeigniter/helpers/string_helper_test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index 2d7f96aa5..a884d6284 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -4,6 +4,21 @@ require_once(BASEPATH.'helpers/string_helper.php');
 
 class String_helper_test extends CI_TestCase
 {
+	public function test_strip_slashes()
+	{
+		$expected = array(
+			"Is your name O'reilly?", 
+			"No, my name is O'connor."
+		);
+		
+		$str = array(
+			"Is your name O\'reilly?",
+			"No, my name is O\'connor."
+		);
+		
+		$this->assertEquals($expected, strip_slashes($str));
+	}
+	
 	public function test_trim_slashes()
 	{
 		$strs = array(
-- 
cgit v1.2.3-24-g4f1b


From a83f063c2cebd50515b99e6ccab5afab4c958c06 Mon Sep 17 00:00:00 2001
From: tiyowan <tiyowan@gmail.com>
Date: Fri, 16 Mar 2012 23:52:43 +0400
Subject: Add unit tests for form_helper.php

* Does not test form_open() and form_open_multipart()
* Does not test set_value(), set_select(), set_checkbox() and set_radio()
* Above are in progress and will be added once certain issues are resolved
---
 tests/codeigniter/helpers/form_helper_test.php | 252 +++++++++++++++++++++++++
 1 file changed, 252 insertions(+)
 create mode 100644 tests/codeigniter/helpers/form_helper_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/form_helper_test.php b/tests/codeigniter/helpers/form_helper_test.php
new file mode 100644
index 000000000..80bace9d1
--- /dev/null
+++ b/tests/codeigniter/helpers/form_helper_test.php
@@ -0,0 +1,252 @@
+<?php
+
+require BASEPATH . 'core/Common.php';
+require BASEPATH . 'helpers/form_helper.php';
+
+class Form_helper_test extends CI_TestCase 
+{
+	public function test_form_hidden()
+	{				
+		$expected = <<<EOH
+
+<input type="hidden" name="username" value="johndoe" />
+
+EOH;
+	
+		$this->assertEquals($expected, form_hidden('username', 'johndoe'));
+	}
+	
+	public function test_form_input()
+	{
+		$expected = <<<EOH
+<input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%"  />
+
+EOH;
+	
+		$data = array(
+			'name'        => 'username',
+			'id'          => 'username',
+			'value'       => 'johndoe',
+			'maxlength'   => '100',
+			'size'        => '50',
+			'style'       => 'width:50%',
+		);
+
+		$this->assertEquals($expected, form_input($data));
+	}
+	
+	public function test_form_password()
+	{				
+		$expected = <<<EOH
+<input type="password" name="password" value=""  />
+
+EOH;
+	
+		$this->assertEquals($expected, form_password('password'));
+	}
+	
+	public function test_form_upload()
+	{				
+		$expected = <<<EOH
+<input type="file" name="attachment" value=""  />
+
+EOH;
+	
+		$this->assertEquals($expected, form_upload('attachment'));
+	}
+	
+	public function test_form_textarea()
+	{				
+		$expected = <<<EOH
+<textarea name="notes" cols="40" rows="10" >Notes</textarea>
+
+EOH;
+	
+		$this->assertEquals($expected, form_textarea('notes', 'Notes'));
+	}
+	
+	public function test_form_dropdown()
+	{
+		$expected = <<<EOH
+<select name="shirts">
+<option value="small">Small Shirt</option>
+<option value="med">Medium Shirt</option>
+<option value="large" selected="selected">Large Shirt</option>
+<option value="xlarge">Extra Large Shirt</option>
+</select>
+
+EOH;
+		
+		$options = array(
+			'small'  => 'Small Shirt',
+			'med'    => 'Medium Shirt',
+			'large'   => 'Large Shirt',
+			'xlarge' => 'Extra Large Shirt',
+		);
+		
+		$this->assertEquals($expected, form_dropdown('shirts', $options, 'large'));
+		
+		$expected = <<<EOH
+<select name="shirts" multiple="multiple">
+<option value="small" selected="selected">Small Shirt</option>
+<option value="med">Medium Shirt</option>
+<option value="large" selected="selected">Large Shirt</option>
+<option value="xlarge">Extra Large Shirt</option>
+</select>
+
+EOH;
+		
+		$shirts_on_sale = array('small', 'large');
+		
+		$this->assertEquals($expected, form_dropdown('shirts', $options, $shirts_on_sale));
+		
+		$options = array(
+			'Swedish Cars' => array(
+				'volvo'  => 'Volvo',
+				'saab'    => 'Saab'
+			),
+			'German Cars' => array(
+				'mercedes'  => 'Mercedes',
+				'audi'    => 'Audi'
+			)
+		);
+		
+		$expected = <<<EOH
+<select name="cars" multiple="multiple">
+<optgroup label="Swedish Cars">
+<option value="volvo" selected="selected">Volvo</option>
+<option value="saab">Saab</option>
+</optgroup>
+<optgroup label="German Cars">
+<option value="mercedes">Mercedes</option>
+<option value="audi" selected="selected">Audi</option>
+</optgroup>
+</select>
+
+EOH;
+		
+		$cars_on_sale = array('volvo', 'audi');
+		
+		$this->assertEquals($expected, form_dropdown('cars', $options, $cars_on_sale));
+		
+	}
+	
+	public function test_form_multiselect()
+	{
+		$expected = <<<EOH
+<select name="shirts[]"  multiple="multiple">
+<option value="small">Small Shirt</option>
+<option value="med" selected="selected">Medium Shirt</option>
+<option value="large" selected="selected">Large Shirt</option>
+<option value="xlarge">Extra Large Shirt</option>
+</select>
+
+EOH;
+		
+		$options = array(
+                  'small'  => 'Small Shirt',
+                  'med'    => 'Medium Shirt',
+                  'large'   => 'Large Shirt',
+                  'xlarge' => 'Extra Large Shirt',
+                );
+		
+		$this->assertEquals($expected, form_multiselect('shirts[]', $options, array('med', 'large')));
+	}
+	
+	public function test_form_fieldset()
+	{
+		$expected = <<<EOH
+<fieldset>
+<legend>Address Information</legend>
+
+EOH;
+		
+		$this->assertEquals($expected, form_fieldset('Address Information'));
+	}
+
+	public function test_form_fieldset_close()
+	{
+		$expected = <<<EOH
+</fieldset></div></div>
+EOH;
+		
+		$this->assertEquals($expected, form_fieldset_close('</div></div>'));
+	}
+	
+	public function test_form_checkbox()
+	{
+		$expected = <<<EOH
+<input type="checkbox" name="newsletter" value="accept" checked="checked"  />
+
+EOH;
+
+		$this->assertEquals($expected, form_checkbox('newsletter', 'accept', TRUE));
+	}
+	
+	public function test_form_radio()
+	{
+		$expected = <<<EOH
+<input type="radio" name="newsletter" value="accept" checked="checked"  />
+
+EOH;
+
+		$this->assertEquals($expected, form_radio('newsletter', 'accept', TRUE));
+	}
+	
+	public function test_form_submit()
+	{
+		$expected = <<<EOH
+<input type="submit" name="mysubmit" value="Submit Post!"  />
+
+EOH;
+
+		$this->assertEquals($expected, form_submit('mysubmit', 'Submit Post!'));
+	}
+	
+	public function test_form_label()
+	{
+		$expected = <<<EOH
+<label for="username">What is your Name</label>
+EOH;
+
+		$this->assertEquals($expected, form_label('What is your Name', 'username'));
+	}
+	
+	public function test_form_reset()
+	{
+		$expected = <<<EOH
+<input type="reset" name="myreset" value="Reset"  />
+
+EOH;
+
+		$this->assertEquals($expected, form_reset('myreset', 'Reset'));
+	}
+	
+	public function test_form_button()
+	{
+		$expected = <<<EOH
+<button name="name" type="button" >content</button>
+
+EOH;
+
+		$this->assertEquals($expected, form_button('name','content'));
+	}
+	
+	public function test_form_close()
+	{
+		$expected = <<<EOH
+</form></div></div>
+EOH;
+
+		$this->assertEquals($expected, form_close('</div></div>'));
+	}
+	
+	public function test_form_prep()
+	{
+		$expected = "Here is a string containing &quot;quoted&quot; text.";
+		
+		$this->assertEquals($expected, form_prep('Here is a string containing "quoted" text.'));
+	}
+}
+
+/* End of file form_helper_test.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From ca16c4ff1aa0cf5ebfbe877e9be755c0b7d2061c Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 15:15:30 +0700
Subject: Adding autoloader and mocks directory

---
 tests/codeigniter/core/Common_test.php |  2 --
 tests/codeigniter/core/Loader_test.php | 38 +---------------------------------
 tests/codeigniter/core/URI_test.php    | 33 +----------------------------
 3 files changed, 2 insertions(+), 71 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
index cec12982d..29b512d8a 100644
--- a/tests/codeigniter/core/Common_test.php
+++ b/tests/codeigniter/core/Common_test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once(BASEPATH.'helpers/email_helper.php');
-
 class Common_test extends CI_TestCase
 {
 	
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index b86fd3477..43008651e 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -1,38 +1,5 @@
 <?php
 
-require_once 'vfsStream/vfsStream.php';
-require_once BASEPATH.'/core/Loader.php';
-
-class Extended_Loader extends CI_Loader {
-	
-	/**
-	 * Since we use paths to load up models, views, etc, we need the ability to
-	 * mock up the file system so when core tests are run, we aren't mucking
-	 * in the application directory.  this will give finer grained control over
-	 * these tests.  So yeah, while this looks odd, I need to overwrite protected
-	 * class vars in the loader.  So here we go...
-	 *
-	 * @covers CI_Loader::__construct()
-	 */
-	public function __construct()
-	{
-		vfsStreamWrapper::register();
-		vfsStreamWrapper::setRoot(new vfsStreamDirectory('application'));
-		
-		$this->models_dir 	= vfsStream::newDirectory('models')->at(vfsStreamWrapper::getRoot());
-		$this->libs_dir 	= vfsStream::newDirectory('libraries')->at(vfsStreamWrapper::getRoot());
-		$this->helpers_dir 	= vfsStream::newDirectory('helpers')->at(vfsStreamWrapper::getRoot());
-		$this->views_dir 	= vfsStream::newDirectory('views')->at(vfsStreamWrapper::getRoot());
-		
-		$this->_ci_ob_level  		= ob_get_level();
-		$this->_ci_library_paths	= array(vfsStream::url('application').'/', BASEPATH);
-		$this->_ci_helper_paths 	= array(vfsStream::url('application').'/', BASEPATH);
-		$this->_ci_model_paths 		= array(vfsStream::url('application').'/');
-		$this->_ci_view_paths 		= array(vfsStream::url('application').'/views/' => TRUE);
-	}
-}
-
-
 class Loader_test extends CI_TestCase {
 	
 	private $ci_obj;
@@ -40,7 +7,7 @@ class Loader_test extends CI_TestCase {
 	public function set_up()
 	{
 		// Instantiate a new loader
-		$this->load = new Extended_Loader();
+		$this->load = new Mock_Core_Loader();
 		
 		// mock up a ci instance
 		$this->ci_obj = new StdClass;
@@ -265,7 +232,4 @@ class Loader_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 	
-	
-	
-	
 }
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index 40252aa14..e340ddf73 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -1,41 +1,10 @@
 <?php
 
-require BASEPATH.'core/URI.php';
-
-/**
- * Extend the URI class
- *  - override contructor
- *  - override CLI detection
- */
-class URI_extended extends CI_URI {
-	
-	public function __construct()
-	{
-		$test = CI_TestCase::instance();
-		$cls =& $test->ci_core_class('cfg');
-		
-		// set predictable config values
-		$test->ci_set_config(array(
-			'index_page'		=> 'index.php',
-			'base_url'			=> 'http://example.com/',
-			'subclass_prefix'	=> 'MY_'
-		));
-
-		$this->config = new $cls;	
-
-	}
-	
-	protected function _is_cli_request()
-	{
-		return FALSE;
-	}
-}
-
 class URI_test extends CI_TestCase {
 	
 	public function set_up()
 	{
-		$this->uri = new URI_extended();
+		$this->uri = new Mock_Core_URI();
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From ac5373a8979537f5454af6b911108541140a35d7 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 16:03:38 +0700
Subject: Adding core and libraries mock classes

---
 tests/codeigniter/core/Common_test.php          |  3 +-
 tests/codeigniter/database/.gitkeep             |  0
 tests/codeigniter/libraries/Parser_test.php     |  7 +-
 tests/codeigniter/libraries/Table_test.php      |  7 +-
 tests/codeigniter/libraries/Typography_test.php |  7 +-
 tests/codeigniter/libraries/User_agent_test.php | 91 -------------------------
 tests/codeigniter/libraries/Useragent_test.php  | 87 +++++++++++++++++++++++
 7 files changed, 94 insertions(+), 108 deletions(-)
 create mode 100644 tests/codeigniter/database/.gitkeep
 delete mode 100644 tests/codeigniter/libraries/User_agent_test.php
 create mode 100644 tests/codeigniter/libraries/Useragent_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
index 29b512d8a..dded2e824 100644
--- a/tests/codeigniter/core/Common_test.php
+++ b/tests/codeigniter/core/Common_test.php
@@ -1,7 +1,6 @@
 <?php
 
-class Common_test extends CI_TestCase
-{
+class Common_test extends CI_TestCase {
 	
 	// ------------------------------------------------------------------------
 	
diff --git a/tests/codeigniter/database/.gitkeep b/tests/codeigniter/database/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index b4580a4b1..c3d88fa85 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -1,14 +1,11 @@
 <?php
 
-require BASEPATH.'libraries/Parser.php';
-
-class Parser_test extends CI_TestCase
-{
+class Parser_test extends CI_TestCase {
 	
 	public function set_up()
 	{
 		$obj = new StdClass;
-		$obj->parser = new CI_Parser();
+		$obj->parser = new Mock_Libraries_Parser();
 		
 		$this->ci_instance($obj);
 		
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 0208a465a..7d0e4087f 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -1,14 +1,11 @@
 <?php
 
-require BASEPATH.'libraries/Table.php';
-
-class Table_test extends CI_TestCase
-{
+class Table_test extends CI_TestCase {
 
 	public function set_up()
 	{
 		$obj = new StdClass;
-		$obj->table = new CI_table();
+		$obj->table = new Mock_Libraries_Table();
 		
 		$this->ci_instance($obj);
 		
diff --git a/tests/codeigniter/libraries/Typography_test.php b/tests/codeigniter/libraries/Typography_test.php
index a0533bae0..250aefb24 100644
--- a/tests/codeigniter/libraries/Typography_test.php
+++ b/tests/codeigniter/libraries/Typography_test.php
@@ -1,14 +1,11 @@
 <?php
 
-require BASEPATH.'libraries/Typography.php';
-
-class Typography_test extends CI_TestCase
-{
+class Typography_test extends CI_TestCase {
 
 	public function set_up()
 	{
 		$obj = new StdClass;
-		$obj->type = new CI_Typography();
+		$obj->type = new Mock_Libraries_Typography();
 		
 		$this->ci_instance($obj);
 		
diff --git a/tests/codeigniter/libraries/User_agent_test.php b/tests/codeigniter/libraries/User_agent_test.php
deleted file mode 100644
index 6f9e87196..000000000
--- a/tests/codeigniter/libraries/User_agent_test.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-require BASEPATH.'libraries/User_agent.php';
-
-// This class needs some work...
-
-class UserAgent_test extends CI_TestCase
-{
-	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
-	protected $_mobile_ua = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
-
-	public function set_up()
-	{
-		// set a baseline user agent
-		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
-
-		$obj = new StdClass;
-		$obj->agent = new CI_User_agent();
-
-		$this->ci_instance($obj);
-
-		$this->agent = $obj->agent;
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_accept_lang()
-	{
-		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en';
-		$this->assertTrue($this->agent->accept_lang());
-		unset($_SERVER['HTTP_ACCEPT_LANGUAGE']);
-		$this->assertTrue($this->agent->accept_lang('en'));
-		$this->assertFalse($this->agent->accept_lang('fr'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_mobile()
-	{
-		// Mobile Not Set
-		$_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
-		$this->assertEquals('', $this->agent->mobile());
-		unset($_SERVER['HTTP_USER_AGENT']);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_util_is_functions()
-	{
-		$this->assertTrue($this->agent->is_browser());
-		$this->assertFalse($this->agent->is_robot());
-		$this->assertFalse($this->agent->is_mobile());
-		$this->assertFalse($this->agent->is_referral());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_agent_string()
-	{
-		$this->assertEquals($this->_user_agent, $this->agent->agent_string());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_browser_info()
-	{
-		$this->assertEquals('Mac OS X', $this->agent->platform());
-		$this->assertEquals('Safari', $this->agent->browser());
-		$this->assertEquals('533.20.27', $this->agent->version());
-		$this->assertEquals('', $this->agent->robot());
-		$this->assertEquals('', $this->agent->referrer());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_charsets()
-	{
-		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'utf8';
-
-		$charsets = $this->agent->charsets();
-
-		$this->assertEquals('utf8', $charsets[0]);
-
-		unset($_SERVER['HTTP_ACCEPT_CHARSET']);
-
-		$this->assertFalse($this->agent->accept_charset());
-	}
-
-	// --------------------------------------------------------------------
-
-}
\ No newline at end of file
diff --git a/tests/codeigniter/libraries/Useragent_test.php b/tests/codeigniter/libraries/Useragent_test.php
new file mode 100644
index 000000000..7dad7ac54
--- /dev/null
+++ b/tests/codeigniter/libraries/Useragent_test.php
@@ -0,0 +1,87 @@
+<?php
+
+class UserAgent_test extends CI_TestCase {
+	
+	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
+	protected $_mobile_ua = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
+
+	public function set_up()
+	{
+		// set a baseline user agent
+		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
+
+		$obj = new StdClass;
+		$obj->agent = new Mock_Libraries_UserAgent();
+
+		$this->ci_instance($obj);
+
+		$this->agent = $obj->agent;
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_accept_lang()
+	{
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en';
+		$this->assertTrue($this->agent->accept_lang());
+		unset($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		$this->assertTrue($this->agent->accept_lang('en'));
+		$this->assertFalse($this->agent->accept_lang('fr'));
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_mobile()
+	{
+		// Mobile Not Set
+		$_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
+		$this->assertEquals('', $this->agent->mobile());
+		unset($_SERVER['HTTP_USER_AGENT']);
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_util_is_functions()
+	{
+		$this->assertTrue($this->agent->is_browser());
+		$this->assertFalse($this->agent->is_robot());
+		$this->assertFalse($this->agent->is_mobile());
+		$this->assertFalse($this->agent->is_referral());
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_agent_string()
+	{
+		$this->assertEquals($this->_user_agent, $this->agent->agent_string());
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_browser_info()
+	{
+		$this->assertEquals('Mac OS X', $this->agent->platform());
+		$this->assertEquals('Safari', $this->agent->browser());
+		$this->assertEquals('533.20.27', $this->agent->version());
+		$this->assertEquals('', $this->agent->robot());
+		$this->assertEquals('', $this->agent->referrer());
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test_charsets()
+	{
+		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'utf8';
+
+		$charsets = $this->agent->charsets();
+
+		$this->assertEquals('utf8', $charsets[0]);
+
+		unset($_SERVER['HTTP_ACCEPT_CHARSET']);
+
+		$this->assertFalse($this->agent->accept_charset());
+	}
+
+	// --------------------------------------------------------------------
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From d61b772e8c074644262218dff0b1f91a2f3b3a14 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 16:07:58 +0700
Subject: Adding core and libraries mock classes

---
 tests/codeigniter/libraries/Table_test.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 7d0e4087f..61678afc7 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -141,12 +141,6 @@ class Table_test extends CI_TestCase {
 	
 	public function test_default_template_keys()
 	{
-		$reflectionOfTable = new ReflectionClass($this->table);
-		$method = $reflectionOfTable->getMethod('_default_template');
-		
-		$method->setAccessible(true);
-		
-		$deft_template = $method->invoke($this->table);
 		$keys = array(
 			'table_open',
 			'thead_open', 'thead_close',
@@ -159,7 +153,7 @@ class Table_test extends CI_TestCase {
 		
 		foreach ($keys as $key)
 		{
-			$this->assertArrayHasKey($key, $deft_template);
+			$this->assertArrayHasKey($key, $this->table->default_template());
 		}
 	}
 	
-- 
cgit v1.2.3-24-g4f1b


From d44d720ba8b17fa58cb041111dca9c440f823446 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 16:24:23 +0700
Subject: Implementation of Mock class, remove ugly reflection class

---
 tests/codeigniter/libraries/Table_test.php | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 61678afc7..04396d5fe 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -159,23 +159,18 @@ class Table_test extends CI_TestCase {
 	
 	public function test_compile_template()
 	{
-		$reflectionOfTable = new ReflectionClass($this->table);
-		$method = $reflectionOfTable->getMethod('_compile_template');
-		
-		$method->setAccessible(true);
-		
 		$this->assertFalse($this->table->set_template('invalid_junk'));
 		
 		// non default key
 		$this->table->set_template(array('nonsense' => 'foo'));
-		$method->invoke($this->table);
+		$this->table->compile_template();
 		
 		$this->assertArrayHasKey('nonsense', $this->table->template);
 		$this->assertEquals('foo', $this->table->template['nonsense']);
 		
 		// override default
 		$this->table->set_template(array('table_close' => '</table junk>'));
-		$method->invoke($this->table);
+		$this->table->compile_template();
 		
 		$this->assertArrayHasKey('table_close', $this->table->template);
 		$this->assertEquals('</table junk>', $this->table->template['table_close']);
@@ -246,8 +241,8 @@ class Table_test extends CI_TestCase {
 		
 		$method->setAccessible(true);
 				
-		$this->assertFalse($method->invokeArgs($this->table, array('bogus')));
-		$this->assertFalse($method->invoke($this->table, array()));
+		$this->assertFalse($this->table->set_from_array('bogus'));
+		$this->assertFalse($this->table->set_from_array(NULL));
 		
 		$data = array(
 			array('name', 'color', 'number'),
@@ -255,7 +250,7 @@ class Table_test extends CI_TestCase {
 			array('Katie', 'Blue')				
 		);
 		
-		$method->invokeArgs($this->table, array($data, FALSE));
+		$this->table->set_from_array($data, FALSE);
 		$this->assertEmpty($this->table->heading);
 		
 		$this->table->clear();
@@ -271,7 +266,7 @@ class Table_test extends CI_TestCase {
 			array('data' => 'Blue'),
 		);
 		
-		$method->invokeArgs($this->table, array($data));
+		$this->table->set_from_array($data);
 		$this->assertEquals(count($this->table->rows), 2);
 		
 		$this->assertEquals(
@@ -287,11 +282,6 @@ class Table_test extends CI_TestCase {
 	
 	function test_set_from_object()
 	{
-		$reflectionOfTable = new ReflectionClass($this->table);
-		$method = $reflectionOfTable->getMethod('_set_from_object');
-		
-		$method->setAccessible(true);
-
 		// Make a stub of query instance
 		$query = new CI_TestCase();
 		$query->list_fields = function(){
@@ -317,7 +307,7 @@ class Table_test extends CI_TestCase {
 			'email' => array('data' => 'foo@bar.com'),
 		);
 
-		$method->invokeArgs($this->table, array($query));
+		$this->table->set_from_object($query);
 
 		$this->assertEquals(
 			$expected_heading,
-- 
cgit v1.2.3-24-g4f1b


From 30b34d099e4e9bcdc79ec496fdb89904444eaa4f Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 16:35:48 +0700
Subject: Implementation of Mock class, remove ugly reflection class

---
 tests/codeigniter/libraries/Table_test.php | 35 +++---------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 04396d5fe..13f338c6b 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -100,42 +100,18 @@ class Table_test extends CI_TestCase {
 			array('data' => 'size')
 		);
 		
-		// test what would be discreet args,
-		// basically means a single array as the calling method
-		// will use func_get_args()
-		
-		$reflectionOfTable = new ReflectionClass($this->table);
-		$method = $reflectionOfTable->getMethod('_prep_args');
-		
-		$method->setAccessible(true);
-			
-		$this->assertEquals(
-			$expected,
-			$method->invokeArgs(
-				$this->table, array(array('name', 'color', 'size'), 'discreet')
-			)
-		);
-		
-		// test what would be a single array argument. Again, nested
-		// due to func_get_args on calling methods
 		$this->assertEquals(
 			$expected,
-			$method->invokeArgs(
-				$this->table, array(array('name', 'color', 'size'), 'array')
-			)
+			$this->table->prep_args(array('name', 'color', 'size'))
 		);
-		
-		
+
 		// with cell attributes
-		
 		// need to add that new argument row to our expected outcome
 		$expected[] = array('data' => 'weight', 'class' => 'awesome');
 
 		$this->assertEquals(
 			$expected,
-			$method->invokeArgs(
-				$this->table, array(array('name', 'color', 'size', array('data' => 'weight', 'class' => 'awesome')), 'attributes')
-			)
+			$this->table->prep_args(array('name', 'color', 'size', array('data' => 'weight', 'class' => 'awesome')))
 		);
 	}
 	
@@ -236,11 +212,6 @@ class Table_test extends CI_TestCase {
 	
 	public function test_set_from_array()
 	{
-		$reflectionOfTable = new ReflectionClass($this->table);
-		$method = $reflectionOfTable->getMethod('_set_from_array');
-		
-		$method->setAccessible(true);
-				
 		$this->assertFalse($this->table->set_from_array('bogus'));
 		$this->assertFalse($this->table->set_from_array(NULL));
 		
-- 
cgit v1.2.3-24-g4f1b


From e1dc9ea4fcfd4983fa076b70fe631166a95d0b68 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 28 Mar 2012 16:49:49 +0700
Subject: Remove include or require declaration from all helpers test

---
 tests/codeigniter/helpers/array_helper_test.php     | 10 ++++------
 tests/codeigniter/helpers/date_helper_test.php      | 10 +++++++---
 tests/codeigniter/helpers/directory_helper_test.php |  9 ++++-----
 tests/codeigniter/helpers/email_helper_test.php     | 10 ++++++----
 tests/codeigniter/helpers/file_helper_test.php      |  7 +++----
 tests/codeigniter/helpers/html_helper_test.php      |  8 +++++---
 tests/codeigniter/helpers/inflector_helper_test.php |  6 ++++--
 tests/codeigniter/helpers/number_helper_test.php    |  7 +++----
 tests/codeigniter/helpers/path_helper_test.php      |  9 ++++++---
 tests/codeigniter/helpers/string_helper_test.php    |  9 ++++++---
 tests/codeigniter/helpers/text_helper_test.php      |  6 +++---
 tests/codeigniter/helpers/url_helper_test.php       |  9 ++++++---
 tests/codeigniter/helpers/xml_helper_test.php       |  8 +++++---
 13 files changed, 62 insertions(+), 46 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index 62559de83..9cd15960f 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -1,13 +1,11 @@
 <?php
 
-// OLD TEST FORMAT: DO NOT COPY
-
-require_once(BASEPATH.'helpers/array_helper.php');
-
-class Array_helper_test extends CI_TestCase
-{
+class Array_helper_test extends CI_TestCase {
+	
 	public function set_up()
 	{
+		$this->helper('array');
+
 		$this->my_array = array(
 			'foo'		=> 'bar',
 			'sally'		=> 'jim',
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 662d16485..17d1ef21e 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -1,8 +1,12 @@
 <?php
-require_once BASEPATH.'helpers/date_helper.php';
 
-class Date_helper_test extends CI_TestCase
-{
+class Date_helper_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->helper('date');
+	}
+
 	// ------------------------------------------------------------------------
 
 	public function test_now_local()
diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php
index 3fae81b82..3937d2913 100644
--- a/tests/codeigniter/helpers/directory_helper_test.php
+++ b/tests/codeigniter/helpers/directory_helper_test.php
@@ -1,12 +1,11 @@
 <?php
 
-require_once 'vfsStream/vfsStream.php';
-require BASEPATH.'helpers/directory_helper.php';
-
-class Directory_helper_test extends CI_TestCase
-{
+class Directory_helper_test extends CI_TestCase {
+	
 	public function set_up()
 	{
+		$this->helper('directory');
+
 		vfsStreamWrapper::register();
 		vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir'));
 		
diff --git a/tests/codeigniter/helpers/email_helper_test.php b/tests/codeigniter/helpers/email_helper_test.php
index 7324e8109..a01f3d5af 100644
--- a/tests/codeigniter/helpers/email_helper_test.php
+++ b/tests/codeigniter/helpers/email_helper_test.php
@@ -1,10 +1,12 @@
 <?php
 
-require_once(BASEPATH.'helpers/email_helper.php');
+class Email_helper_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->helper('email');
+	}
 
-class Email_helper_test extends CI_TestCase
-{
-	
 	public function test_valid_email()
 	{
 		$this->assertEquals(FALSE, valid_email('test'));
diff --git a/tests/codeigniter/helpers/file_helper_test.php b/tests/codeigniter/helpers/file_helper_test.php
index a596a0375..4b9c29485 100644
--- a/tests/codeigniter/helpers/file_helper_test.php
+++ b/tests/codeigniter/helpers/file_helper_test.php
@@ -1,12 +1,11 @@
 <?php
 
-require_once 'vfsStream/vfsStream.php';
-require BASEPATH.'helpers/file_helper.php';
+class File_helper_Test extends CI_TestCase {
 
-class File_helper_Test extends CI_TestCase
-{
 	public function set_up()
 	{
+		$this->helper('file');
+		
 		vfsStreamWrapper::register();
 		vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir'));
 		
diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 553fc2bb1..28974b0f8 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -1,9 +1,11 @@
 <?php
 
-require_once(BASEPATH.'helpers/html_helper.php');
+class Html_helper_test extends CI_TestCase {
 
-class Html_helper_test extends CI_TestCase
-{
+	public function set_up()
+	{
+		$this->helper('html');
+	}
 	
 	// ------------------------------------------------------------------------
 	
diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index 472e28adb..9e9478711 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -1,9 +1,11 @@
 <?php
 
-require_once(BASEPATH.'helpers/inflector_helper.php');
-
 class Inflector_helper_test extends CI_TestCase {
 	
+	public function set_up()
+	{
+		$this->helper('inflector');
+	}
 	
 	public function test_singular()
 	{
diff --git a/tests/codeigniter/helpers/number_helper_test.php b/tests/codeigniter/helpers/number_helper_test.php
index 3322b2475..4bb9a918a 100644
--- a/tests/codeigniter/helpers/number_helper_test.php
+++ b/tests/codeigniter/helpers/number_helper_test.php
@@ -1,12 +1,11 @@
 <?php
 
-require_once BASEPATH.'helpers/number_helper.php';
-
-class Number_helper_test extends CI_TestCase
-{
+class Number_helper_test extends CI_TestCase {
 	
 	public function set_up()
 	{
+		$this->helper('number');
+		
 		// Grab the core lang class
 		$lang_cls = $this->ci_core_class('lang');
 		
diff --git a/tests/codeigniter/helpers/path_helper_test.php b/tests/codeigniter/helpers/path_helper_test.php
index 2e6cc6391..632f57501 100644
--- a/tests/codeigniter/helpers/path_helper_test.php
+++ b/tests/codeigniter/helpers/path_helper_test.php
@@ -1,9 +1,12 @@
 <?php
 
-require BASEPATH . 'helpers/path_helper.php';
+class Path_helper_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->helper('path');
+	}
 
-class Path_helper_test extends CI_TestCase 
-{
 	public function test_set_realpath()
 	{				
 		$expected = getcwd() . DIRECTORY_SEPARATOR;
diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index a884d6284..29c3d6594 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -1,9 +1,12 @@
 <?php
 
-require_once(BASEPATH.'helpers/string_helper.php');
+class String_helper_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->helper('string');
+	}
 
-class String_helper_test extends CI_TestCase
-{
 	public function test_strip_slashes()
 	{
 		$expected = array(
diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php
index a0866e638..584066b0c 100644
--- a/tests/codeigniter/helpers/text_helper_test.php
+++ b/tests/codeigniter/helpers/text_helper_test.php
@@ -1,13 +1,13 @@
 <?php
 
-require_once(BASEPATH.'helpers/text_helper.php');
+class Text_helper_test extends CI_TestCase {
 
-class Text_helper_test extends CI_TestCase
-{
 	private $_long_string;
 	
 	public function set_up()
 	{
+		$this->helper('text');
+		
 		$this->_long_string = 'Once upon a time, a framework had no tests.  It sad.  So some nice people began to write tests.  The more time that went on, the happier it became.  Everyone was happy.';
 	}
 	
diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index 51a8cc7c0..c561809ce 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -1,9 +1,12 @@
 <?php
 
-require_once(BASEPATH.'helpers/url_helper.php');
+class Url_helper_test extends CI_TestCase {
+
+	public function set_up()
+	{
+		$this->helper('url');
+	}
 
-class Url_helper_test extends CI_TestCase
-{
 	public function test_url_title()
 	{
 		$words = array(
diff --git a/tests/codeigniter/helpers/xml_helper_test.php b/tests/codeigniter/helpers/xml_helper_test.php
index 49f49e166..a83fef91e 100644
--- a/tests/codeigniter/helpers/xml_helper_test.php
+++ b/tests/codeigniter/helpers/xml_helper_test.php
@@ -1,9 +1,11 @@
 <?php
 
-require_once(BASEPATH.'helpers/xml_helper.php');
+class Xml_helper_test extends CI_TestCase {
 
-class Xml_helper_test extends CI_TestCase
-{
+	public function set_up()
+	{
+		$this->helper('xml');
+	}
 	
 	public function test_xml_convert()
 	{
-- 
cgit v1.2.3-24-g4f1b


From 655a89f4059ebae017d1c4ec5f26aeb2cf4a3bae Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 29 Mar 2012 03:00:56 +0700
Subject: Preliminary Database Test

---
 tests/codeigniter/database/.gitkeep    |  0
 tests/codeigniter/database/DB_test.php | 44 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 delete mode 100644 tests/codeigniter/database/.gitkeep
 create mode 100644 tests/codeigniter/database/DB_test.php

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/database/.gitkeep b/tests/codeigniter/database/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
new file mode 100644
index 000000000..c1930f5f2
--- /dev/null
+++ b/tests/codeigniter/database/DB_test.php
@@ -0,0 +1,44 @@
+<?php
+
+class DB_test extends CI_TestCase {
+
+	public $db_config;
+
+	public function set_up()
+	{
+		$this->db_config = new Mock_Database_DB(array(
+			'mysql' => array(
+				'dsn' => '',
+				'hostname' => 'localhost',
+				'username' => 'travis',
+				'password' => '',
+				'database' => 'ci_test',
+				'dbdriver' => 'mysql',
+				'dbprefix' => '',
+				'pconnect' => FALSE,
+				'db_debug' => TRUE,
+				'cache_on' => FALSE,
+				'cachedir' => '',
+				'char_set' => 'utf8',
+				'dbcollat' => 'utf8_general_ci',
+				'swap_pre' => '',
+				'autoinit' => TRUE,
+				'stricton' => FALSE,
+				'failover' => array(),
+			),
+		));
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_db_valid()
+	{
+		$db = DB($this->db_config->set_config('mysql'), TRUE);
+
+		$this->assertTrue($db instanceof CI_DB);
+		$this->assertTrue($db instanceof CI_DB_Driver);
+		$this->assertTrue($db instanceof CI_DB_active_record);
+		$this->assertTrue($db instanceof CI_DB_mysql_driver);
+	}
+	
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From a8a2e3325c128ccdc941daba3bba10b78bf2d098 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 29 Mar 2012 03:56:46 +0700
Subject: Travis setup and minor cleanup

---
 tests/codeigniter/database/DB_test.php            | 45 ++++++++++++-----------
 tests/codeigniter/database/query_builder/.gitkeep |  0
 2 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 tests/codeigniter/database/query_builder/.gitkeep

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index c1930f5f2..10e8dec64 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -2,11 +2,31 @@
 
 class DB_test extends CI_TestCase {
 
-	public $db_config;
+	// ------------------------------------------------------------------------
 
-	public function set_up()
+	public function test_db_invalid()
 	{
-		$this->db_config = new Mock_Database_DB(array(
+		$db_config = new Mock_Database_DB(array(
+			'undefined' => array(
+				'dsn' => '',
+				'hostname' => 'undefined',
+				'username' => 'undefined',
+				'password' => 'undefined',
+				'database' => 'undefined',
+				'dbdriver' => 'undefined',
+			),
+		));
+
+		$this->setExpectedException('InvalidArgumentException', 'CI Error: Invalid DB driver');
+
+		Mock_Database_DB::DB($db_config->set_dsn('undefined'), TRUE);
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_db_valid()
+	{
+		$db_config = new Mock_Database_DB(array(
 			'mysql' => array(
 				'dsn' => '',
 				'hostname' => 'localhost',
@@ -14,30 +34,13 @@ class DB_test extends CI_TestCase {
 				'password' => '',
 				'database' => 'ci_test',
 				'dbdriver' => 'mysql',
-				'dbprefix' => '',
-				'pconnect' => FALSE,
-				'db_debug' => TRUE,
-				'cache_on' => FALSE,
-				'cachedir' => '',
-				'char_set' => 'utf8',
-				'dbcollat' => 'utf8_general_ci',
-				'swap_pre' => '',
-				'autoinit' => TRUE,
-				'stricton' => FALSE,
-				'failover' => array(),
 			),
 		));
-	}
 
-	// ------------------------------------------------------------------------
-
-	public function test_db_valid()
-	{
-		$db = DB($this->db_config->set_config('mysql'), TRUE);
+		$db = Mock_Database_DB::DB($db_config->set_dsn('mysql'), TRUE);
 
 		$this->assertTrue($db instanceof CI_DB);
 		$this->assertTrue($db instanceof CI_DB_Driver);
-		$this->assertTrue($db instanceof CI_DB_active_record);
 		$this->assertTrue($db instanceof CI_DB_mysql_driver);
 	}
 	
diff --git a/tests/codeigniter/database/query_builder/.gitkeep b/tests/codeigniter/database/query_builder/.gitkeep
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3-24-g4f1b


From ee2f5d08c64d96b7abc7195bcd1b6a3fd67b5b42 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Fri, 30 Mar 2012 06:29:11 +0700
Subject: Multi database setup

---
 tests/codeigniter/database/DB_test.php | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'tests/codeigniter')

diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index 10e8dec64..9b93e223d 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -6,7 +6,7 @@ class DB_test extends CI_TestCase {
 
 	public function test_db_invalid()
 	{
-		$db_config = new Mock_Database_DB(array(
+		$connection = new Mock_Database_DB(array(
 			'undefined' => array(
 				'dsn' => '',
 				'hostname' => 'undefined',
@@ -19,29 +19,31 @@ class DB_test extends CI_TestCase {
 
 		$this->setExpectedException('InvalidArgumentException', 'CI Error: Invalid DB driver');
 
-		Mock_Database_DB::DB($db_config->set_dsn('undefined'), TRUE);
+		Mock_Database_DB::DB($connection->set_dsn('undefined'), TRUE);
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function test_db_valid()
 	{
-		$db_config = new Mock_Database_DB(array(
-			'mysql' => array(
-				'dsn' => '',
-				'hostname' => 'localhost',
-				'username' => 'travis',
-				'password' => '',
-				'database' => 'ci_test',
-				'dbdriver' => 'mysql',
-			),
-		));
+		$config = Mock_Database_DB::config(DB_DRIVER);
+		$connection = new Mock_Database_DB($config);
+		$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER), TRUE);
+
+		$this->assertTrue($db instanceof CI_DB);
+		$this->assertTrue($db instanceof CI_DB_Driver);
+	}
 
-		$db = Mock_Database_DB::DB($db_config->set_dsn('mysql'), TRUE);
+	// ------------------------------------------------------------------------
+
+	public function test_db_failover()
+	{
+		$config = Mock_Database_DB::config(DB_DRIVER);
+		$connection = new Mock_Database_DB($config);
+		$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER.'_failover'), TRUE);
 
 		$this->assertTrue($db instanceof CI_DB);
 		$this->assertTrue($db instanceof CI_DB_Driver);
-		$this->assertTrue($db instanceof CI_DB_mysql_driver);
 	}
 	
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b