1 files changed, 33 insertions, 32 deletions

diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
index dd4beb075..171566661 100644
--- a/engine/tests/objects/objects.php
+++ b/engine/tests/objects/objects.php
@@ -49,6 +49,7 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 		$attributes['access_id'] = ACCESS_PRIVATE;
 		$attributes['time_created'] = '';
 		$attributes['time_updated'] = '';
+		$attributes['last_action'] = '';
 		$attributes['enabled'] = 'yes';
 		$attributes['tables_split'] = 2;
 		$attributes['tables_loaded'] = 0;
@@ -57,30 +58,30 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 
 		$this->assertIdentical($this->entity->expose_attributes(), $attributes);
 	}
-	
+
 	public function testElggObjectSave() {
 		// new object
 		$this->AssertEqual($this->entity->getGUID(), 0);
 		$guid = $this->entity->save();
 		$this->AssertNotEqual($guid, 0);
-		
+
 		$entity_row = $this->get_entity_row($guid);
 		$this->assertIsA($entity_row, 'stdClass');
-		
+
 		// update existing object
 		$this->entity->title = 'testing';
 		$this->entity->description = 'ElggObject';
 		$this->assertEqual($this->entity->save(), $guid);
-		
+
 		$object_row = $this->get_object_row($guid);
 		$this->assertIsA($object_row, 'stdClass');
 		$this->assertIdentical($object_row->title, 'testing');
 		$this->assertIdentical($object_row->description, 'ElggObject');
-		
+
 		// clean up
 		$this->entity->delete();
 	}
-	
+
 	public function testElggObjectLoad() {
 		// fail on wrong type
 		try {
@@ -92,18 +93,18 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 			$this->assertIdentical($e->getMessage(), $message);
 		}
 	}
-	
+
 	public function testElggObjectConstructorByGUID() {
 		$guid = $this->entity->save();
-		
+
 		// load a new object using guid
 		$entity = new ElggObjectTest($guid);
 		$this->assertIdentical($this->entity, $entity);
-		
+
 		// clean up
 		$this->entity->delete();
 	}
-		
+
 	public function testElggObjectClone() {
 		$this->entity->title = 'testing';
 		$this->entity->description = 'ElggObject';
@@ -111,54 +112,54 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 		$this->entity->var2 = 1;
 		$this->entity->var3 = true;
 		$this->entity->save();
-		
+
 		// add tag array
 		$tag_string = 'tag1, tag2, tag3';
 		$tagarray = string_to_tag_array($tag_string);
 		$this->entity->tags = $tagarray;
-		
+
 		// a cloned ElggEntity has the guid reset
 		$object = clone $this->entity;
 		$this->assertIdentical(0, (int)$object->guid);
-		
+
 		// make sure attributes were copied over
 		$this->assertIdentical($object->title, 'testing');
 		$this->assertIdentical($object->description, 'ElggObject');
-		
+
 		$guid = $object->save();
 		$this->assertTrue($guid !== 0);
 		$this->assertTrue($guid !== $this->entity->guid);
-		
+
 		// test that metadata was transfered
 		$this->assertIdentical($this->entity->var1, $object->var1);
 		$this->assertIdentical($this->entity->var2, $object->var2);
 		$this->assertIdentical($this->entity->var3, $object->var3);
 		$this->assertIdentical($this->entity->tags, $object->tags);
-		
+
 		// clean up
 		$object->delete();
 		$this->entity->delete();
 	}
-	
+
 	public function testElggObjectContainer() {
 		$this->assertEqual($this->entity->getContainer(), get_loggedin_userid());
-		
+
 		// fals when container not a group
 		$this->assertFalse($this->entity->getContainerEntity());
-		
+
 		// create and save to group
 		$group = new ElggGroup();
 		$guid = $group->save();
 		$this->assertTrue($this->entity->setContainer($guid));
-		
+
 		// check container
 		$this->assertEqual($this->entity->getContainer(), $guid);
 		$this->assertIdentical($group, $this->entity->getContainerEntity());
-		
+
 		// clean up
 		$group->delete();
 	}
-	
+
 	public function testElggObjectExportables() {
 		$exportables = array(
 			'guid',
@@ -172,16 +173,16 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 			'title',
 			'description'
 		);
-		
+
 		$this->assertIdentical($exportables, $this->entity->getExportableValues());
 	}
 
-	public function xtestElggObjectAccessOverrides() { 
-		// set entity to private access with no owner. 
-		$entity = $this->entity; 
-		$entity->access_id = ACCESS_PRIVATE; 
+	public function xtestElggObjectAccessOverrides() {
+		// set entity to private access with no owner.
+		$entity = $this->entity;
+		$entity->access_id = ACCESS_PRIVATE;
 		$entity->owner_guid = 0;
-		$this->assertTrue($entity->save()); 
+		$this->assertTrue($entity->save());
 		$guid = $entity->getGUID();
 
 		var_dump($guid);
@@ -191,16 +192,16 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 		var_dump($entity);
 		$this->assertFalse($entity);
 
-		$old = elgg_set_ignore_access(true); 
+		$old = elgg_set_ignore_access(true);
 	}
 
-	
-	
+
+
 	protected function get_object_row($guid) {
 		global $CONFIG;
 		return get_data_row("SELECT * FROM {$CONFIG->dbprefix}objects_entity WHERE guid='$guid'");
 	}
-	
+
 	protected function get_entity_row($guid) {
 		global $CONFIG;
 		return get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid='$guid'");