Remove a few empty 'mock' classes

12 files changed, 6 insertions, 24 deletions

diff --git a/tests/codeigniter/core/Benchmark_test.php b/tests/codeigniter/core/Benchmark_test.php
index 7fd0727e2..63b0e3d5a 100644
--- a/tests/codeigniter/core/Benchmark_test.php
+++ b/tests/codeigniter/core/Benchmark_test.php
@@ -4,7 +4,7 @@ class Benchmark_test extends CI_TestCase {
 
 	public function set_up()
 	{
-		$this->benchmark = new Mock_Core_Benchmark();
+		$this->benchmark = new CI_Benchmark();
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index 3755cf1a0..2a2348793 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -4,7 +4,7 @@ class Parser_test extends CI_TestCase {
 
 	public function set_up()
 	{
-		$this->parser = new Mock_Libraries_Parser();
+		$this->parser = new CI_Parser();
 		$this->ci_instance_var('parser', $this->parser);
 	}
 
diff --git a/tests/codeigniter/libraries/Typography_test.php b/tests/codeigniter/libraries/Typography_test.php
index 5dba06243..e6ee7b05c 100644
--- a/tests/codeigniter/libraries/Typography_test.php
+++ b/tests/codeigniter/libraries/Typography_test.php
@@ -4,7 +4,7 @@ class Typography_test extends CI_TestCase {
 
 	public function set_up()
 	{
-		$this->type = new Mock_Libraries_Typography();
+		$this->type = new CI_Typography();
 		$this->ci_instance('type', $this->type);
 	}
 
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index 4d9e4a46e..a953d8329 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -5,7 +5,7 @@ class Upload_test extends CI_TestCase {
 	function set_up()
 	{
 		$ci = $this->ci_instance();
-		$ci->upload = new Mock_Libraries_Upload();
+		$ci->upload = new CI_Upload();
 		$ci->security = new Mock_Core_Security();
 		$ci->lang = $this->getMock('CI_Lang', array('load', 'line'));
 		$ci->lang->expects($this->any())->method('line')->will($this->returnValue(FALSE));
diff --git a/tests/codeigniter/libraries/Useragent_test.php b/tests/codeigniter/libraries/Useragent_test.php
index aed38b8c2..c02f2bd9d 100644
--- a/tests/codeigniter/libraries/Useragent_test.php
+++ b/tests/codeigniter/libraries/Useragent_test.php
@@ -11,7 +11,7 @@ class UserAgent_test extends CI_TestCase {
 		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
 
 		$this->ci_vfs_clone('application/config/user_agents.php');
-		$this->agent = new Mock_Libraries_UserAgent();
+		$this->agent = new CI_User_agent();
 		$this->ci_instance_var('agent', $this->agent);
 	}
 
diff --git a/tests/mocks/core/benchmark.php b/tests/mocks/core/benchmark.php
deleted file mode 100644
index d92be21db..000000000
--- a/tests/mocks/core/benchmark.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Core_Benchmark extends CI_Benchmark {}
\ No newline at end of file
diff --git a/tests/mocks/database/db/driver.php b/tests/mocks/database/db/driver.php
index 2cf54b97b..86f7efd54 100644
--- a/tests/mocks/database/db/driver.php
+++ b/tests/mocks/database/db/driver.php
@@ -37,4 +37,4 @@ class Mock_Database_DB_Driver extends CI_DB_driver {
 
 }
 
-class CI_DB extends Mock_Database_DB_QueryBuilder {}
\ No newline at end of file
+class CI_DB extends CI_DB_query_builder {}
\ No newline at end of file
diff --git a/tests/mocks/database/db/querybuilder.php b/tests/mocks/database/db/querybuilder.php
deleted file mode 100644
index 3f2252622..000000000
--- a/tests/mocks/database/db/querybuilder.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Database_DB_QueryBuilder extends CI_DB_query_builder {}
\ No newline at end of file
diff --git a/tests/mocks/libraries/parser.php b/tests/mocks/libraries/parser.php
deleted file mode 100644
index 81dcfb37e..000000000
--- a/tests/mocks/libraries/parser.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Libraries_Parser extends CI_Parser {}
\ No newline at end of file
diff --git a/tests/mocks/libraries/typography.php b/tests/mocks/libraries/typography.php
deleted file mode 100644
index 0f76c5745..000000000
--- a/tests/mocks/libraries/typography.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Libraries_Typography extends CI_Typography {}
\ No newline at end of file
diff --git a/tests/mocks/libraries/upload.php b/tests/mocks/libraries/upload.php
deleted file mode 100644
index 988723e45..000000000
--- a/tests/mocks/libraries/upload.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Libraries_Upload extends CI_Upload {}
\ No newline at end of file
diff --git a/tests/mocks/libraries/useragent.php b/tests/mocks/libraries/useragent.php
deleted file mode 100644
index c957cde5b..000000000
--- a/tests/mocks/libraries/useragent.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class Mock_Libraries_UserAgent extends CI_User_agent {}
\ No newline at end of file