1 files changed, 25 insertions, 14 deletions

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 8c5bb3021..6a7aa916a 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -36,7 +36,8 @@ class Loader_test extends CI_TestCase {
 		// Test loading as an array.
 		$this->assertInstanceOf('CI_Loader', $this->load->library(array($lib)));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$lib);
 
 		// Create library in VFS
 		$lib = array('unit_test_lib' => 'unit_test_lib');
@@ -87,14 +88,16 @@ class Loader_test extends CI_TestCase {
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
 		$this->assertTrue(class_exists($ext), $ext.' does not exist');
-		$this->assertAttributeInstanceOf($class, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $name, $this->ci_obj);
+		$this->assertObjectHasAttribute($name, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$name);
+		$this->assertInstanceOf($ext, $this->ci_obj->$name);
 
 		// Test reloading with object name
 		$obj = 'exttest';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
+		$this->assertInstanceOf($ext, $this->ci_obj->$obj);
 
 		// Test reloading
 		unset($this->ci_obj->$name);
@@ -137,7 +140,8 @@ class Loader_test extends CI_TestCase {
 		$obj = 'testy';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
 		$this->assertEquals($cfg, $this->ci_obj->$obj->config);
 
 		// Test is_loaded
@@ -168,7 +172,8 @@ class Loader_test extends CI_TestCase {
 
 		// Was the model class instantiated.
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$lib);
 	}
 
 	// --------------------------------------------------------------------
@@ -188,12 +193,14 @@ class Loader_test extends CI_TestCase {
 		// Test loading as an array.
 		$this->assertInstanceOf('CI_Loader', $this->load->driver(array($driver)));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $driver, $this->ci_obj);
+		$this->assertObjectHasAttribute($driver, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$driver);
 
 		// Test loading as a library with a name
 		$obj = 'testdrive';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($driver, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
 
 		// Test a string given to params
 		$this->assertInstanceOf('CI_Loader', $this->load->driver($driver, ' '));
@@ -242,8 +249,9 @@ class Loader_test extends CI_TestCase {
 		// Was the model class instantiated?
 		$this->assertTrue(class_exists($model));
 		$this->assertObjectHasAttribute($name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($base, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($model, $name, $this->ci_obj);
+		$this->assertObjectHasAttribute($name, $this->ci_obj);
+		$this->assertInstanceOf($base, $this->ci_obj->$name);
+		$this->assertInstanceOf($model, $this->ci_obj->$name);
 
 		// Test name conflict
 		$obj = 'conflict';
@@ -567,15 +575,18 @@ class Loader_test extends CI_TestCase {
 
 		// Verify library
 		$this->assertTrue(class_exists($lib_class), $lib_class.' does not exist');
-		$this->assertAttributeInstanceOf($lib_class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($lib_class, $this->ci_obj->$lib);
 
 		// Verify driver
 		$this->assertTrue(class_exists($drv_class), $drv_class.' does not exist');
-		$this->assertAttributeInstanceOf($drv_class, $drv, $this->ci_obj);
+		$this->assertObjectHasAttribute($drv, $this->ci_obj);
+		$this->assertInstanceOf($drv_class, $this->ci_obj->$drv);
 
 		// Verify model
 		$this->assertTrue(class_exists($model), $model.' does not exist');
-		$this->assertAttributeInstanceOf($model, $model, $this->ci_obj);
+		$this->assertObjectHasAttribute($model, $this->ci_obj);
+		$this->assertInstanceOf($model, $this->ci_obj->$model);
 
 		// Verify config calls
 		$this->assertEquals($cfg['config'], $this->ci_obj->config->loaded);